diff --git a/Manifest b/Manifest
index 2e0fdb59046d..d5ae8e8616aa 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29479 BLAKE2B 27e9e7992df72b6d5aedcfdb0017a7447fb36f0e74a91d5da498233c7b6279fbe84d69d40959d8fa3912d72b504b669ab981cbd9a30338e99e1e8067e06e16dd SHA512 564b0d66ec90f5ce05bc28d49603da047b37399278c0dea41c9ac3cdd1a36369aedc12fa141ae0bdeaf68b0513fd5df72243d2e9c6a5c5c62355e54bc21d2b9f
-TIMESTAMP 2020-06-01T16:38:15Z
+MANIFEST Manifest.files.gz 29438 BLAKE2B 6c02724e8925f838cf0a6268aaf2818049cf31c0a72dc5adce0ecbb5a028a54c25e865b63a29f95231423469427a2bc991e2b2a1f67ae20eb21eeedf072493a1 SHA512 7e2611d54a321236d2df1c7eacf8ee75b33828850bd7fc6e8aa2fd34444eae28cd42f99982d1fd5070d603fc7f5160f2d191aaace50bfcc515246ac3f6b34db8
+TIMESTAMP 2020-06-04T09:38:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7VLvdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7YwQ9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCE+g/+IiZZ//hbqUNxkgXKBDo7q7VPm/zHbWHscyYzDGNmyujIVdemPunef/Fy
-ibWSbJOXbXoOnqfhJhlwgL65uMZwXgiUQ8gtQD/C2I7DoiAkXRmYTgRWuMTyKB5A
-GMLaHN/EqSQAPLIeB8D4nDJREUu3moVwIR4Wr9asIVBvJvDFzhEILpIEzrarbI0y
-DFBrDnLGg0/w4oJ6MxFM4crWbtOz0sz4hC1bIGoHqlUG8Ezrqkxf67RxmJuch2HN
-K/3LCGdAd/yALNbyFGMCPNbN0P/ipPYrjCIwEYkEppezg6REwy1ySCHNIJIs+jZH
-6YRN3Dqmk9fRGQsw/7EUqcYyl6UHUhyE5NVzaOOvMWxRwwzo0Usmqyxqn9uV5Vg3
-k3RbSGOyr3LK/ItRkRJd60iFo30VmGszPelzY1hrMMBZDaWnSlIYm4ZqiUqDuOHU
-+IF3hiO5yFNb2KrY7Bjq/zcaNR/TIQP/rdwxsQdAClaKkehR9sKQC3fOd3uD7ydP
-JFHVdm8U43b8T6DpI0+dYZfTx6cH33f18N/BnTpzJzHtu2ALYGP9rk/Jd1W4sUj3
-FUrbrf7/xSIt/BxmP10+/RvOSlsSIdz9zPV+t4cuyCZIoNcO5iIOv5NQIyLY9cj4
-OEfN9WpW1EDMFAoOyqlsRKn2aAJqncPoIlKA07EOitxgrPCPlio=
-=+cmz
+klDoXBAAsqRgqF7NbSdilMa5nmm0KGGjcYIb69GkKxQ4eOSx1LNCc4bcunnjfUpW
+P5eLvTaGBUIi0ZKJjm/gPqDERd+uOs/xiPQ3PX0W501tiHFd4BI9Bh4NAEW54QLu
+N7AtH17eYPVs0OLHRIFlyuGNJ8h7N333N7xTliX+kFpFEd90c1MUhY4vz44Q02tz
+gWUCk9zXafxDFK81i4+7Gmol3s9OnVmTD50vJibBtv6b8rpBnBcwQPo/YHZRVEP9
+IQ5g0B5u/HM7X4wm4H+XQKiHYMUkRE0CFdLq4ov/smPEu7tjXWC1x4jS0q6/d460
+KFnLfQ2IT9cWdh6tMjwSehYQDzK5CtYhw2+kJJ7vhBVQVkdsN4wOgmpGmT/9XQlI
+g7nPyfP64/8njygOskjLTCTGALj3x03SAy+8faxn9rw6CBl69zbzfQhN0JA1DDPL
+FhlKa6AbWq98HGBZFhfFYzKYHebeAHTHg/dhRr+PXVbxWPS5wdrLLEV97hpBdrj1
+gOv/etFOumPHbHscXcfk/7BAcdVhmWw7WxDOmRtrGWv3LOtDSEfuyXFlwZ5gt9ap
+xN6ozhaYb5Fb4qO0AVSSCJLD3s6YW1zUm2vx7wQozxmOVDKyzckX4iX2yIEpUocQ
+GrRqBVoYOcA1PqPISQndHXEMU9HNvCMHY8gYQRm3SIJFgIzxAFw=
+=EVAq
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 16a22ad43788..3f53206ab858 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index dd2d8f1b5d24..f98c2162224f 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/motion/Manifest b/acct-group/motion/Manifest
new file mode 100644
index 000000000000..a0503532e279
--- /dev/null
+++ b/acct-group/motion/Manifest
@@ -0,0 +1,2 @@
+EBUILD motion-0.ebuild 146 BLAKE2B 578075e210c48d0089d306ccee22081474383c156386e1b25f2524f98250aa29f82a7091608499a7c6372209718995c1bc75db3af62c516c31511d257cc89d5f SHA512 5b20c9f5a214b8fa077e331707a9f9fa9ba3bbac2b5bfd19c12938d23170a098eeb8bb5c50736a68a919da5d6097e5fa29d03338ad696609a44b4ea50a96a4d0
+MISC metadata.xml 365 BLAKE2B 771727cdaae273cfc8949eb77e62c9302d8b0301aa4bb6b64ac0a3c49e527b19382d1a98e1080fc8f3b16e27afff4ef17526f5ed65ea640e78c03f97a6a817c8 SHA512 d5c9f2d9934bcf9749a3d8e663d8bd256c814e129598301a5e629b57957732675ad3885f75705fc11b9d616d310b082abe52e2b6b461ab31503545a866127203
diff --git a/acct-group/motion/metadata.xml b/acct-group/motion/metadata.xml
new file mode 100644
index 000000000000..1152c2457fc9
--- /dev/null
+++ b/acct-group/motion/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>hfern@fernhout.info</email>
+		<name>Hans Fernhout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/motion/motion-0.ebuild b/acct-group/motion/motion-0.ebuild
new file mode 100644
index 000000000000..596311157273
--- /dev/null
+++ b/acct-group/motion/motion-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=395
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 382b0e74ced6..19523390aab2 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/motion/Manifest b/acct-user/motion/Manifest
new file mode 100644
index 000000000000..acd23df84d4a
--- /dev/null
+++ b/acct-user/motion/Manifest
@@ -0,0 +1,2 @@
+EBUILD motion-0.ebuild 268 BLAKE2B 8f46b51f52ff016e8c91862eb708e05ae4697c88e60b71b3f32da32538ae1dc7d581a593c6203aec764a52e0e6e36e9c1d3d1ca47e78b288189cfecfc15ae33c SHA512 3db269c8739f01541a6b78124f45bb020ff77372f9f99d496fff22e99723955193d6f43e75fb0abcad41e831ea7d693ce7ee2fc227cbba537a6e57860a58e4d1
+MISC metadata.xml 365 BLAKE2B 771727cdaae273cfc8949eb77e62c9302d8b0301aa4bb6b64ac0a3c49e527b19382d1a98e1080fc8f3b16e27afff4ef17526f5ed65ea640e78c03f97a6a817c8 SHA512 d5c9f2d9934bcf9749a3d8e663d8bd256c814e129598301a5e629b57957732675ad3885f75705fc11b9d616d310b082abe52e2b6b461ab31503545a866127203
diff --git a/acct-user/motion/metadata.xml b/acct-user/motion/metadata.xml
new file mode 100644
index 000000000000..1152c2457fc9
--- /dev/null
+++ b/acct-user/motion/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>hfern@fernhout.info</email>
+		<name>Hans Fernhout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/motion/motion-0.ebuild b/acct-user/motion/motion-0.ebuild
new file mode 100644
index 000000000000..bb4695efc896
--- /dev/null
+++ b/acct-user/motion/motion-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="added by portage for motion, a software motion detector"
+ACCT_USER_ID=395
+ACCT_USER_GROUPS=( motion video )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 72e49b26e2e8..8c61d3d56f0d 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index ba75bd71c592..735ac8bf2eed 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,5 +1,5 @@
 DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393
 DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4
 EBUILD at-spi2-atk-2.32.0.ebuild 990 BLAKE2B bb6cfc5c0d313cf14d34c347d30631be9b7e29a580c91418dd9f4f07f32926f9b1bfafc142b9916cbc8e5c5d28c0f20815d1657dedc21750e0306729ea22ac4d SHA512 604f26faf87462148d4126c758ef3d2f2aeee503636cb2825fa7dc4a995772e5ae369157001958222b0d80e6e5df62a49b42abb62fc5fa13124f64085166fab5
-EBUILD at-spi2-atk-2.34.2.ebuild 995 BLAKE2B cec7aba59dbc72a24be5e5fb01369e785182bcb1049af54b25e43e193d29842c54f19aab4073b1e8f521e053993cafdf785a6277f768b68ab0cfd235c666074d SHA512 f5b295da7f4559dbefbf541b7bf3faa98605e80add22b67214a98ba51425a3ac4c56f2b9c00b29eb48649299d43b0b2bd537682b7d01636f438d8ea8ef011d34
+EBUILD at-spi2-atk-2.34.2.ebuild 994 BLAKE2B 0ce5fc2b52b8352fd24b5f18efcd52a140e8efaba3f95654e5742060a884fe9caffaec39088e2e9e2695ea27543401c7183f7ff9e8dc63c35dc1e1e68f226902 SHA512 a37a37342185ffd122826b14af5fa3c9339b2132fdcba158c71fe9119d760344812fd7e66ff51aa99ef6ec1b3454594331b2d0ed5e9ea2b54a8f6508055651f9
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
index 43b03b87fec5..f2f8a484bb8f 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 40955a11e683..e4dee484e52a 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -3,6 +3,6 @@ DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc
 DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
 DIST at-spi2-core-2.36.0.tar.xz 186824 BLAKE2B a713d413c1ff291bf82107f6bedccd24d5e9e5312145ac7c4783fcf8366238c2d5cc4ba442fb0c71286abcd695b516861387f76c22ff9e427bd19b99bb7d5d3c SHA512 f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6
 EBUILD at-spi2-core-2.32.1.ebuild 1487 BLAKE2B 4bd13b2aedf9f19e533a481caa0af51687741cdd2b03dfc54fef7b1df09e6ea08b3491f22f4f66b304eb99b553c9ba880765b2b15b3cdf53d714d65a5e1675ef SHA512 617d3f33c40a9c7e438cd14695d9b04f5bd556b91673e74c227020b8a0096c3ab53f5640273cad90ab435c16be5346471158fc5d1adee0a75f46ccfe32ef2283
-EBUILD at-spi2-core-2.34.0.ebuild 1517 BLAKE2B 1d10af68d8d806653b26f5cc54dda20b7ae300576044055e0fe87b27fb1bfa79b67f812e6fd94276185a7dac3ad9f3fab3cbb8065c81c18ca35658b39157ee15 SHA512 da6113eee44dbe952707b761be31c9d3f6b96b1dd1515fd995122a1bb0345a4acd080ffbe14d9851b7f5cc51da8598ee24c2981c869ba27ec7fbaaeae11a18eb
+EBUILD at-spi2-core-2.34.0.ebuild 1516 BLAKE2B 76949361277cda353bb3f4121a799a66eb5ae1f7392f750a16190a87f65ba9180f5d480700aa098cf507cae37152005faa0768eb5daa174a1fa48a3eb03093af SHA512 9a73df3984f095ac086bd6aef113c0b97c12444a542e71fc53f21e2e3161573f035bf64a3ff74a25b7efc15b34c9a94d9d06133c962849df066e3187955e77c3
 EBUILD at-spi2-core-2.36.0.ebuild 1553 BLAKE2B 988a03cb8d41c2cd971496bbe521e159358aebf147893af2934b7df181530f855d0e8ec3e94a379bf1f7b09d90dad0c2bff050d859e9ef99bb7cfd000deefd7e SHA512 8abb98534daa9533b52cd1723c6de9981e6597af21eac90b4d24d851689d5a0c7264f97625d9af1e13bc172a2f4dd0890ba9434c13bb07185c18b15fd3db2e7b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
index 6e7eec571540..4cfca45f78ac 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9ee892f82f56..4c0f63860f49 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 0951e6f0b779..1a7b7693b798 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -4,6 +4,6 @@ AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 EBUILD clsync-0.4.2.ebuild 2728 BLAKE2B 164359485c64116501a2b5c43252003846c103ee8489664c6a88bbdd55e99f8fe2df3fd913906cbc1e7d54fdedca4f0e6fe28b55ba9e5b69629707f955d96f21 SHA512 1ff01617f74e030d1ad48c5177550272e56d633ad22493e774a7937f8172ffab51316e8872f74da4266dd02eea93758d00319fdd408d902519717e9fce4260f4
-EBUILD clsync-0.4.4.ebuild 2834 BLAKE2B 18995ae3b226cd9ac2cbfe8cbd92aaadb66f2cfd581280796155d204d292d970eb1d91a107ccd5660e3811f661e95f1d5ebdde4c265ee13a2c2183224c6f3ca7 SHA512 f6778945992124c0d37d13bfb02a0ddac13536220c6144e4422d65b4ca6555431a3537feb786939d7a3779409ce0771159851f5e8bd42c154d6417cb8f45553a
+EBUILD clsync-0.4.4.ebuild 2832 BLAKE2B b741cb0c391ae3bf8599d7013cd1a9f0a3680e61474312701775c2a3ef9c998cf547c83311d2d47ea377279aefdec794def5fcdb0d29aac04442da772871fe97 SHA512 239f53bda723da6e72852ef46fba96a30d6c1bf71623df6248ec113ce202b981bd9980deadcc2833c9a3796d16dce2d3f02947d1f07b16d6386d453f2e5b6f34
 EBUILD clsync-9999.ebuild 3766 BLAKE2B 23e453aa44654178f9620e76491ac570c4318173ae365903e17ffef52d67c4c1ff478c84c5e00ee77874a93af126e8d3f77f8133fe7e21070508bb05db557e5d SHA512 1ef43cea9877707a8531641ec03e86b491f2313950be8254d19699510bfd21e6b9446b5e2c3282ac2e7ef132f338ede69aba809e242a7401698571a470034e85
 MISC metadata.xml 2069 BLAKE2B d3525ec1686a46a433d0bbf6f18143a8092ea34c33ca2ad58acce1aa378fac27177c709b235ba7a831cf397a0a36e6b3745412d065172925f15ba794e5f2b43f SHA512 ff5d6b0cd92aa78e9eab0d87e05b12b9102c53e367e8965122be5c10a6bcefccc4a6568fea6d16a01fe15bc438d2616445a6ea37655df7f1811d945398b4afc4
diff --git a/app-admin/clsync/clsync-0.4.4.ebuild b/app-admin/clsync/clsync-0.4.4.ebuild
index 2d3aee38a854..0bb2ccba5d57 100644
--- a/app-admin/clsync/clsync-0.4.4.ebuild
+++ b/app-admin/clsync/clsync-0.4.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync"
 SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+caps cluster control-socket cgroups debug extra-debug
 extra-hardened gio hardened +highload-locks +inotify mhash
 namespaces seccomp"
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index 51b4ac22355b..2d2d7b072467 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -7,5 +7,6 @@ DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95
 DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
 EBUILD denyhosts-2.9.ebuild 1858 BLAKE2B cb836ef7bc0d26d96f873d13c3adcd2c6b7f7a86b464ea41bc20ac4165dabc64554fe95e3404c80be89286da66448375450771cfce0415f3ddee873201e411e6 SHA512 bc389dd61b4b0e305284473160bcc16e4f0e4885d83438652280912375a058d3b2e33d1aab65b6a70767bdebe61ff8c6adcab1de8717e89c271fccc72a1d69cf
 EBUILD denyhosts-3.0-r1.ebuild 1762 BLAKE2B 419fdb0a943cd4e6bacb78675cef19ccd6d73709b0a980c8547a01b9d1cc8077992db61553ec46b270e637659f0ffe53509865edb5ff5f3fdb65d3b97ce4b0fc SHA512 b63ffa7964dc8c1b3d659803f2038005aa098a7b62a3022d6aba7fd7716cc271cc2df7424137be0085def3be663b43bf2d1f71b1520be6cd61db14772880b93e
+EBUILD denyhosts-3.0-r2.ebuild 1774 BLAKE2B 1644ee1f25043685d8ed488604167a143d7330653c45313df6abcddaba6d46847d92586d55ca2b2f81f3d2d0dd6deae9ddf8ca2db0f540cacbd5898bc11f99c9 SHA512 0c64f20fdd92e5fcdd4b7d6baf18f849cc6a678cb34b9e1714ab100402d857fc4e6e2f161f41d7fb8dd7b5e506281c5f8695c2c7ab96751e95a7018b666e3be5
 EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
-MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7
+MISC metadata.xml 405 BLAKE2B 78e4aa249eb769b94479816826f18e7005a20cf59f476be51ea5513f6e1a035b3f46ee7fc6c40c7010e07700d9479088f8281b1a84fff47d79d73dd24bc6c954 SHA512 06a687f8daeda5e4d48fcf9887a13f515ef52e47cfad3285c67907d9d17a59d32ce1eaf679b8b8f4f3832295173268cd548a2e493b0663468fb91603b0c6d8ad
diff --git a/app-admin/denyhosts/denyhosts-3.0-r2.ebuild b/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
new file mode 100644
index 000000000000..70da20f43fa6
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 eutils readme.gentoo-r1 systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="https://github.com/denyhosts/denyhosts"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+#bring back python-2.7 support  bug #577502
+PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
+
+src_prepare() {
+	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+		-e '/^SECURE_LOG/s/^/#/' \
+		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+		-i denyhosts.conf || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dodoc CHANGELOG.txt README.md
+	distutils-r1_src_install
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	keepdir /var/lib/denyhosts
+}
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
index c193ef3b8e0a..3e89d981c937 100644
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@@ -1,9 +1,9 @@
 <?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 type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <upstream>
     <remote-id type="github">denyhosts/denyhosts</remote-id>
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 1710038f15aa..d8b9d2aadc4a 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,10 +1,9 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.14.0-1stretch_amd64.deb 22450130 BLAKE2B fe6e30d99357328a884944e59d7cb1c66ad9fc36642ba377ed99e23551c5cbf06cffc4336b47440389fee7a9f1996b8325d18335768187f5d052fcecae041f5b SHA512 41d87f1ab4ead019eb5ef90ad21e557db686729151618e4ec642ea6636feda383874f7d457de7e9e323cf44d9d410e7fb650edd6e69b186c2fdff5657955ac5a
-DIST puppet-agent_6.14.0-1stretch_i386.deb 22792198 BLAKE2B 7638fd1edfeb22377ab22484dd0fd5377bab6ee5e3e01c64ffd8eae29b08e0182204446db23d8cf68018a58c2419ce22c4dda4fd10a6dfac64356d68a5478bfa SHA512 dc787dfeb2565fde00da6e991fb94435c56e804657a38268ad49d72783b9857de4e359d6d9002525759684ddcb48a00e2fdb73f069cd79da74237bcb9530a116
 DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
 DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
-EBUILD puppet-agent-6.14.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
-EBUILD puppet-agent-6.15.0.ebuild 2018 BLAKE2B 74f72ffb55bb069bca1a2ea3db686ae1d5236e8c180b3b14afd18f451c7718e51ff09413380abb0bc79497ccde9aa011d7de55a9f7f92ce213d9b8361dde3d50 SHA512 f4aa0379772aa69bc9bb75fd085000e1ea64a889919b025372244f8a72df2da2f5bd27d51844d34985a8f397e9d6b8159ac46da647f62ae7f9e1cb2ec25d7000
+DIST puppet-agent_6.16.0-1focal_amd64.deb 22255252 BLAKE2B 64690ea444c666476864ff8d2373a266bd91f91ef996c87f04cfdd3401093795610e0e09a4f0588bbec8b83d64848c92a95572ea570fc7985d93c5e161256e00 SHA512 47ebcac58d9b54b62fa9a854ec4eb4fcc83d2fdef199658532b7b87cf461a8ac611f776db3fbb2e1c11e607896b85a67d7a32a4e9844e1b9b07904e0860c39b8
+EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
+EBUILD puppet-agent-6.16.0.ebuild 1947 BLAKE2B e16257a3539458300ba144ab015eb3033a3beddcecbde3fc9e69c60dba5c15f13c02c819e5e226840c439d0da6763d136b82fd6b8858cde478f30f05b1f4317a SHA512 0f47d09f3beb3305b8023005dd79b2de10714008980d059581c8ab1de6367b261abdadd08d3ec355b4038456266401176f76bd5bc5fc8ab604887f034ffd9bbc
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
index 6ef508024129..9d360f3dc1b3 100644
--- a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-6.14.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.16.0.ebuild
similarity index 89%
rename from app-admin/puppet-agent/puppet-agent-6.14.0.ebuild
rename to app-admin/puppet-agent/puppet-agent-6.16.0.ebuild
index 9d360f3dc1b3..0b6ca4ff0251 100644
--- a/app-admin/puppet-agent/puppet-agent-6.14.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.16.0.ebuild
@@ -6,14 +6,11 @@ inherit eutils systemd unpacker
 
 DESCRIPTION="general puppet client utils along with hiera and facter"
 HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.16.0-1focal_amd64.deb"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
@@ -32,7 +29,7 @@ RDEPEND="${CDEPEND}
 	sys-apps/dmidecode
 	sys-libs/libselinux
 	sys-libs/glibc
-	sys-libs/readline:0/7
+	sys-libs/readline:0/8
 	sys-libs/ncurses:0[tinfo]
 	selinux? (
 		sys-libs/libselinux[ruby]
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0f3df0666362..cc0ff7cbaf4f 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,10 +6,8 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
 DIST puppet-5.5.20.tar.gz 2995117 BLAKE2B f147be28967da748bf8d5f7250eae9045caafaa3925f850cc0a77acc19a6a47ed92d4ec81278334608839f6f8c83cab19324f2753bc05d3a042a3bfaccb72a46 SHA512 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4
-DIST puppet-6.14.0.tar.gz 2842351 BLAKE2B db9a467d8e0f4f25d45c2f735ee9d11ac6ed4e47c16b95ded3ff9f1c5055ea866735bcda27c19c2988035d9592035e433ef0d79a19781c99f4e97388edf46b93 SHA512 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
 DIST puppet-6.15.0.tar.gz 2880562 BLAKE2B 082f6a6b0ee56cdb1cd98b8cade8b07b7970ae0a78a9cf7c80e9af945eb722ad156b28004ad565c51750a63fa5932e99b1dd39ac0d4008d3ed225868e7671a31 SHA512 ac7e17bd87ee924fd928d565389b424ff2ed45b9b08e1be4eff4dec3688545657e2dfede46adeb48faecf3875c640c99b07ed6e09906b3e66b4654bb984d9296
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.20.ebuild 3776 BLAKE2B 9d772a534ddff7356545c782b97eff3b656911d127789391e9c6a4e2370aad1825ebc5c62f05c6e35ad6a91e785a597ede7f67b7855adc707657b612aa27dd56 SHA512 455e955926a4dd543822c2ab13a59867d3649bdb4948c0fe184c24c4e36d2039bbb375bee254d1775a0b257265ba73b53ad1c293e982969689c8c22f0f53ad55
-EBUILD puppet-6.14.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
-EBUILD puppet-6.15.0.ebuild 3639 BLAKE2B 818e60019ca433e92b51946d2ad453c16a844820a5edbd91d3acd1a08b654dfdeb441dffd52ea4ef1418b1e4e0194df2391aae93a9d959b4f9dbb4121182bb2c SHA512 85bc153ff019d9db4cbb5eb334662b2c39e293abb646480122d141fe1f84b49fbc98b3f255e8877b421d1274c7fc3946dc6cf28a3ff8dfda437e7b7661243678
+EBUILD puppet-6.15.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-6.14.0.ebuild b/app-admin/puppet/puppet-6.14.0.ebuild
deleted file mode 100644
index 11fd2d3c5085..000000000000
--- a/app-admin/puppet/puppet-6.14.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.15.0.ebuild b/app-admin/puppet/puppet-6.15.0.ebuild
index f50ee1410b08..11fd2d3c5085 100644
--- a/app-admin/puppet/puppet-6.15.0.ebuild
+++ b/app-admin/puppet/puppet-6.15.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index b3ebb9d149d6..3cd5066347cd 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,7 +1,5 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.10.0.tar.gz 44394062 BLAKE2B fee0a908518bb89e9dda1d4e8683953d305c70fc0e70a856871b0916a4ef610942db1a8f24f59b7704dde3da67ffc2bb1b25cc9254f3efa3c24408bc3a336cb8 SHA512 12ca864a5a515baf4510bbfcab23b686b66cce460908c103c96fd51ad2898f2c5a42b9d0d0c707977267cc31a517b454893ad85982b31176e1ebfa79d7f948ee
-DIST puppetdb-6.9.1.tar.gz 44274016 BLAKE2B eaf1fe6ee88d2f4a1d147032db017eefd95a3edaba6fe5b114be6ac4ce37584ee58fa96c34fdac97b9b8b1aecd8abc982107024d2155bb78781d1c2c2f2112e1 SHA512 8db39c7571af597be2cff7e21ec5818d422f83f1c3188896e8eb9391e52d0f4bb1f85358a25998db599e9db2b93baec60415a43b519be3da600a9c1de0f073bc
-EBUILD puppetdb-6.10.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
-EBUILD puppetdb-6.9.1.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
+EBUILD puppetdb-6.10.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.10.0.ebuild b/app-admin/puppetdb/puppetdb-6.10.0.ebuild
index 5a7a32bcf49c..784885ac312f 100644
--- a/app-admin/puppetdb/puppetdb-6.10.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetdb/puppetdb-6.9.1.ebuild b/app-admin/puppetdb/puppetdb-6.9.1.ebuild
deleted file mode 100644
index 784885ac312f..000000000000
--- a/app-admin/puppetdb/puppetdb-6.9.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index e5b568ca4742..c3e12500b9f9 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,5 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.11.0.tar.gz 60230325 BLAKE2B e7f95c15755afe1a637558a505f3bf3392da620df44e93ed152ea622bfb35b594120f36bb1c357d49577c8fede83eee318ffe4535df78f50478e09961b62b89b SHA512 1d6fe14cb1dfaec1a8b43c54ebe9bfd9b581b9f2ad4d3f1976e4570679a72657b93060838fdaf55447dd3c7e5e3d38df30c0f20121791ac06d0a09545812b49b
-DIST puppetserver-6.9.1.tar.gz 59496176 BLAKE2B 1599380ebf731fb4d67c04abc06303647d5d29c99f2b9721d049972eaaf3d4c2b108c6ac2f1a45efce3c52e9a57ebd362c874c36093027ebca77a2ae1d4c0323 SHA512 3a794adfa48c7bf9bd241c9da0578ea192b8551e75093e4d95c7c10fa659ef59d59ae72b33561d13ac31e839245d266301a6067d30b466138a95a6c4879bc58a
-EBUILD puppetserver-6.11.0.ebuild 5329 BLAKE2B 5c95f3bb71eec4b03add549fb79d3217d8d27011039aa0cf4aa41e7e405713dbfe42134f1b4f28926d41acb2d8766c5b648c7ce508bd5141e6bbd409460c9aa8 SHA512 79e7cac0efab3c480be57f739c17bda61cc74d05cd8541de20be5d2ab64524c33ebf5793e9369d69fc65f55d6c46b8a6501163bd6e2ee4ffb78263094018e58a
-EBUILD puppetserver-6.9.1-r1.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
+EBUILD puppetserver-6.11.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.11.0.ebuild b/app-admin/puppetserver/puppetserver-6.11.0.ebuild
index 94b63776bb90..5385eacc0c94 100644
--- a/app-admin/puppetserver/puppetserver-6.11.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.11.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild b/app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild
deleted file mode 100644
index 5385eacc0c94..000000000000
--- a/app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index d67ee75e99ce..94d30bb9717a 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 489aef502f71..20c4a77fb8c1 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -6,5 +6,5 @@ DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
 EBUILD clamtk-6.02-r1.ebuild 3889 BLAKE2B d3481bab34a0f27e0a5a6255e6f1744a5d38bfcfce57d0e493512f043fcc4ab44f446a67d33f5047612dbe6f9f6fba3000a63e5e0de810b5ab090efa2d3ebd96 SHA512 c4e6954978e84643c27457cc111df23ae3c1d2729a1caa9fc36406b4eaf2df70aa09ebe29d2dd1742047b2959e4f98940a984f4ec292dcea4a930e032867892f
-EBUILD clamtk-6.03.ebuild 3800 BLAKE2B 0facdff2ee818adeb256b3d4fd4c5a2d4f00264e5f479b1653cccc2a53d33b1d4e3a6bf6dcdc600825a0d3c69cdba77d05053ea836a4303e3c13cf6d27620cb9 SHA512 ed9f24cfa5f03aeef27123e576f47133b8fce38605a9e6561349fdd4cd7a1912dc0feb13c4a2afd7fafc65e1d657a9f7adf661cb45871350e3dbfb85d7ed18de
+EBUILD clamtk-6.03.ebuild 3798 BLAKE2B 8d2acfe64699eb1f7048767396db5e6e31ce5c18ae2bcaf805d27b45144b1499e38d2f6b23195612b6e1e680d2c24db8cd97327d8fb5114997886628326aee73 SHA512 92290a6ccdf14f5265251ecffc08a5737705e30b74bd630c05c998a9de55d56fdbf2186cdc4ddf150e372361744e4a7246f989a622d2b1303fabd183f9e11c21
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.03.ebuild b/app-antivirus/clamtk/clamtk-6.03.ebuild
index bb4940ea38be..f4de57265bc3 100644
--- a/app-antivirus/clamtk/clamtk-6.03.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.03.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde nautilus nemo +nls thunar"
 REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 700cc55f9fe5..6a1a2274d121 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index c09d524a12f6..f1436bfcef8d 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,5 @@
 DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
 DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
 EBUILD gcab-1.3.ebuild 1112 BLAKE2B b0dd04f6c01430785d0c3350aa4b9d5b03d5c236d6f4b12acb75fcb1769ed865ae9376f7953be4b246a17e2bc303faa0dbf6b624a66676706d0048d8d9de5de7 SHA512 8950ff175c3d2b19a3c7f07ec6ad9771391391021afada620b62c4cad6888b85c771f843d20bf03b34f1c0ae730eb646a1769834128bc7fa4992e9f70b021595
-EBUILD gcab-1.4.ebuild 1116 BLAKE2B 00040ef732da84b612dd02094f3315159798cbb3cb283a5e09d4b6affec88144c2dc7bbddc1e97cfc31030db440a2c598c49d5abfb83674a39f6a7448e92f157 SHA512 e2ed1fae6b1245253ebc459e18d44274b6e58d187f088dfbc8a2de037f216d18d7597ba5c0661f39ee97e0e6a46cddd1ffce9cd2adb47f571ce5c9fb7811b281
+EBUILD gcab-1.4.ebuild 1115 BLAKE2B 618dcb6d4e44ba54207953dbce439d8a8e8a2b85519b4d2a9c242db1943bf3e6e1b396d442b6d030158c3ad8684cfafd2e4b7fc367eaa26924797baaacaac28a SHA512 6ce897ce08f21636449e3ed50b47da70d755bb2cdfe4c2c67909d642f9ecd4d64baf32aeb0132b9a20854ad894aee5221dfe801c1fb8a11c686109cc8b71f20b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
index 7f47c504609d..c5e30efb0d06 100644
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index df5caddf62af..7fae9763690b 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 7450980606b7..96ac3855d603 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -19,5 +19,7 @@ AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516c
 DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31
 DIST bacula-9.6.3.tar.gz 4246447 BLAKE2B c591fcd5a6c3a79b52cf778f7719ad59f35bfdf99293abb4f6e9c701c0d545125734721a926f071056433d7a9801c40c546f4a73770f5d0fea9fc33c334bcd93 SHA512 8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f
 EBUILD bacula-9.4.4-r2.ebuild 12298 BLAKE2B bbb89cabb538ea1fde82056773d6f0463915b3a087006082ae083d6ef2f7b0250231e8c55dc6f8595a7c4fd58d82cf00c123ba2e6a362f20b2d41a200883afc6 SHA512 a699eb6220dd921b275ac5b660291548e5e57c0ca48ae8bc8b587e63cd002781218b85316916268dbd35cb29d7f2c476c76f5b08e3ad57206ccd84ed7d609ee3
+EBUILD bacula-9.4.4-r3.ebuild 12451 BLAKE2B bd1c38e2603655baaf59eea045e3a3a060fc13deb1ccecca4c25ddc585f67dcb9848b01fe25a09d94374bcaf6ff9d2f5da846e6e7cffae8eb3b768b3c91b5227 SHA512 42e95ceef2b902d9a24b2129915f07c2e3d5e147f1207ebfc3aee49455a1aa7136c805f89ad5a70b26df0857ab2fd8de2832c8bc93016ea76679b4dd1586e3ff
+EBUILD bacula-9.6.3-r1.ebuild 12363 BLAKE2B 3a7f9be5b6fd12780433d1a9fee56e0d59ea0ef379d0a4a3975ef1b3286394953c80ca2a160146974dd51d989bc7f08e44c4db4227a3fb746705b71f220833a9 SHA512 4e014e6996a167de2f4e5fef5504d9783c6e193265ecdd3fa2a6f3373c1409d9a7fcbc2b1eb9a2a20248a4970bd09822aadc1c7ae7c8206fb3ebaf35e88056aa
 EBUILD bacula-9.6.3.ebuild 12216 BLAKE2B e0e04979c5856f7832e67527472190c0ceff0840defdcf7a277e723cc3029bdd96264cd5cf682ce50b8b63e1732912cbbcc3aaa8fdef5871e11fff31c93bd99f SHA512 723d00d6dc36f1b7ca51cd959d882d7fa54734be1faf75ce8390e25f8300210aa342bff28a3079459a53332c4abc99f47dda9bb125d8298d9442fc8fceff69e6
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.4.4-r3.ebuild b/app-backup/bacula/bacula-9.4.4-r3.ebuild
new file mode 100644
index 000000000000..6ebe92cbe9a4
--- /dev/null
+++ b/app-backup/bacula/bacula-9.4.4-r3.ebuild
@@ -0,0 +1,429 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
+	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/bacula/bacula-9.6.3-r1.ebuild b/app-backup/bacula/bacula-9.6.3-r1.ebuild
new file mode 100644
index 000000000000..55c0d02d3b89
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.3-r1.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index d9e99dfaabc1..c1c340283e2f 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,9 +1,11 @@
 DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
 DIST dar-2.5.18.tar.gz 1931746 BLAKE2B 3d47665a1ab955ab9467d8f10a686565c549e1be57e77a9bcf65f1ea25c9b70d6d148d4b9dc35112b3ca74f9df05505c74e3a7eaa211b6a8b466308121206a2f SHA512 cde787bb4c3a3a1014efdb5e437b963d762eb87c512e1de1d60471035c535965e03adb5f75abc2bc95633bb6fb61226027d836a87fc903995e3a27a540632e69
+DIST dar-2.6.10.tar.gz 2140424 BLAKE2B 840a7a3d33825658be541157468a15bc3a3082083a35c426ecbab1cd2e8026e0a4d15671a33472068e1256878d1f60d414c2c069a3223ab5050756b13c887b69 SHA512 2fceafba6c6851c5dd11c0d1a3fda8aeddac16f39cf0051027b178703a5e821fb769c42624063d8722d80ea62bb735f3b0c6c39538c1c939234df49d6b757428
 DIST dar-2.6.5.tar.gz 2104866 BLAKE2B c31e06abb384d03d0180d3dd99067916de96286838a1aef8748ae6119651ac142388633c7946d0c7864f41a42c555ac79b0811af7594c5d6370fb9c30b975bc9 SHA512 e646ac51c5c140ca3e573a4e63ba47af6fcf19c0aeaa0d4791dd7e781478c8981cd31e1a2418d2f1fd8ab92f2c9812f3b712bc0fcbbcdfbd131c8937100a4790
 DIST dar-2.6.9.tar.gz 2137419 BLAKE2B 647dbd272832dabd8c6255ebc27040dceb428d7ea807146c5c4eabb7095eb7c57010a11a5bc3dfa73aa299c627e5230be9560ca5246b7591ed9705dac17181cd SHA512 9ee4624fa1cfa0e523653e3dca032a8b7ac200b3318ba21869c19a9102dd11a923c979e5186591011161a2ed07f3c7668b572620b3be197d4bfaea903c259151
 EBUILD dar-2.5.11.ebuild 2407 BLAKE2B f71b6baf86b3cbbf9d4f5f994efa72f400ef71ace22b42aabdd5b7ecf2171a4d9c7e73824fe1a29d45ebeca984761b53768cd2787331f16a63c2dd19709cb012 SHA512 8e050813809be8c1ca94aecbe0906c88758e85f6065d8472bad3e89304701eeb53f16d573a5ac546227bb8c2e3e87121491d7b27785b9231739e6959168c0b93
 EBUILD dar-2.5.18.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0fc2ee3f059bee3cdd1c1fbefc10765c9f83cd48c512e1bc634b93612aaf91498e73e37a71580d02373216ab SHA512 4da51e445dc0fe62d0f615b652fb53d3699a942bc1371616a9cd9f52a1bab61fbf5d5397bacac3d8ce1cae24554feff56b3392dcc6fe23564f9eadd4725b85dc
+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
diff --git a/app-backup/dar/dar-2.6.10.ebuild b/app-backup/dar/dar-2.6.10.ebuild
new file mode 100644
index 000000000000..607253da2b02
--- /dev/null
+++ b/app-backup/dar/dar-2.6.10.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		curl? ( net-misc/curl )
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		curl? ( net-misc/curl[static-libs] )
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+"
+BDEPEND="
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-python-binding
+		--disable-upx
+		$(usex curl '' --disable-libcurl-linking)
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		#$(usex examples --enable-examples '')
+		$(usex gcrypt '' --disable-libgcrypt-linking)
+		$(usex gpg '' --disable-gpgme-linking)
+		$(usex lzo '' --disable-liblzo2-linking)
+		$(usex nls '' --disable-nls)
+		#$(usex rsync '' --disable-librsync-linking)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index c33005d8cda9..1a8983a9f73a 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -2,12 +2,9 @@ AUX duplicity-0.8.09-fix-docs.patch 549 BLAKE2B 57e20c1f65918e548941ce56969a9a22
 AUX duplicity-0.8.11.1596-fix-docs.patch 665 BLAKE2B f664af2867546957fafdf717b792ebc8e4d75fdd6451d7c252284107f8fcd4029d2815ffa21c622738226885e396b25a1f2485f44a15275e0a8b0b248ea27735 SHA512 4ce3d557c5ef3e32f9032cc10285b8059800b8d0f57e46ebcb0fc85a1da361b0475303ba94f8e4a25a70cb27b506de477d7657fbfe0b77d80646a3025bcd8bb2
 AUX duplicity-0.8.12.1612-fix-docs-cmd.patch 859 BLAKE2B fd3e94fcd2f408a3c81b0ab3b749956dae48e540b1c826d79ba411ed24729874a60757543539610b6aed99123f3a34dbfe432663f73824325da748410ff5a0dc SHA512 4d1c6101b93ae8ee8bd3ba3203ed4c149a13c7b41e4ce11a048d378bc0ad54b2e51b2a3d7ef93c9935e980545e68425f52582f9eddeec465095ee31f40dfee71
 AUX duplicity-0.8.12.1612-fix-docs.patch 665 BLAKE2B 5a82b97397d63153df54b0bdfc62e2896980fd665b91cacff92aefd143b23ea662b6d0ee0cd6251938a41a83e3046d027bf4bfffed1e90cbec1240d2ff0c9b95 SHA512 20b2827e72b441f15d9abfb63f0415758f83b82f3669e104b6b9d9db4d3d00401defe42d9c24415197795535049f280ef6b7c74a15c55e4ce61837d85b7eed4d
-DIST duplicity-0.8.09.tar.gz 1856764 BLAKE2B b5d0dd3270c237694000dc36a65a4293c43264edf933a195692d2847d008a898d5cf95c0b21b285503023ef8885278485cebabc2d2b7094ae65e13d277c80e5a SHA512 e4045a1c1adbf0927ee5325f02b79e7c0b38034080be4b563f20f1af593c8c1943a772fe7f212730e60f7c7cee93756426fe769a62050d42651fd1af7f6ba50a
-DIST duplicity-0.8.11.1596.tar.gz 1872223 BLAKE2B ad3ee2536731d1a6e8fb3fd87bb69b8ce8b43bb90688fe957cfb2718ad44f57db98c3aec4805356a7d44bea681f6ec9603aa082dbf86e58684fbe8000d1676b5 SHA512 67940d73d8213559ba88ec21e1326aca0dd065888cbf2e3c68f0f515ba9246100fd6e6d0bd1f12cb678702559f2266b7905931506d2ff6fe6fd35c673593479b
+AUX duplicity-0.8.13-fix-docs-cmd.patch 863 BLAKE2B b5ba9fb41d3e863b6064e0a76f778fd52cc7544495500e7106218cbfd30a484c499c03132752cdacef43c7aaa299982a0822e433767fbc94299e0045017c7168 SHA512 3c9c4e4c759a0cc4ba7e3b9be9955ad16638baebd1720dadf902be32ccfdfdc306973f8897e99af1c67b5b689dd1713ed8928e25cbbf26040b4e8070e89de346
 DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951
-EBUILD duplicity-0.8.09-r1.ebuild 1134 BLAKE2B 04496a663087d1a1e068c42d2037df9920d3d628ec1e9ebd45113f36a8c92103a293fab7875e386742c69f1bd9d0c076db13b85b4721048d9fc7bd45e9d4520d SHA512 dc7ef2f8e721b890265a0f17e62139e2918cf6b5722f38725868cfe740c440fbbf3cb13b33e5ff9a5c11416a59b0f6b4a031a19fb03a65161ce76d5d7611d9cb
-EBUILD duplicity-0.8.11.1596-r1.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed
-EBUILD duplicity-0.8.11.1596.ebuild 1145 BLAKE2B a8d81c55738f9321e39f1a3676d3d2acb7f08115893bcf5f1da5dad6cff6de0b99d0358b18877682b7e4586380a8addc8c4766452a974259e40cc6dcf538c957 SHA512 61da41a243dc4db5304c2239da604d05b7ad8081e7273af0b94fe1ad566ffc7e848d4e8cb7a542dbf746b88205c9bba71dcc5509714d7eff79e6b71dcdfc4228
+DIST duplicity-0.8.13.tar.gz 1463564 BLAKE2B 31037b0a27e043937f80ee91939793e304c0f7b1c96ee4bc9fe7c06dde69f374a718028d9ae4a98cfd7f866af72e5ed0a8f679319a73428207a99961961e8d2d SHA512 71e07fa17dcf2002a0275bdf236c1b2c30143e276abfdee15e45a75f0adeefc9e784c76a578f90f6ed785f093f364b877551374204e70b930dd5d0920f7e1e75
 EBUILD duplicity-0.8.12.1612-r1.ebuild 1157 BLAKE2B a83a4638ded58e9efa48c726b2e718d24a0dffc69dfa372bce56818059f58230e4050490efe2d9eba17c0abfd686a8c6b8c69bedcd3108d35a7e07fea173ff36 SHA512 b4f7a04ba7d1e0f56b6b335fac26efbaa448fb53714c84df34595c7126c9b49acbfe28e44bdd2e6fe240827d307f1379ebe1e2fe78fb6dbe0bbf4fe412f39898
-EBUILD duplicity-0.8.12.1612.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed
+EBUILD duplicity-0.8.13.ebuild 1160 BLAKE2B d2389fcfb696d995e77474dc41f5ec659f4cbd4cc16e7b63d87f98fcf066b74df474e890e3e621b2c60eb2598c9e318190636679576c7004b786b126dabf2b34 SHA512 53d15c1d5a9814bbb75b2462f87c374027d7f8f2e32e6c528e02b71b326a8dd63f56f4a75c494a4bef508743a8fa35eb1c3bd6d2df94267814b839384c74ccab
 MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a
diff --git a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild b/app-backup/duplicity/duplicity-0.8.09-r1.ebuild
deleted file mode 100644
index 6507cb77f9b0..000000000000
--- a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild
deleted file mode 100644
index 3f789257f08d..000000000000
--- a/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-0.8.11.1596.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596.ebuild
deleted file mode 100644
index f9ce35aa9879..000000000000
--- a/app-backup/duplicity/duplicity-0.8.11.1596.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-0.8.12.1612.ebuild b/app-backup/duplicity/duplicity-0.8.13.ebuild
similarity index 92%
rename from app-backup/duplicity/duplicity-0.8.12.1612.ebuild
rename to app-backup/duplicity/duplicity-0.8.13.ebuild
index 3f789257f08d..d63a2b170693 100644
--- a/app-backup/duplicity/duplicity-0.8.12.1612.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.13.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
+HOMEPAGE="https://www.nongnu.org/duplicity/"
 SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -37,7 +37,7 @@ RDEPEND="${CDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-docs.patch"
+	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
 python_test() {
diff --git a/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
new file mode 100644
index 000000000000..23b31e23fc07
--- /dev/null
+++ b/app-backup/duplicity/files/duplicity-0.8.13-fix-docs-cmd.patch
@@ -0,0 +1,29 @@
+--- duplicity-0.8.13/setup.py	2020-06-02 16:19:25.127576334 -0400
++++ duplicity-0.8.13/setup.py	2020-06-02 16:20:33.730535892 -0400
+@@ -89,18 +89,6 @@
+                 u'bin/rdiffdir.1'
+                 ]
+             ),
+-            (u'share/doc/duplicity-%s' % Version,
+-                [
+-                u'AUTHORS',
+-                u'CHANGELOG',
+-                u'Changelog.GNU',
+-                u'COPYING',
+-                u'README',
+-                u'README-LOG',
+-                u'README-REPO',
+-                u'README-TESTING',
+-                ],
+-            ),
+         ]
+ 
+     if not os.environ.get(u'READTHEDOCS') == u'True':
+@@ -319,7 +307,6 @@
+         ],
+     test_suite=u"testing",
+     cmdclass={
+-        u"build_scripts": BSCommand,
+         u"install": InstallCommand,
+         u"sdist": SdistCommand,
+         u"test": TestCommand,
diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest
new file mode 100644
index 000000000000..e848bc9082c3
--- /dev/null
+++ b/app-backup/kup/Manifest
@@ -0,0 +1,3 @@
+DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8
+EBUILD kup-0.8.0.ebuild 966 BLAKE2B 39608607ccdc7ca20d6bed3300c814541bc45f554a7ae85bc17d4c1fee0f26497d22036b1d49d91c60cbc0ed47bdcbe44851f101d2fb64b0342f32e49e36e499 SHA512 40b375aa355ef12213be39303e5a196f30076024ab8ba6a761a67938e66f715923421e9307a9f63b3fe12520646e0faec604e565f5fbc9a034c650f56200913f
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-backup/kup/kup-0.8.0.ebuild b/app-backup/kup/kup-0.8.0.ebuild
new file mode 100644
index 000000000000..ab78240f7021
--- /dev/null
+++ b/app-backup/kup/kup-0.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+inherit ecm kde.org
+
+DESCRIPTION="Backup scheduler for the Plasma desktop"
+HOMEPAGE="https://www.linux-apps.com/p/1127689"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgit2:=
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kdbusaddons:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kidletime:5
+	kde-frameworks/kinit:5
+	kde-frameworks/kio:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/knotifications:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
+	kde-frameworks/plasma:5
+	kde-frameworks/solid:5
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtdeclarative:5
+	dev-qt/qtsvg:5
+	net-misc/rsync
+"
diff --git a/media-plugins/gimp-lensfun/metadata.xml b/app-backup/kup/metadata.xml
similarity index 55%
rename from media-plugins/gimp-lensfun/metadata.xml
rename to app-backup/kup/metadata.xml
index 5f4100165ca7..2fdbf33d963d 100644
--- a/media-plugins/gimp-lensfun/metadata.xml
+++ b/app-backup/kup/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="github">seebk/GIMP-Lensfun</remote-id>
-	</upstream>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index a53fe5e931d7..94190fa571f0 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -8,5 +8,5 @@ DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228
 EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
 EBUILD snapper-0.8.6.ebuild 1720 BLAKE2B b1539038deeb427fc6ca79f713d49f7122b6e1b7e795e0e96473bcdda98752f85a415e4f94f2413d1028e10786e569649122465f6d15addfc1e64ae6eca22d47 SHA512 87875741264b9e309629bff0da167c83f178b3914096ce6a6f6d91045af8d716643e0430a8a93b5c6cdbceb1e92b9df5cf6b8c21f56ea48967491cbd70a304c1
 EBUILD snapper-0.8.7.ebuild 1750 BLAKE2B db18e3f269127500ad265344f338969f385f69bd0143b1c73e61f1345e6e3acd184a15f0e21735fe53839f2f3c29547b3024ac85708bcf4212a2f0002466d898 SHA512 a7418aeb4f7666a38ee46a74d5ad1fba91a05ee16bd25d067f850e78cf9a99e9bef3ec876c45b22b1c009b0eb8ea53089f714f28f826b2d937e1e26158982f1d
-EBUILD snapper-0.8.9.ebuild 1809 BLAKE2B d36b7b74df7d58d617197cc6becc6185909c1a6aa48e7b1bed5461df7d0082803a38cda4e08dfd858a48e6f5772e7034babc822b1b258afc32929759d8fe3919 SHA512 3ef38d574a147caee3a8e43cf6839c862ddb52c1e8698ea50df2fbf23fd995e36e57c608e8939f669a03b4f5defa2de512483a2787d76a8440ac8c1c6b0d5712
+EBUILD snapper-0.8.9-r1.ebuild 1843 BLAKE2B 8d24ca268222ef6917a6f06c6d83a667c363037ae413b8139844715fb00c38e25e821be080edeeab136267718497f49c675e6b14cd15572c06458baf659a59a1 SHA512 40f4443313427b740f18ad279e8188c48295d8d6b2f38cd0fcb601d9b4f6f1f486e48b3fa1b057d1815ab3f227eb1537ce4c1f1c306256104416a5358d5a3c60
 MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
diff --git a/app-backup/snapper/snapper-0.8.9.ebuild b/app-backup/snapper/snapper-0.8.9-r1.ebuild
similarity index 98%
rename from app-backup/snapper/snapper-0.8.9.ebuild
rename to app-backup/snapper/snapper-0.8.9-r1.ebuild
index 9b77e973fc03..5a5593c28464 100644
--- a/app-backup/snapper/snapper-0.8.9.ebuild
+++ b/app-backup/snapper/snapper-0.8.9-r1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-libs/boost:=[threads]
 	xattr? ( sys-apps/attr )"
 
 DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e72324433577..2b41dff42854 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c8dd6ab0ff94..1e1dfeb914ea 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
 EBUILD acme-1.3.0-r1.ebuild 1770 BLAKE2B dd2b344dc9157631cadafaec85f9bf220444917e71be0166a513d2eb0ac9d863aa3369f2c61c11bf4b9fb9054a1a0e59b28fe6b92aa0c686133fb4b8cbcefc71 SHA512 caba8e15d9e396d9707cf868cc1ec76be17b462d5be08508df8f02ef16c093b55ae770e8f68e97a0d19cd030a8ac087c3e980829eccb8458f5e1bf770a86d947
 EBUILD acme-1.4.0.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
+EBUILD acme-1.5.0.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
 EBUILD acme-9999.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.5.0.ebuild b/app-crypt/acme/acme-1.5.0.ebuild
new file mode 100644
index 000000000000..1d83c8b8d408
--- /dev/null
+++ b/app-crypt/acme/acme-1.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 2816c458d0f9..9d3ffb89eb02 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
 EBUILD certbot-apache-1.3.0-r1.ebuild 1103 BLAKE2B b5e48f218836b1d6ed67a7c752fba68f938cfda74e86472eaf7e518857948d091a80d8516e3459fd550252c5366082a2cf0246550145ca27cb680c303bc76815 SHA512 3a139f0e9430e2bf0fb6bb5efc4bdd055bb12a66a48f5ab19a2d540267922317cba30a84dd12d90d34b26ccecf79066fda61df0330266f7a7c1f8f1352407e2d
 EBUILD certbot-apache-1.4.0.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
+EBUILD certbot-apache-1.5.0.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
 EBUILD certbot-apache-9999.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
new file mode 100644
index 000000000000..6a66d1858399
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 09560dd364f7..b1539fcb8482 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
 EBUILD certbot-nginx-1.3.0.ebuild 1002 BLAKE2B ce0f437e0c35c4384932b65f1f9bc68a7bb1f10b601941dddd87350d9c8745014cd1cfeb8253c8262fa07fede07a10cb42bb6584363c6a510e023b5cf40253ec SHA512 84cf0ce1e323a9f20a70f147d67465662fdc799df553dd9e74ddb35b8da4d8bf3b3d6179f23964d3145fc8d44804321352b779424b5f15c6e19626129f6a2f97
 EBUILD certbot-nginx-1.4.0.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
+EBUILD certbot-nginx-1.5.0.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
 EBUILD certbot-nginx-9999.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
new file mode 100644
index 000000000000..b6f70f8607be
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.4.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index cd426cefd3d9..542eec3ea20a 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
 EBUILD certbot-1.3.0.ebuild 1482 BLAKE2B c937a391b768757ed01f31fa96596da3cad08ea7394af1b5f5a9a828ef97a4a948b9315a3fc499742eb95dd3370f2d303b52886dcc6df75d2d502801a18aa62d SHA512 e7081e69f95c7d2aec45938ca6cc7e3da6dc00d038cb3d9167e1e33102b84d06e6a7a3ff13c5734c933c0b062d1e07203d6002a3a3f1609c14874679d2b3d077
 EBUILD certbot-1.4.0.ebuild 1449 BLAKE2B 33697537a8dfe539c1aee02b90745fd8da1150c94c9d842f17e3703c79f24fb5ba8b54a95a3f450d340abdc0240663e0b338c86a5a0b4e1506a591bc2a5e5a99 SHA512 a725b74a30ba0b7afd8ec12a02cdbbbb2f69054f588fc8f6da3ba47fdba481ba5b39b70f5609e1e874397d5e53319deb2a5589a2044079d009034fbdec0c3fe7
-EBUILD certbot-9999.ebuild 1449 BLAKE2B 33697537a8dfe539c1aee02b90745fd8da1150c94c9d842f17e3703c79f24fb5ba8b54a95a3f450d340abdc0240663e0b338c86a5a0b4e1506a591bc2a5e5a99 SHA512 a725b74a30ba0b7afd8ec12a02cdbbbb2f69054f588fc8f6da3ba47fdba481ba5b39b70f5609e1e874397d5e53319deb2a5589a2044079d009034fbdec0c3fe7
+EBUILD certbot-1.5.0.ebuild 1448 BLAKE2B 6d50286cc52e3c627a218c33f480519e1d7bb5c5969211455e00098005b59f92f4a1ecb5ce77675956375e903c89fd93f8a0540f41b67cb1270fca47b8fae819 SHA512 039f07c2098359ce63952c7cfcc7ec4db0175e7b898aa28a97ecf1237d75602f39534ce59153ccc200654b638a8c26c9d4f043683a334d9ee2214a84c26a70f6
+EBUILD certbot-9999.ebuild 1448 BLAKE2B 6d50286cc52e3c627a218c33f480519e1d7bb5c5969211455e00098005b59f92f4a1ecb5ce77675956375e903c89fd93f8a0540f41b67cb1270fca47b8fae819 SHA512 039f07c2098359ce63952c7cfcc7ec4db0175e7b898aa28a97ecf1237d75602f39534ce59153ccc200654b638a8c26c9d4f043683a334d9ee2214a84c26a70f6
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.5.0.ebuild b/app-crypt/certbot/certbot-1.5.0.ebuild
new file mode 100644
index 000000000000..fb33b72fd174
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.5.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=(python{3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# required as deps of deps can trigger this too...
+	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+	distutils-r1_python_prepare_all
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 182f2b91d51b..fb33b72fd174 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index a3875a54ab24..04b59cb9d69a 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -9,5 +9,5 @@ EBUILD pinentry-1.0.0-r2.ebuild 2847 BLAKE2B 8d93187c84bbc2ad6d5e0c26dde48d53473
 EBUILD pinentry-1.0.0-r3.ebuild 2918 BLAKE2B c565bd9e341bd92ef915ba37820215659b04026a019a8bf035a21880611bea2844c543d3a7ccf39195eddd43f3bb610efe6e7da00eecf8d9da2e9a6950139f5b SHA512 c6ba7579ab5a52b4490d343f971224a3a21f5c0e2d930138c4fc722f26e673be25699c384152d34e38c8fa2eee7a711f131d04767da3e2375cebc6e2bead9fa7
 EBUILD pinentry-1.1.0-r1.ebuild 2769 BLAKE2B 6c82a5f1cf18bf438acdfa972d74231b890e03d6a4d561d6cc4e1b157157805da3ed1d44ef636fd8d9f8e6080e8923798257bf6881e46f4d986b08ed20216806 SHA512 4f8162867d7af98f586a65a12871e136c211dafe4edf4d46121282120f371180b684b828e0c593b7d3f0001fd723eb8c068dba3c68638f0efa49ea4b55cec7ab
 EBUILD pinentry-1.1.0-r2.ebuild 2827 BLAKE2B eb7650162db93d6fe5d98e0935d71237092395ef4610d3f879dd756791b7894c8d331f5eec642264bc0e075237024da189eff471c393819458b58bb3be19e092 SHA512 cb3ada0c71c47d4628662a94401a8e3ccc9ea3416b9dde2b61f8ee1c99a244ee8f4d8c5c7088baeb6aab6de47aea36fd366dc93efc5bb29cbf0dcb1b2ab7aa26
-EBUILD pinentry-1.1.0-r3.ebuild 3087 BLAKE2B 44d32fa76bd750fd7da7fab10d765c5f3cacf681152bffdb64b312eed6363aec3ac5a22d415d1173925aa3ad2f5f4ff1b5310f80ea7c2f447a913b12449de95d SHA512 fd784da8b021c8d9405422be5f4afd831a4a870729b51dfb3356b9e7db6d6ced9d1b5b8b1888be7abb81fe199603918038bd208aa9d3a54ba1450ab196099758
+EBUILD pinentry-1.1.0-r3.ebuild 3084 BLAKE2B 5acca17889f6643a84c070662991946bd18ee379c27e11203e6cb8e3b93baf6ba0d5d690907bf67411615bd91614144953d04f973b264c917e3b6e159888b44e SHA512 985625fb3615c9d79acdbc9b3579727de812025625cb482b3a9f1e43459bb5bae2283de865a4f35aabb1bce1fd8e0da912503fad83eb81a29139fd61a10b8dfb
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index 0ff90bda9f48..091098f53e29 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 DEPEND="
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 900a8a90e711..f05722c579d8 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
index bde3d7c699d8..930c372a9880 100644
--- a/app-dicts/myspell-fr/Manifest
+++ b/app-dicts/myspell-fr/Manifest
@@ -2,5 +2,5 @@ DIST ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt 2271004 BLAKE2B 80c5c43a
 DIST ooo-dictionnaire-fr-classique-v4.5.oxt 2251909 BLAKE2B 3ea0901efcee126b2702efebe279cb32b0e496d6b92b8e2a9dd16671bd999b6357086faf99ced6db5f4babe726ee933f3f85858c84a80c8b656b945b23d2aaa7 SHA512 f45b1e12b24e2ef2a9e3944b310631ee5c52ef7cd94a9d2d461ec91b320b40e6d380db7820d386ad75627873b6033e80451b2371f0a42817ead77ce5f03edf77
 DIST ooo-dictionnaire-fr-moderne-v4.5.oxt 2248032 BLAKE2B 4e935186b621810f468e6915e61c7389aa95f8d8e00d8960bd1a9cb8622521669c6147c0b535fffa85a36abb9fcb739a45c00bd9036e5d019953c5b7d13321d5 SHA512 b493f0c57d3d48b93a2c0d9fbd065728ed011c68d11286def203a0b798fe02381acdb2927805475c69c1ff7d0a7ff53469e84581c4724dd57bf0211d85c52655
 DIST ooo-dictionnaire-fr-reforme1990-v4.5.oxt 2255388 BLAKE2B d804bb80698f1ffb8b77dc8c3efa0841437de1389a7fda870fbb4a71914c42055153ff92629481b3e669bec2fa00258b43ff3d92acf08335e11559bb5dec6fae SHA512 39630fb67ecd4afd528a8c255c405945d866e57fb2becc0e79b6c16ec0e0510101d106c0342dd43f26befd3dd0ca3e4094360aaa0d91a090ecdea49158383ed5
-EBUILD myspell-fr-4.5-r1.ebuild 1625 BLAKE2B 34127013fcf6b6b62c949ea9818b8fc16f3ce8c679755559b21d38cbb75c60d7a4b4d121b26fc0887c69b305ea461b819293b73c1d83ae1964d0e92558e10ee3 SHA512 2cb7258c193c553323c45c47f47b49ebbf4b733b3482dce4a94afeb6d6331576507af227ac59ecabd500a67ae892e74afc0d6ecff70fdad012cdd31d6df487c7
+EBUILD myspell-fr-4.5-r1.ebuild 1630 BLAKE2B bb512e0b34b15b437bdff658f6f6f2a8c8cfe2e6f0f40c2a5720b3b4836727f941e4bbb18ac80f55c1b6da6f2b2c178b8b4f50f75b323e6dd1999265dde25258 SHA512 7789b28af7350d695f860fa02f3b1769ee150842a3b8177dc59d2d778e3f5febf58ccd888976bb0c4ddfc78781ad7693b14209bafdc3ad54bf9d72fe5d724d80
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
index ca8a709cf52b..2ffc1ebed3d2 100644
--- a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
+++ b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
@@ -26,12 +26,12 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="French dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/dictionnaires-francais"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/dictionnaires-francais"
 SRC_URI="
-	http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-moderne-v${PV}.oxt
-	http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-v${PV}.oxt
-	http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-reforme1990-v${PV}.oxt
-	http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-reforme1990-v${PV}.oxt
+	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-moderne-v${PV}.oxt
+	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-v${PV}.oxt
+	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-reforme1990-v${PV}.oxt
+	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-reforme1990-v${PV}.oxt
 "
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
diff --git a/app-dicts/myspell-id/Manifest b/app-dicts/myspell-id/Manifest
index b3cf935a385c..f6b5fa000b55 100644
--- a/app-dicts/myspell-id/Manifest
+++ b/app-dicts/myspell-id/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-id-2.0.oxt 135667 BLAKE2B 86de36a18c9bd52d68c0115b1d5d2ba6906f508c7db2dd521ea1c42c1de989304b35ff1bd47b86ebf80ad1ceba037e25ad3b11fd02cf620ab1d0fbf84bbdf16d SHA512 43d5e0ba4d582528d15d0f533d7bc1ef89023d1155cf5959d3df9fbaf7a1fc48c35402b774e1b8aa7475edbe5ddb2fefebbef596c3cfd73021215ac210bc47df
-EBUILD myspell-id-2.0.ebuild 655 BLAKE2B 710b4110ca6398bcae2e0d4d93c804e779881e6de77e8963f6e41db65cb500d26954be0d10ce08ccd8ba2f0dac4994777c3f2d4092e7e6546cc9c025956aad6c SHA512 63bba46199aa32dd2782bc6a889a57512dc30ae05fcbfb150a507b74fab316de93df0121075f5b4460d9901a931eb5dcf4c056ec554f3acd7520f2290338a775
+EBUILD myspell-id-2.0.ebuild 657 BLAKE2B 2070604674f223547ec6ab547cb9c6461ab4afe2d12edeb331cd1b8b74190353fd6700569df22e1f5e0979924098ebb80353599da0abdb2105dd9bea69c84ae8 SHA512 5dce27dd6961cd366ba0e383e70109b544f342346cfab749b4377d1909e63ab5eb4a53a74bc7c1de17344d03d8e20cd8c3c32068fe9ab79bc5493b49b60498d5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-id/myspell-id-2.0.ebuild b/app-dicts/myspell-id/myspell-id-2.0.ebuild
index 6ed02b8ca71a..616cabb2b841 100644
--- a/app-dicts/myspell-id/myspell-id-2.0.ebuild
+++ b/app-dicts/myspell-id/myspell-id-2.0.ebuild
@@ -18,8 +18,8 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Indonesian dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius"
-SRC_URI="http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/${PV}/id_id.oxt -> ${P}.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius"
+SRC_URI="https://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/${PV}/id_id.oxt -> ${P}.oxt"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-dicts/myspell-is/Manifest b/app-dicts/myspell-is/Manifest
index 5655541c278c..67b2bad37a00 100644
--- a/app-dicts/myspell-is/Manifest
+++ b/app-dicts/myspell-is/Manifest
@@ -1,3 +1,3 @@
 DIST hunspell-is-2012.09.01.oxt 678230 BLAKE2B f8a4fa14c1cc9c89213a236d38fbd6b3621fbbaa4803eb3bb70761ec387cddc0404546c3b9ee719c104c0321f5736394506993e153e0b575b790376d2081818f SHA512 39af86809f735e5f0698b060d514bc2d9d53cc4ec7ef4edb6edbd92674af337ea48fc69bfaddb2dc2532be74ae5a079068cd691212042bac70a622d1f02eebe6
-EBUILD myspell-is-2012.09.01.ebuild 645 BLAKE2B e8f3178af7fffcb5e051d19d9e07bcf94ae13b568e1086faed3691fbf72c80082086bde472d0ab950e857051f49dba3d147d6ae21a15fa05d068bd89e5bafc06 SHA512 91aeddbc4f0ceef2c3d3f26cbfaa450f2effd7feaa8c2447b87069df3535648bb8063d6a55331a77aa9d49fb455e6af9a92a65efe94e9cc2b7d1b7058abe7f94
+EBUILD myspell-is-2012.09.01.ebuild 647 BLAKE2B c606f4e029c13d4306c76d934134281d5848ee1ddffdf687052b469748d9b2b53830c45e6188ffc6a55c1fc8f6a66fc745cf101317ac2236f76b59c3f7fe1990 SHA512 c238874f3724451cd96fa653a5070f7ec67182e42be8ea43c3164dc896549c8441ba0e97baaefbf6ba1b9641cb3a76648760c66cc9510fe65b5ddafbbe0c0fd2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
index 60cb28271e64..a2105b4f4ee3 100644
--- a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
+++ b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
@@ -17,8 +17,8 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Icelandic dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project"
-SRC_URI="http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/${PV}/hunspell-is-${PV}.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project"
+SRC_URI="https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/${PV}/hunspell-is-${PV}.oxt"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
diff --git a/app-dicts/myspell-km/Manifest b/app-dicts/myspell-km/Manifest
index 6aef7190a970..a0ce7f2355ef 100644
--- a/app-dicts/myspell-km/Manifest
+++ b/app-dicts/myspell-km/Manifest
@@ -1,3 +1,3 @@
 DIST sbbic-khmer-spelling-checker-1.6.oxt 355760 BLAKE2B f9b87b3ab40204cb756440b0d705156c9b7d7d2220db9a1baba8b3c5247b6cee76c7326e7e5f69d6f7f2ae926b0e865fd7dc2f1c38db40608ddaee5159f407b2 SHA512 0cbe28a5b9c1c7aebe8cb14ab76115dd3d08c75f20200bd0685d05b5d462b2c53b3e658b150d58a44dcf1589df99eb92a68aae3f5d5afb63591ae19a338230b8
-EBUILD myspell-km-1.6.ebuild 623 BLAKE2B ddcc5f0c13b175fa1693e0c4c571a2b8e887e92ec0d4cd8fe29efa08517834c29bc27f46b73417a2b0edb6218ab6011479cfb5ccd2385c16313c2dafa7b3f628 SHA512 f19d1acd25017a2f5482b8404ac2427bba1916305d5c3fbf35ea1d938eda0375f3d133c2dad994d304ab605980d793605d98218a7ecd029caf4b0050bdbdab80
+EBUILD myspell-km-1.6.ebuild 625 BLAKE2B 01ac05f68d9ce3e024da26b864915a8faf76f305b9fdea990ffb327ce89cf6356d23f77869b145bfeda093ca05104dcc629db57a78ed774016d7f88e494e32df SHA512 fcd41078fcc2f4866a748fc5d75f23193e1aac0d0bd5fc7ad6272eb0063d823e1138d4f8d573cd3021def2e8ec6d8af967be4520ea245aaa4c7d05e359b8a950
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-km/myspell-km-1.6.ebuild b/app-dicts/myspell-km/myspell-km-1.6.ebuild
index 472e51c68322..fc18db48015f 100644
--- a/app-dicts/myspell-km/myspell-km-1.6.ebuild
+++ b/app-dicts/myspell-km/myspell-km-1.6.ebuild
@@ -17,8 +17,8 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Khmer dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version"
-SRC_URI="http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/${PV}/sbbic-khmer-spelling-checker-${PV}.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version"
+SRC_URI="https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/${PV}/sbbic-khmer-spelling-checker-${PV}.oxt"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-dicts/myspell-sl/Manifest b/app-dicts/myspell-sl/Manifest
index 5880f336c9fc..721e5b686259 100644
--- a/app-dicts/myspell-sl/Manifest
+++ b/app-dicts/myspell-sl/Manifest
@@ -1,3 +1,3 @@
 DIST pack-sl.oxt 1506739 BLAKE2B 801c7dd557c534c3b83e1360a765555b146eb23387a12e8ec779f9f4878760b9a87115ab97d6eb667bdde72bc367ee4c59d28fc2492cff764b5b44d33244c94f SHA512 7309e1f9e5c42ed41c660a195421b5dbfc9995c4970641c9da087d0f4f44126c5a98ddeaaae13f7ba563314cfaf981c8216c45d80fae2fda1d7c49fd943c32ee
-EBUILD myspell-sl-2012.01.04.ebuild 643 BLAKE2B 9392a4de9471d1bc55752f592df06d2a9792a50fdc5afc55d0ef53018220c2b762b515c7e3614c1866d9632b1394adf6f9329de5539696f60b99d651aab1a6ed SHA512 05c1d19a5d4f24c2984ce52981a59d6545d3e454abe91d5cac35641b45fecc442a2a6e79a7903f477111f6d3ed0fce9fb99e78770c2654cd4385daea1d3610ab
+EBUILD myspell-sl-2012.01.04.ebuild 645 BLAKE2B e43caf94093d797dce6d3230c1a79900b9975ef32a8bc2ec2e8e261075e8b04ca6c7d16d1436d45c94a067810675c175d3bc0cde2d38286fe2daffd0ec4706d3 SHA512 9247f27862bcd48fe0e721b7955b816898d53312b901a4e2d78c2c1a5deb1655fbc5d1deb0164b5111fff2ad4ebeab7dd775f33bae418e7ea1a75cbd78bd7468
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
index 7824d54d3cdd..bc3af6740a60 100644
--- a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
+++ b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
@@ -20,8 +20,8 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Slovenian dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack"
-SRC_URI="http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/${PV}/pack-sl.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack"
+SRC_URI="https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/${PV}/pack-sl.oxt"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
diff --git a/app-dicts/myspell-sv/Manifest b/app-dicts/myspell-sv/Manifest
index 8669ea46c43b..d7a430090a7b 100644
--- a/app-dicts/myspell-sv/Manifest
+++ b/app-dicts/myspell-sv/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-sv-2.14-hyph.oxt 44382 BLAKE2B 2f25cd604c79d51549d47110d06e8877431bd9be521a57e7eeb172817d32b2f11b07e6c1c212c4f6f9d49ce7a4d3b54ecdb18bbab41a7cd26bc3c8de9a553fc1 SHA512 0f71809d2d401bb917037bb50a2fa88ffe825cac081cb14e9378ffeebc447144b733a9d4fd99cc5bc1f1a37835cc880210512ccc79341a4ba8c6cb5dcc38fc40
 DIST myspell-sv-2.14-thes.oxt 306542 BLAKE2B 0a5ebf5577e6fb8c492b13529ea904d1aceded3814e97f79e8581c55122cc647e4a32ce2bba148b123f97612aef156c5b6f425e8940d1cf80b808c259eef6fd5 SHA512 e637dc92bfc9bc86ccf10710fac1b036a99b0abc2888d30ea7dbdaca1c3cbec57fd7a184648d922b120a26f7c151b7cc043f783fb35b7e121ae22458f0a72103
 DIST ooo_swedish_dict_2.14.oxt 1288382 BLAKE2B 54a46792386e794dc836e0178929cdad75e29007ac981aaeeeb74da996d765ff8d737796568576662431c95899824d6460f099c6814fed673844ba295967627b SHA512 77ab715ccb66c7e14ed84189dd0847c809824a3cf0881ee39d08f6d4ef89eccfeafcdbde1759bfa8224650b1907760d9a48f40e464211ae12593ed5525d6372b
-EBUILD myspell-sv-2.14.ebuild 1166 BLAKE2B 6719332be478aa1cd3096a44cc3a728e9769d7cc9e42041ae54686ad997fc353b97f9e2408d42eef4008c5e17d2d3149a0af7f6b9ec124a2d25b898ed5905819 SHA512 f97640a455e383d4c254923f7c2892a9b5ef7b6a14a0bb737644af30525a60cbda943716fff6e3065cb530962db29e3fda3ca68506d0ad3aab8c6d39cb819f51
+EBUILD myspell-sv-2.14.ebuild 1172 BLAKE2B 3a7b8cf1188a13c2f2be2a5cc1a3a534eda082ebf350e6e20e535ce01fbd3d984b615031ef2bef6209f4bca5ba1b9648e305e8168d72c643a65ec4199d11c225 SHA512 62cd07cb8deeb9c6d09f3d15caa07de6471aeb29146d0e402eed0dba0a21e1cf3fbba26fdba643b8e566d42fdcb77f7fd0478dc806d263627b71a8063c701393
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
index df4cf99d0b98..26dfd2fed547 100644
--- a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
+++ b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
@@ -23,14 +23,14 @@ inherit myspell-r2
 
 DESCRIPTION="Swedish dictionaries for myspell/hunspell"
 HOMEPAGE="
-	http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan
-	http://extensions.libreoffice.org/extension-center/swedish-hyphenation
-	http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
+	https://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan
+	https://extensions.libreoffice.org/extension-center/swedish-hyphenation
+	https://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
 "
 SRC_URI="
-	http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/${PV}/ooo_swedish_dict_${PV}.oxt
-	http://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> ${P}-hyph.oxt
-	http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> ${P}-thes.oxt
+	https://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/${PV}/ooo_swedish_dict_${PV}.oxt
+	https://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> ${P}-hyph.oxt
+	https://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> ${P}-thes.oxt
 "
 
 LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-3"
diff --git a/app-dicts/myspell-uk/Manifest b/app-dicts/myspell-uk/Manifest
index ac8d291bc85a..9b4cb53ae1eb 100644
--- a/app-dicts/myspell-uk/Manifest
+++ b/app-dicts/myspell-uk/Manifest
@@ -1,3 +1,3 @@
 DIST dict-uk_ua-1.6.5.oxt 854246 BLAKE2B f8fba14ad3a57279993dc7f98b0084ba9a1f30054ce88747dfe817e3873394643b5365c2bcf9640065ba30263946580f6d510fc22c6cdcd7df6583ce01de2d91 SHA512 e1b74e299909af291e40674a6b783eacd289b16c7419e3311ea153c47520e06db70ff45a497db6d3f1cbe44bff10260e9fa6c7382d7a87e3efb2211ce1cb5ce8
-EBUILD myspell-uk-1.6.5.ebuild 690 BLAKE2B bbf0ff63d2950f23affd1e3a66c20a3a1acd63912bcec5f5f703d6ab73337344af559434a7da546a9bcc4f3089967b6aa0396aeb782912da511801429c38d6bc SHA512 2a4be7261ea6afd67af289a75ed4bfe805745d94b2399c2b5480d25ed852b344bf944a711ad9ab86663871ec785c54617d26840e549538591e7ae34a3a0ef092
+EBUILD myspell-uk-1.6.5.ebuild 692 BLAKE2B c79fd0faf72ad96d42726fa53cb3ae61db7efb2f9416312fafb2a8a5a61870a183fc2fa75507affdcbc4ed464ad5558d6dd99eb4ae143d7a5fb49a8b9370862d SHA512 89169d72ae21eb41e4e79eaa7e92500cd73de2eba6ec9d9e6c2c03378a25f1ca59d00a3c6f12e5e4fb7d7c2e351f40ff85124f1138db17335e2841add7398976
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
index 2b26ddc0cc1c..46203a4f8b5d 100644
--- a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
+++ b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
@@ -20,8 +20,8 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus"
-SRC_URI="http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/${PV}/dict-uk_ua-${PV}.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus"
+SRC_URI="https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/${PV}/dict-uk_ua-${PV}.oxt"
 
 LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
 SLOT="0"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 37c534d1af99..d7ef83c336ad 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/clsync-docs/Manifest b/app-doc/clsync-docs/Manifest
index d52c8d8c643a..a0baebc57b80 100644
--- a/app-doc/clsync-docs/Manifest
+++ b/app-doc/clsync-docs/Manifest
@@ -1,5 +1,5 @@
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 EBUILD clsync-docs-0.4.2.ebuild 887 BLAKE2B a4313ec415bf46da96fdc9c74fe23db50d02cda780234ddab9071a8eabf4020c5a9b8a31acb6acbf889fc94dbd57851f9ba54788d8f969280dc58ba868aaab43 SHA512 6694a4bf978d223ccf75219d4b85754b44b95c81cac77efa701d80def33d8c7bc0043f5a875dfde1ccf608a49bf7e57ba93118679ca8f63c1b38d3a72abe73ad
-EBUILD clsync-docs-0.4.4-r1.ebuild 848 BLAKE2B 7e9e9d8e6546a85983410bbb3a2d8877c625f7aaf21eadec5993670296495b48e2eab124bb3181530222ade526e507ff386203c54a29424e6f08c97b688ef455 SHA512 751482b5988ca95c19ca58b46afdd78e3db674048af8d8a663550bc1834e1654923c44fd5609af3dba188de019ea85561be7d8f1804f6fac52f2b268985606f9
+EBUILD clsync-docs-0.4.4-r1.ebuild 846 BLAKE2B c392b2d04c66e28c7c3bd8f33e0a5d7110eedb9e2c60eb946f76b0e7a77cccd5acc0cb94741986abaa9b5261feddbc4c7f7b187957b4d8bf55bd4830f90ab435 SHA512 17a8ea13ce82ce7acdf4064043fb6883529c269162fbdd84c6b0141f2ea29132664c9ab670f73d6d28f00620fb79edd1a6ceaa3dd6154826bfa74cfbd15d8d87
 MISC metadata.xml 567 BLAKE2B 1e86873b67b4b15004f61a36746c0ad8a4dfa1e35e3653d38e67a47f03a990170a5fba39f5190a570cc5bc202f6a62f441a36e2ed82b6c573cdb41a9d7c409c1 SHA512 9eae6e4bd8f49691b3df2d2dce4c122bd182caaabf284e7802d07571b5b929f438bd4d74961c5dcd598354f05dfdd0e8161186a11c0b52d0a456cd37628d7003
diff --git a/app-doc/clsync-docs/clsync-docs-0.4.4-r1.ebuild b/app-doc/clsync-docs/clsync-docs-0.4.4-r1.ebuild
index f7465d6bf3bb..78c6ac1084f1 100644
--- a/app-doc/clsync-docs/clsync-docs-0.4.4-r1.ebuild
+++ b/app-doc/clsync-docs/clsync-docs-0.4.4-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN%-docs}"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="https://github.com/clsync/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Clsync and libclsync API documentation"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a31421d72cf9..749ebda93bfb 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index b7b640251111..d976595f7e6d 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -6,5 +6,5 @@ DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816
 DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beead96deaa32a5e9a43241b232f021d9abe1965e10e53b941a223c500b301b1c467228bf8d9ed2646fa70bae647 SHA512 412e247ad9ba7feb768cade0a7098cc79991ccdf350248836813d572bfe2339f52c4e0e9ce631354e2c2d434217274aa9116e61d122a625a45a7f67aabd2316b
 EBUILD auctex-11.92.ebuild 1437 BLAKE2B 83409cde6a6703cef508c67329426faca2cc643ab8dad87a4666b57d5fc7e07e0647d482a13d09ab2e4a14d1bce79862b0b74bd99dc7c5110f1be8329eef7410 SHA512 88f6b9aeccc8ce30a3bfde548de53d72002ce3f8e83426c8b6526f2f103ef71b1dbc10c3a324e2157ae54c403d8689e4480b3e03be7c34f2e9b11ade5eb7042e
 EBUILD auctex-12.1-r1.ebuild 1489 BLAKE2B 15d7548be1ca4b858c271be7880105d2b714e8d5ff54f72eee6454735ff8a9a45c7403412115c4c1e2263adb84d5c7e44f51c0a214a47eb5930e4e78cc8389e0 SHA512 9aa83f869d89c340c952607b21dea505980af6b1a3d89b3a8860e2aff0a23def0f7f7acd76427b352bf741fafc1d691a978c5bfaaa9d6914c3dbde9e089754f5
-EBUILD auctex-12.2.ebuild 1455 BLAKE2B 2e1f2c5b69e9614e31a20ce4b0a7b580beddfa2f0ff745cdd9e521785313fdfc02f4581f7eb263bc5c1319896e2aab487c36ec20c364d59a42745ba6d1bd1440 SHA512 8bd4b1f75c7fed245964b8a566f086f04423d78732f97d7f652bbdfc23740a900f46aa329c625a50ef0e5acd41d41ccef245b134222d9a8d50d0b82ed943bcee
+EBUILD auctex-12.2.ebuild 1453 BLAKE2B 17582f09b626d8c95bdaedec8f7b2f94958eaa3751b85f2dbaa0985c225035cbed9ea8900a2e2fa594eec5913905c002893451b10534f7a0a7d1b9e683304140 SHA512 f8e5d2a72c02f31ad61fed27f872d02d64b5efd04da6ecf67d31b1c869c88ab4c103fe4901a77951b2731f0db7e47befb575b7951f0450d80a5830cf9bfb03f5
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.2.ebuild b/app-emacs/auctex/auctex-12.2.ebuild
index 26f3422ff612..28c55d3ff332 100644
--- a/app-emacs/auctex/auctex-12.2.ebuild
+++ b/app-emacs/auctex/auctex-12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7be690b9a5d6..01d43ee108ca 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index 860f6fa71ebf..0106984da6b2 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -1,3 +1,4 @@
-DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15
-EBUILD crun-0.10.6.ebuild 1650 BLAKE2B 35568e68e2ca72d932d51ac50dc2c48c260ee75e82250253c725936a0a99cd49961e4f94f1f2bb38f519b244edab34a6ae3e99f378ff59f1b2ea6d9202723c21 SHA512 fff73b11a9e505ae218c974e028a15bfe7c222d9ca3a999d1e45895d8f99af37895885d02edd3fed8e9102a67dffd8323bdb71cb268b6c5f8f4f24ad7246ba26
+AUX libocispec-deduplicate-json_common-in-makefile-am.patch 1038 BLAKE2B 38f49d55ad043a94ecbf977adec35e0ef3627b018c572e5190fc7dc08748cd7aff5035e43d5256b69d497eb39e9bf17501be5084f8e19b81594c14a3a449b0d9 SHA512 4044d46cd3f0de139536b54876f68da5e1d18ace6e052dde1fadb5158ebb1e615714e86ca145ae2b804b1956d804e6c2bfff0796cdffe8bdb5f730ee3710f9d2
+DIST crun-0.13.tar.gz 1305048 BLAKE2B fbffabf4cfc744522147b47c5e2bf2bc48e074866108ec4ec8ab94e7ebdc39451851696fabde268b5853e1c3fafb0ac93527e08fdb766acebdd7cf952a9e1a9e SHA512 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e
+EBUILD crun-0.13.ebuild 1571 BLAKE2B 539926e2cbee09ab60f03e80f362cc77b3338877531521b7d1047efc5a61784e40e97ef506223ab35224f04672149141094b6f0959b3cb910289fb6bb407cf76 SHA512 19e336c04e4eb9d3299ecf9c9dc6c06a5cf967d11fdc156bb6a1d7c8d5ae88a559d5b5c069c8b7122754056f4a088b97da650a66e3a97f5f45fa5d0345f504f8
 MISC metadata.xml 1031 BLAKE2B e0351ab86fa999bd962aa4b793df9dedc431885033d759590dcd4f3abb47436b7f83832138fe78c413898a04af97326d806b96b5f41b25b1ef1da0e10f947a53 SHA512 34e3e9fd8819f5fcf698a0f80acd99465b6fefb2aa33ddef9a302ced25a0eee4e522768a65e09ec3c1f9f7042f98b603978d502ef3dcea24a39bde4ded42c7d3
diff --git a/app-emulation/crun/crun-0.10.6.ebuild b/app-emulation/crun/crun-0.13.ebuild
similarity index 68%
rename from app-emulation/crun/crun-0.10.6.ebuild
rename to app-emulation/crun/crun-0.13.ebuild
index a644095e871b..5b014ac1198d 100644
--- a/app-emulation/crun/crun-0.10.6.ebuild
+++ b/app-emulation/crun/crun-0.13.ebuild
@@ -5,20 +5,19 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit python-any-r1
+inherit autotools python-any-r1
 
 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
 HOMEPAGE="https://github.com/containers/crun"
 SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3 LGPL-3+"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="bpf +caps doc seccomp systemd static-libs"
 
 DEPEND="
 	dev-libs/yajl
-	sys-libs/libseccomp
 	caps? ( sys-libs/libcap )
 	seccomp? ( sys-libs/libseccomp )
 	systemd? ( sys-apps/systemd:= )
@@ -30,14 +29,25 @@ BDEPEND="
 "
 
 # the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the priveledges
-# required to create linux "containers."
+# within a sandbox environment, due to the nature of the privileges
+# required to create linux "containers".
 RESTRICT="test"
 
-DOCS=README.md
+DOCS=( README.md )
+
+PATCHES=(
+	# see https://709982.bugs.gentoo.org/attachment.cgi?id=614208
+	"${FILESDIR}/libocispec-deduplicate-json_common-in-makefile-am.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
+		--disable-criu \
 		$(use_enable bpf) \
 		$(use_enable caps) \
 		$(use_enable seccomp) \
@@ -46,27 +56,18 @@ src_configure() {
 }
 
 src_compile() {
-	pushd libocispec || die
-	emake
-	popd || die
+	emake -C libocispec
 	emake crun
 	if use doc ; then
-		emake crun.1
+		emake generate-man
 	fi
 }
 
 src_install() {
-	pushd libocispec || die
-	emake "DESTDIR=${D}" install-exec
-	popd || die
 	emake "DESTDIR=${D}" install-exec
 	if use doc ; then
 		emake "DESTDIR=${D}" install-man
 	fi
 
-	# there is currently a bug in upstream autotooling that continues to build static libraries despite
-	# explicit configure options
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-
 	einstalldocs
 }
diff --git a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch
new file mode 100644
index 000000000000..234ac20ad8d2
--- /dev/null
+++ b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch
@@ -0,0 +1,31 @@
+From 9d58891c058efa55c7b95cb90597d4cadc5c66d8 Mon Sep 17 00:00:00 2001
+From: Bruce Guenter <bruce@untroubled.org>
+Date: Mon, 17 Feb 2020 13:54:14 -0600
+Subject: [PATCH] De-duplicate json_common in Makefile.am
+
+The source file src/json_common.c is listed twice in Makefile.am,
+leading libtool to produce an archive with duplicated symbols. This
+change removes the duplicate source.
+
+This was introduced in commit 2e318803a2c49521ea448e3ae010b1564a7e95ed
+
+Signed-off-by: Bruce Guenter <bruce@untroubled.org>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 65bed45..c7ede83 100644
+--- a/libocispec/Makefile.am
++++ b/libocispec/Makefile.am
+@@ -7,7 +7,7 @@ GITIGNOREFILES = build-aux/ gtk-doc.make config.h.in aclocal.m4
+ noinst_LTLIBRARIES = libocispec.la
+ noinst_LIBRARIES = libocispec.a
+
+-SOURCE_FILES = src/json_common.c \
++SOURCE_FILES = \
+	src/image_spec_schema_config_schema.c \
+	src/image_spec_schema_content_descriptor.c \
+	src/image_spec_schema_defs.c \
+--
+2.24.1
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 32ab96716a86..2edf5af32868 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,6 @@
 DIST diskimage-builder-2.37.3.tar.gz 444207 BLAKE2B 602a5063d54d3d4bce1a2b5a3e941ef5ad69709733c9aa9543c6b3f7e7ef1bd45399d0fd7e5b2f6dc3dc8f38fba1bf108473f89252c4b9b181f97c4dc02af18e SHA512 fff684c348f5b2ba0d3ae5ce955be4b1d47cead934c96eddcd137b1568961661c949cb53d3134359d0fa8ab753c559b7f83d5555cb6dc8fbd121cb9d05a4a66a
+DIST diskimage-builder-3.0.0.tar.gz 434880 BLAKE2B 1b51540c023852ef363788821844c34dacc33021412cf94aad5078adc526ff66693a1d7109610b4aeb0aecf3fbfa0725f7caecc471e7c6df56d266723d1411fe SHA512 dd45f8dbfd8d3af3b5862564af1a5585adeb3536fc701cd186453eba82ef85d5b2f6a95abb820f658e0332b466fec097c52f041dfe61127d58da80a0c4d9e84c
 EBUILD diskimage-builder-2.37.3.ebuild 1131 BLAKE2B ef6b738b31eb513ddafbf67750f2b1602046ad247308a553e3078456574b189bce0b34f36e2eec47900f899212c82732cefbc1a2f562fab4800419b8236c964f SHA512 e23c189d6ea70343eea54f9f62b8eb57b9b8deb5ab832d30bd9b62f32316bb87a922b92a0624aa8aba498c26a2ef4dfc06e1ee14ca3608ca16ecefbc6d20b15e
+EBUILD diskimage-builder-3.0.0.ebuild 1133 BLAKE2B 9afdb7d3d275712e8269bb56603671fbe5dab3a396efa1af3c1f72140ad7342753db7c0f78cb4d5a678c04b6ea0f457d25fe363d5fca611a56a31185a2c0db06 SHA512 75d15457af15c15acf162ea1b409f25944926c530832eac9ad5542d04696d0c11b26bc31eeb5167d0284b213c39b21efb37b5fdedb01bec0b8c1f9a73b4e4caf
 EBUILD diskimage-builder-9999.ebuild 1133 BLAKE2B 9afdb7d3d275712e8269bb56603671fbe5dab3a396efa1af3c1f72140ad7342753db7c0f78cb4d5a678c04b6ea0f457d25fe363d5fca611a56a31185a2c0db06 SHA512 75d15457af15c15acf162ea1b409f25944926c530832eac9ad5542d04696d0c11b26bc31eeb5167d0284b213c39b21efb37b5fdedb01bec0b8c1f9a73b4e4caf
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.0.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.0.0.ebuild
new file mode 100644
index 000000000000..720474e33c48
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index b2ac9cd8e94f..454128955a4f 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,7 +1,10 @@
 AUX docker-compose-1.25.2-setup-py.patch 2209 BLAKE2B 24cb97379440c94c4f18d999806dc0ffb23a5ec09915ff1e421a0135189955cbe6e67bb8f535071bfa1dfd2d7153af3e9c5e634e4de0699a8e740f6c407f233a SHA512 e9987469d46f10bfa97a6b6a65e089a6f8c86451154668e7db0ba1cd564acaad798d1aa189b458166517f19e604aee2e309941df9296be1d5e8e730252f273d8
+AUX docker-compose-1.26.0-setup-py.patch 2410 BLAKE2B c04145747e7a770646687008b6f8aa09e2bf836fce2bcc24b28bc598a0a7f89ffdae21af3f2707c6489d0553aa4697c64bcf5325f2f5b98b090c92a2f53c5a1f SHA512 b92f8401a40e22305c734a5751f4ae4a86e6f74a16cbc8626e223a0f88074a2bb938dad2a1f092755b301cf25ee44ca6899708d1883d4edd477aaec90d7b2847
 DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e
 DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
+DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25 SHA512 b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
 EBUILD docker-compose-1.25.4-r1.ebuild 1934 BLAKE2B a4e65f590d80a4e73fbe6f9a2b65d544169ba4d3a6224edf3d82bd4f39b4d59239a6aa574f853357f57e09c1cf3b168c41a7ca63404fc363f333a2825dff0688 SHA512 7a0a69eb6f572a3a09f4812473f4ba7719bc7930d29426cde5eded09d70ee36fe7f29f3a1435a5f87aa4773044b0b3b20e49007d9bd88cb3058b7f3a58abc068
 EBUILD docker-compose-1.25.4-r2.ebuild 1936 BLAKE2B 1e10965c9122e6e9a01e479b1cf58c929011c065e3994376c05f6f5a295d82579e83d717a1dd11b6b6ffef6846e137a299a77c89c2c8def0780c8c3dcf46786f SHA512 26059b485b70fe81b65588be4ae93d35bcc03ad19f48fb7ea9f362207f1901fa5e9c212243f0240ed476f69c1eb96230409ea56543ab08636d32077182478694
 EBUILD docker-compose-1.25.5.ebuild 1936 BLAKE2B 1e10965c9122e6e9a01e479b1cf58c929011c065e3994376c05f6f5a295d82579e83d717a1dd11b6b6ffef6846e137a299a77c89c2c8def0780c8c3dcf46786f SHA512 26059b485b70fe81b65588be4ae93d35bcc03ad19f48fb7ea9f362207f1901fa5e9c212243f0240ed476f69c1eb96230409ea56543ab08636d32077182478694
+EBUILD docker-compose-1.26.0.ebuild 2075 BLAKE2B d0e7b3869529fc9ee471ecae8a3e3b74a49d119992771dd773b587047677a6e98f206e8f450798a5bba1fd84bd297c499cd9f98cbaf105e8291a1a1899378689 SHA512 ec30e3d9c6f43001dee3b75227b7d4d5d99877fe420d486a3c060f49329b0d10f51be1f49722984f84b81f0b66967b436ea1654e7a9bd7f8120ec7fac47dd633
 MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.26.0.ebuild b/app-emulation/docker-compose/docker-compose-1.26.0.ebuild
new file mode 100644
index 000000000000..15370a280e34
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.26.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.26.0-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/docker-compose-1.26.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.26.0-setup-py.patch
new file mode 100644
index 000000000000..6ca97583f978
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.26.0-setup-py.patch
@@ -0,0 +1,77 @@
+From 7ec7b93f3d2b7daa347d442a525a4cc358b57ed3 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 3 Jun 2020 17:04:41 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index efc144b..2f4d1cb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,38 +30,38 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-    'cached-property >= 1.2.0, < 2',
+-    'docopt >= 0.6.1, < 1',
+-    'PyYAML >= 3.10, < 6',
+-    'requests >= 2.20.0, < 3',
+-    'texttable >= 0.9.0, < 2',
+-    'websocket-client >= 0.32.0, < 1',
+-    'distro >= 1.5.0, < 2',
+-    'docker[ssh] >= 3.7.0, < 5',
+-    'dockerpty >= 0.4.1, < 1',
+-    'six >= 1.3.0, < 2',
+-    'jsonschema >= 2.5.1, < 4',
+-    'python-dotenv >= 0.13.0, < 1',
++    'cached-property >= 1.2.0',
++    'docopt >= 0.6.1',
++    'PyYAML >= 3.10',
++    'requests >= 2.20.0',
++    'texttable >= 0.9.0',
++    'websocket-client >= 0.32.0',
++    'distro >= 1.5.0',
++    'docker[ssh] >= 3.7.0',
++    'dockerpty >= 0.4.1',
++    'six >= 1.3.0',
++    'jsonschema >= 2.5.1',
++    'python-dotenv >= 0.13.0',
+ ]
+ 
+ 
+ tests_require = [
+-    'ddt >= 1.2.2, < 2',
+-    'pytest < 6',
++    'ddt >= 1.2.2',
++    'pytest',
+ ]
+ 
+ 
+ if sys.version_info[:2] < (3, 4):
+-    tests_require.append('mock >= 1.0.1, < 4')
++    tests_require.append('mock >= 1.0.1')
+ 
+ extras_require = {
+-    ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
+-    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
+-    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
+-    ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
+-                                'ipaddress >= 1.0.16, < 2'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
+-    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++    ':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
++    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
++    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++    ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0',
++                                'ipaddress >= 1.0.16'],
++    ':sys_platform == "win32"': ['colorama >= 0.4'],
++    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+     'tests': tests_require,
+ }
+ 
+-- 
+2.26.2
+
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 0e39c479685e..7e90dcf555a7 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -6,4 +6,4 @@ EBUILD faudio-19.06.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101
 EBUILD faudio-19.09.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
 EBUILD faudio-20.02.ebuild 2506 BLAKE2B a313fbda2f0ed92df9bd0452f7a872e8701c093c5e9d847bda62cd673ce55f22f5768b4d22e28e9021e4501ee6dbee64dc5d6727ce6f42f0b629f1be9e6c18a0 SHA512 c5bd2e5fdb42e47802e4cc244fbcbd20ff77de4cd864c64968d437c0ef2e0d590924b1c5cf6813f3edb8534713fcf5a80cb039cbbeb0e0c1cb0893b9d74c06de
 EBUILD faudio-9999.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
-MISC metadata.xml 1485 BLAKE2B 2be9f299ab02a56e964c19978b78e201ff03e06bc870f8b7703ab6f7ff2f4ec8ce567433ecf3deb6736b96d1bc411ab147fc84c68a28b4c3f2afcd159e813a8b SHA512 b9df5b457ef4139f8be77d92c2f6992452ed1d69dd654743742e1421f4893997a190be6746ac850aae54510ddea398834e3de937a198e3aea54731b10668f178
+MISC metadata.xml 1414 BLAKE2B 5780361588a5f05dd9cc4d935642aeb7f89c28fb126b1e8bec0a09044eb9386b742e57fd06523babdfdb0d0a0b68a05a9ca7d5c4b53dee6e4bb3e10b14e11e25 SHA512 8cd27251e176ae48c50cb0cf6b632fee1178903c832e60a6afc74119fe8fd55328a92ad7d4f16e23a27812d98efdc5b21fb2e118da04e34dbf62b1843e039471
diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml
index 02b4abecea6c..e5eb47a51e63 100644
--- a/app-emulation/faudio/metadata.xml
+++ b/app-emulation/faudio/metadata.xml
@@ -18,7 +18,7 @@ Project Website: http://fna-xna.github.io/
 	<use>
 		<flag name="dumpvoices">FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.</flag>
 		<flag name="ffmpeg">FAudio has optional support for decoding xWMA resources using FFmpeg, requiring:
-			<pkg>media-video/ffmpeg</pkg> (note: this feature is not supported by <pkg>media-video/libav</pkg>).</flag>
+			<pkg>media-video/ffmpeg</pkg></flag>
 		<flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by
 			<pkg>app-emulation/wine-staging</pkg>, <pkg>app-emulation/wine-vanilla</pkg> for faudio XAudio support).</flag>
 		<flag name="test">Build and run faudio testsuite.</flag>
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index dcd74b075adc..ceea8f1c46b3 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,8 +1,4 @@
-DIST nemu-2.1.0.tar.gz 89117 BLAKE2B a44bf67990d79af0b73caf077266c4775f302ffc81d2394993da45870a72f462d487a92d63abdbe875c382d11b8d691f446a5e0b7270355770838ea86328fb1d SHA512 7e655227e22f5e2dd5ec1f77ef1635f1aaab2e57e417fb33d83d35cc67d7b802c35fa9174cf4282287213a1a825714743773260b96b452a382a8248fbef238bf
-DIST nemu-2.2.0.tar.gz 94061 BLAKE2B 95304e8834f1d5c1e31065728363de5d797ae79554733dd3fecd90388b2766bc8907acfeded36676272967153eed5a7f30baba9ef2384fca67d19f3519461fa6 SHA512 2f427a560ea5ac4112b7d5cdd8524366521ca3d185676a4faa9bc480331c3381b7a362aed20025dc1acc0f576f07fb627b03137e1998926761a169c5be0eaf97
 DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a
-EBUILD nemu-2.1.0.ebuild 1672 BLAKE2B 7120f2c3a00e22e6ff2e3535b8fbb51d1995e85075386e32782ab98799a9a6de36618493caef92022ef6bcbb1865cd559cc6282e50627256a5136f25b8df8c77 SHA512 f4f0b240a8716757a80564cf4f0cd65b8592a6c45276e4cb2a2c90c6e7a7aa3406fac0b91b7ab98f551b8482390571432063c062880488ffe589bb404b9f2f17
-EBUILD nemu-2.2.0.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c
-EBUILD nemu-2.2.1.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c
-EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
+EBUILD nemu-2.2.1.ebuild 1860 BLAKE2B ebf283bb548989ac7ce577f795af1989ca0153c36e93a0f26089c51e730f4db118d9e88fd13d46c6df5b21f431fbfa421f89f6a6ad0d0ca259bdd70e1e3a9259 SHA512 408fd8685a06b5d4f0d384d4115bb66825ec540370152f39a14545415dd798605839426ebd3292ff3516ec6e5422bb6e7744c88b8195b59dc1f8e47670c246ba
+EBUILD nemu-9999.ebuild 1807 BLAKE2B 184913b0d41c88acc6861ca2cd1f1dca5d82c6646ae7066465e82782eb610712e75a0ddfb1431fdf414e4aa57f66438a80e61fc5f266d3204be08bd0e3fb7a21 SHA512 c36e0f8285d7131ae2d72b9ec9c061f2f32749565537f7863ffce35eb7f52a7d438b33ce06d451e15e4490f7cc188c382641e4b21fc4a2bbb946f7fafa70aa8d
 MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315
diff --git a/app-emulation/nemu/nemu-2.1.0.ebuild b/app-emulation/nemu/nemu-2.1.0.ebuild
deleted file mode 100644
index 2f7326437e33..000000000000
--- a/app-emulation/nemu/nemu-2.1.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils linux-info
-
-DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://lib.void.so/nemu"
-SRC_URI="http://lib.void.so/src/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+vnc-client +ovf savevm debug"
-
-RDEPEND="
-	virtual/udev:=
-	dev-db/sqlite:3=
-	virtual/libusb:1
-	app-emulation/qemu[vnc,virtfs]
-	sys-libs/ncurses:0=[unicode]
-	ovf? (
-		dev-libs/libxml2
-		app-arch/libarchive
-	)
-	vnc-client? ( net-misc/tigervnc )"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-		-DNM_DEBUG=$(usex debug)
-		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
-		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel"
-		else
-			CONFIG_CHECK="~VETH ~MACVTAP"
-			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
-			ERROR_VETH+=" into your kernel or loaded as a module to use the"
-			ERROR_VETH+=" local network settings feature."
-			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
-
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "For non-root usage execute script:"
-	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
-	elog "and add udev rule:"
-	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
-	if use savevm; then
-		elog ""
-		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
-		elog "Get this patch from nEMU repository"
-	fi
-}
diff --git a/app-emulation/nemu/nemu-2.2.0.ebuild b/app-emulation/nemu/nemu-2.2.0.ebuild
deleted file mode 100644
index 7b885f4f50c6..000000000000
--- a/app-emulation/nemu/nemu-2.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info
-
-DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/"
-SRC_URI="https://lib.void.so/src/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug network-map +ovf savevm spice +vnc-client"
-
-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 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="sys-devel/gettext"
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel"
-		else
-			CONFIG_CHECK="~VETH ~MACVTAP"
-			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
-			ERROR_VETH+=" into your kernel or loaded as a module to use the"
-			ERROR_VETH+=" local network settings feature."
-			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
-
-			check_extra_config
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNM_DEBUG=$(usex debug)
-		-DNM_WITH_NETWORK_MAP=$(usex network-map)
-		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
-		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
-		-DNM_WITH_SPICE=$(usex spice)
-		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "For non-root usage execute script:"
-	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
-	elog "and add udev rule:"
-	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
-	if use savevm; then
-		elog ""
-		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
-		elog "Get this patch from nEMU repository"
-	fi
-}
diff --git a/app-emulation/nemu/nemu-2.2.1.ebuild b/app-emulation/nemu/nemu-2.2.1.ebuild
index 7b885f4f50c6..7b191e31dc57 100644
--- a/app-emulation/nemu/nemu-2.2.1.ebuild
+++ b/app-emulation/nemu/nemu-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://lib.void.so/src/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug network-map +ovf savevm spice +vnc-client"
 
 RDEPEND="app-emulation/qemu[vnc,virtfs,spice?]
diff --git a/app-emulation/nemu/nemu-9999.ebuild b/app-emulation/nemu/nemu-9999.ebuild
index fe30968437c7..b171fc8f123e 100644
--- a/app-emulation/nemu/nemu-9999.ebuild
+++ b/app-emulation/nemu/nemu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,25 +6,25 @@ EAPI=6
 inherit cmake-utils linux-info git-r3
 
 DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://lib.void.so/nemu"
-EGIT_REPO_URI="https://bitbucket.org/PascalRD/nemu.git"
+HOMEPAGE="https://github.com/nemuTUI/nemu"
+EGIT_REPO_URI="https://github.com/nemuTUI/nemu"
 SRC_URI=""
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="+vnc-client +ovf savevm debug"
+IUSE="+vnc-client +ovf +spice savevm svg debug"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
 	dev-db/sqlite:3=
 	virtual/libusb:1
-	|| ( sys-fs/eudev sys-fs/udev )
-	app-emulation/qemu[vnc,virtfs]
+	|| ( 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
 	)
-	vnc-client? ( net-misc/tigervnc )"
+	svg? ( media-gfx/graphviz[svg] )"
 
 DEPEND="
 	${RDEPEND}
@@ -36,6 +36,8 @@ src_configure() {
 		-DNM_DEBUG=$(usex debug)
 		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
 		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+		-DNM_WITH_NETWORK_MAP=$(usex svg)
+		-DNM_WITH_SPICE=$(usex spice)
 	)
 	cmake-utils_src_configure
 }
@@ -57,11 +59,6 @@ pkg_pretend() {
 }
 
 pkg_postinst() {
-	elog "Old database is not supported (nEMU versions < 1.0.0)."
-	elog "You will need to delete current database."
-	elog "If upgraded from 1.0.0, execute script:"
-	elog "/usr/share/nemu/scripts/upgrade_db.sh"
-	elog ""
 	elog "For non-root usage execute script:"
 	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
 	elog "and add udev rule:"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 8392a583d065..7f3cf0adae21 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,6 +5,8 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
+AUX virtualbox-6.0.20-qt-5.15.patch 2901 BLAKE2B 8bfae6b0be61dadf2cf7c1abc3d53c4b5ec81da7eda5e3ba9e8cde57b514430ae51d30d6182fcc9ff62bae4e611d44d50d088539991b431ea4dc6e59269e2731 SHA512 695f71848e549d9794e8f3690828ee1a20cfd8e51682710c35a8fb24405c0eb11bf9bcbebdb77eecc282f291588340de0d79fa23a9a609da30b6145ea2bf2455
+AUX virtualbox-6.1.6-qt-5.15.patch 411 BLAKE2B 1fd5cd928daa30e9b7b6c96ef4fe601339083be935ad58655e353793c93615788192b1e0dd6d59391e884709b0898bd361b8002641af00b44060da944612301a SHA512 09e82dcf39d3f281720c638557f5bdec4d4a22ab3f20fbee53271f0527b6a3b814ce6a656b2eb14508118edb1d6dda4e502aced970539f7bb69fa86da35d00ac
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
@@ -16,6 +18,6 @@ DIST virtualbox-5.2.36-patches-01.tar.xz 3440 BLAKE2B 66749efba87d82ed4a11ff0944
 DIST virtualbox-6.0.20-patches-01.tar.xz 3464 BLAKE2B dbfd15322edf178e752139c6f82be966422ff0d3c5d914fe8d4b6980f5805d27552dc813e97ea17665004d5f6cc3486461732edaaeabdd59cd1799b2ee85af06 SHA512 04f0c9d0565c77bca334cbcfd8ac439dff1a1d8246dbea3f5e06035eff6f6dd72b54f2227d6197e2851e418ad74bb4feeef07e442f3441bc75d80a72d0d0e00d
 DIST virtualbox-6.1.14-patches-01.tar.xz 2344 BLAKE2B cb89af8ffe0ecaa54929349abfb1541ca8630063d8282e773e4c66c3eec3ed108328b1ee81247d997981e5d49792b4019e1358b270c3622508b62e647c544ae4 SHA512 b08c2f66a050270a5c8b4d7264b1cf0afaf7809c3888c48a9b55ac75f0906bdb6bc28eef136ce032c777a810f2ce0a3cf6bb3df0259e5a6737f9ecc3ea708bba
 EBUILD virtualbox-5.2.40.ebuild 14429 BLAKE2B 1cb2f4e3a7c88984ad60aece1250e4bc1f6fb6355f13ac8b2f933427ff3036b3b93fe881727a34f1dac1e8d157ff146cf1cd8ef13b444d841432901bed97aeaa SHA512 6cfe81f12807d6622a8caec221fa2e03018e49fc3eb5ca962aa4e49a721aff0cab75d8c08b0133f05d53cff09c789975fc95b7729f58b85e172f91c4a81123de
-EBUILD virtualbox-6.0.20.ebuild 14591 BLAKE2B 5a78a6463de2c70a35c08c0e753d18dff3cb9547cd313905613ec59d1c03c90ea64af6d1a988bd37db254f6fbc9553be5a1ff0cec6b974e3be55f495e3e074bb SHA512 9e31c7bf3ecbc00f952db7fa6674f55d33a634c3e139dd22f1ba487b94686b2b3acd9e57f7fdb93a38d5f0b23bc6ff51e5186b11eb4bfc502271d86898239a11
-EBUILD virtualbox-6.1.6.ebuild 14468 BLAKE2B 6df18fc2376e5f568c295358c0681eb0582d098827829f15b3f80f7e53cb387d5980f35a90d446386cc1b07733d7262f8e67dade5a860ad504ca82a02d45ccbd SHA512 827573c866c28241a1a1499fa9b96b9e5799d7850c6094aed369aa8c5fc62e8d02d0e45ccbb2df8ef337ab1c4d40df8b1547f2c4a7e0846abd00e60841d7da75
+EBUILD virtualbox-6.0.20.ebuild 14663 BLAKE2B 5ece72f1aebadd85661d5af78e683067faecde668c7da1f3399c9bcf647ccb7b7da6aaf29f5a97915ba341aeadcb68d8f5521f203d33a3ba4ddf8b68bb1be84e SHA512 a5b7d584deeaf72e0970c592b36d96b7ec8a450c28c068615109d7ce09b915427ebf193b741d002a45c35540f4679c76851790e9e202e7616df8c5778ab76fed
+EBUILD virtualbox-6.1.6.ebuild 14595 BLAKE2B 8a17502839b020b1c87da5372565c4d04e7f71d70d4f2cb1bd2f6c18bd5b568cc04800199bc29027078b9a522efbe39e53cee6d9f260984aa64fe9cdef8c1a1d SHA512 c243bec12840a62fb34eaf6ab63675e58525f5bce9e158e043c8164bf91717aba26a2c68b74eb7ce61720b28a73ac20e26428e9802f79169fc28d08378551a73
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch b/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
new file mode 100644
index 000000000000..7ba03f02259c
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
@@ -0,0 +1,82 @@
+--- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:51:41.504432532 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:49:26.943858460 +0300
+@@ -17,6 +17,8 @@
+ 
+ /* Qt includes: */
+ #include <QPainter>
++#include <QPainterPath>
++#include <QPainterPathStroker>
+ 
+ /* GUI include */
+ #include "UIImageTools.h"
+
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:09:50.369275092 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:01:14.152354690 +0300
+@@ -24,6 +24,7 @@
+ /* Qt includes: */
+ #include <QIcon>
+ #include <QWidget>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UILibraryDefs.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:39:54.773447224 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:41:36.274371761 +0300
+@@ -21,6 +21,7 @@
+ #include <QPainter>
+ #include <QStyle>
+ #include <QToolButton>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UIMenuToolBar.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:39:47.613523134 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:41:29.655441857 +0300
+@@ -29,6 +29,7 @@
+ #include <QMouseEvent>
+ #include <QStyleOption>
+ #include <QPainter>
++#include <QPainterPath>
+ #ifdef VBOX_WS_MAC
+ # include <QStackedLayout>
+ #endif
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:40:01.624374596 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:41:40.654325376 +0300
+@@ -23,6 +23,7 @@
+ #include <QScrollBar>
+ #include <QStyle>
+ #include <QVBoxLayout>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UIFilmContainer.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:40:08.844298062 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:41:44.594283652 +0300
+@@ -22,6 +22,7 @@
+ #include <QPaintEvent>
+ #include <QStyle>
+ #include <QVBoxLayout>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UIPopupBox.h"
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:40:16.064221530 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:41:52.014205079 +0300
+@@ -27,6 +27,7 @@
+ #include <QToolButton>
+ #include <QVBoxLayout>
+ #include <QWindow>
++#include <QPainterPath>
+ #ifdef VBOX_WS_X11
+ # include <QWindowStateChangeEvent>
+ #endif
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:40:34.375027462 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:42:01.244107347 +0300
+@@ -18,6 +18,7 @@
+ /* Qt includes: */
+ #include <QPainter>
+ #include <QTextEdit>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UIPopupPane.h"
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch b/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
new file mode 100644
index 000000000000..6518f60d0808
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
@@ -0,0 +1,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:40:22.314155286 +0300
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:41:56.544157111 +0300
+@@ -28,6 +28,7 @@
+ #include <QStyleOptionGraphicsItem>
+ #include <QTimer>
+ #include <QTimerEvent>
++#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UIGraphicsButton.h"
diff --git a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
index f16c7450b105..7e8e5d10fb39 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
@@ -207,6 +207,8 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	eapply "${FILESDIR}"/${P}-qt-5.15.patch # TODO: upstream, bug #726154
+
 	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
 	eapply "${WORKDIR}/patches"
 
diff --git a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
index 7ddbfdc42040..df439dfa0f30 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
@@ -207,6 +207,9 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	eapply "${FILESDIR}"/${PN}-6.0.20-qt-5.15.patch # TODO: upstream,
+	eapply "${FILESDIR}"/${P}-qt-5.15.patch # ... bug #726154
+
 	eapply "${WORKDIR}/patches"
 
 	eapply_user
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 7873d07687ae..64b105ebd3cc 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,12 +2,14 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
 DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
+DIST wine-5.0.1.tar.xz 22476496 BLAKE2B 8fd7729812c0144b6c9ec7f28ecc25bca5bc7801d9927346928f43fc46ca0be89ecb4caefb7a93cf2f3365e088d11e6bd53a028ea8cc9e170ef864ff63f21a5a SHA512 d9756f0a74417ea9e05d08a94ff29b83ebff3db3a3cbaa90979d5312754371ddfcab6bded73a246ef980252b908d8a26e93de2779b766c4bff92c91f8c315d98
 DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
 DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4
 DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407
 DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
 DIST wine-5.9.tar.xz 23802356 BLAKE2B 1879c164c647a5b849056e4149a809c390814ae832773a44347cf1902fd49cb6619b4add5ea2d421c189d92b5c907daa0d6f62c37c48a8bd68d0eaa9eb465433 SHA512 edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
 EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05
+EBUILD wine-vanilla-5.0.1.ebuild 17554 BLAKE2B 4fb5c237a16645195516f980e6a0bb96a9a263423b7489b8f425326a65ab5b06a75fc705862940220bc762dbaba5816eb340ef9f8427f08a2a6678fdb05b9429 SHA512 33011fd9ba031978b4351f8ff5b8eeffa692062df4a511fb105231e493742d55c0430a256551cc08cc8caf9c546de38eb0a4e1fe1ee98db0a391233b231a5d1c
 EBUILD wine-vanilla-5.0.ebuild 17490 BLAKE2B 99c20620e3a74afb13605a253695de535a1fb09afd3c79c12769379993cceb2cfd387433023c7a45bb265df77eac933e3edd31fdf5e36cc7eefc28b96abd7924 SHA512 229049df1bfe362260b46a71608010be777ca26de04340aa465f6675c1e249d5e8a2b9d5f7b42c9ab55207d90bca3fd1bb6625ba5e1d27ed2993cf3b4176be0b
 EBUILD wine-vanilla-5.6.ebuild 17575 BLAKE2B caa74ad628520bd34a659b9c9f453fd62c8abb0c1d2714cc0d9ebcffa6fa876ca1c993978187bbc9c5cf455493cd01294d957bd235d3e046dba55843d2cb458e SHA512 9dda07ac24cd60bd4eaf15e51c8dca22281059bd43cb71571476d5d27e83bade73a4826c1f118709430e625c40666b8dae16ab4c0d5b1e52109d509d911299b8
 EBUILD wine-vanilla-5.7.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
new file mode 100644
index 000000000000..2c8da9a04c68
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20191222"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.9.4 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index a08ff01d3094..bd82a0d311d8 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index fd97d3d1b123..f40be6958641 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -2,5 +2,5 @@ AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338e
 AUX blas.eselect-0.2 4948 BLAKE2B 1d96b09958669a85b6276ebe29f146cd592c141b11454c0c981c24e6a93f17779399300bfe540aa89c11f2399ef6a716728e3e2297e0cab8a1652b96a0c5ca94 SHA512 f312bb665fd70ec479fcd1e2fe11b50ccf8b6e80b8513e41a648328f521e7fc0639e83bc615afa177f780d3ec3d37ebee0c4755d2d03a3a604d71562791b4b11
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
 EBUILD eselect-blas-0.1.ebuild 699 BLAKE2B 5c6b8c0a6bc222efc70382c458b082d9d5360bea2d8b6ec22d448a6ffbbf71d34ea0bde803d12b8d204a66ef7d928bc89262c2a57a3709c031b35390da705845 SHA512 d3caee097a979becdb4b5ab672819839b2b94f87840ef0a81e9d788b1c281a0dfbd13c977d527c3ee9dd9dc640c48fd61989325f8e88af4ae5f213e238afc339
-EBUILD eselect-blas-0.2.ebuild 672 BLAKE2B 7c556a753c3f9449bafb767d2bb08e08b3769e08de584b34db9cd5e69d5977b0a632615004581cd01cb028d31960c44245c0d27517e700022c97435765d3a514 SHA512 54da8f789f3acff87552038dd2e489ea82b6c24fdd2e624844926e77d66434dcd1bccf3a9e8e9707d8848d2076163d9eaf191968d12d9891184e6a4614af7e49
+EBUILD eselect-blas-0.2.ebuild 671 BLAKE2B 0695e5fe61bedb4b3da467141277505352e8aa6550ce7bf0070437fb5e9147a03b222fccbc7d21257f5bf8dc0e0dff57f45c9b296d63674bafbac64cff6aed8a SHA512 c049e89fdd95561d73110947760c6edcc1d30973eace2f1218ec4c483ef10818f68936413a1699aed3bcd3163dee8c9ebeead729efb7c9f330517a52afc3eea6
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
index 930087457bb5..477b648968ff 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index bffc569b3e5c..245fce17edf3 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 86cff88efbaa..1b2a944d2fbc 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,5 +1,7 @@
 AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38a9ef2fc2df0d2274dcd3b8071fac0aef0accbf7c21f0d4e98b9587d665b13195d7efc04bbf58218de84069a2c63eaa79156363061dd86 SHA512 3399052f0d12eb55554d5cc98637125e6648a56f3dc87eb2fadc63af3fb82bba915e820c51596d9106637f6a063100f217ad001422a61f8925db5c5b2024c976
+AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
 EBUILD ibus-pinyin-1.5.0-r3.ebuild 1180 BLAKE2B 6aa0f69342db4a3227b65ab86338e627af2a29bbb9422f8a0b4460ffda63d6ed5ab99ed6887fb2f7e65ed2cf2dd665e2585232ebc224b0104e474ae25221864c SHA512 c648d2a7968822dfda6d2d3f1ea449029e21bbb0a806a7b986846428b0da2c715d4ebda3c01e4c821b1fa88206dc19bc47a72e6ac7f2d9007371c4e73408aca4
+EBUILD ibus-pinyin-1.5.0-r4.ebuild 1172 BLAKE2B 9987063795b673129cb453114c3bbb71dbf3131a24c7651b245e70c165564618458f13632b7a296aa0c3aa76e4089aa7f47652c2665e4b1105e25782854e2e8e SHA512 5ccafb4471c60ac898ea219478968eef7860f9bfb1e1ec239ad2432ac04b1f7c9a7d418bcc0161e72e9e4991854158b35942c22428917fa9f4006840e0696817
 MISC metadata.xml 675 BLAKE2B 53ddd9a158adba18b4bbb56af1f1e75013c61ea23c245703489b677ed3a5eefd1fb0bba28b4269c5bff4ca6453ea5bb4027b0904f21ee89ecc2ca0d5c7041b52 SHA512 87c1743bc802f22de1d2441403b00eaee1a834730ee1b9f3c3ae62728fdc7073bbe01faec464042243ac7dea1ce11aca709bd5d836fca3c09ccb77c64ea27aea
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch
new file mode 100644
index 000000000000..03988ee0ab7e
--- /dev/null
+++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch
@@ -0,0 +1,91 @@
+commit 616770084991de0f36bea7b5861ef1b1657c9a31
+Author: ZhaoQiang <zhaoqiang@gnome.org>
+Date:   Mon Nov 19 19:35:10 2018 +0800
+
+    Update ibus-setup-pinyin.in: to avoid ibus-pinyin-setup crash in pure python3 env.
+
+diff --git a/configure.ac b/configure.ac
+index aa6242a..ca99a6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,11 @@ AC_PATH_PROG(ENV_IBUS_TEST, env)
+ AC_SUBST(ENV_IBUS_TEST)
+ 
+ # check python
++AC_ARG_WITH(python,
++    AS_HELP_STRING([--with-python[=PATH]],
++        [Select python2 or python3]),
++    [PYTHON=$with_python], []
++)
+ AM_PATH_PYTHON([2.5])
+ 
+ # --enable-boost
+diff --git a/setup/ibus-setup-pinyin.in b/setup/ibus-setup-pinyin.in
+index 2566737..314072c 100644
+--- a/setup/ibus-setup-pinyin.in
++++ b/setup/ibus-setup-pinyin.in
+@@ -26,5 +26,5 @@ export IBUS_PREFIX=@prefix@
+ export IBUS_DATAROOTDIR=@datarootdir@
+ export IBUS_LOCALEDIR=@localedir@
+ cd @prefix@/share/ibus-pinyin/setup/
+-exec python main.py $@
++exec @PYTHON@ main.py $@
+ 
+diff --git a/setup/main.py b/setup/main.py
+index fb27103..2e4051a 100644
+--- a/setup/main.py
++++ b/setup/main.py
+@@ -20,15 +20,21 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
++from __future__ import print_function
++
+ import gettext
+ import locale
+ import os
+ import sys
+ 
++from gi import require_version as gi_require_version
++gi_require_version('GLib', '2.0')
++gi_require_version('Gtk', '3.0')
++gi_require_version('IBus', '1.0')
++
+ from gi.repository import GLib
+ from gi.repository import Gtk
+ from gi.repository import IBus
+-from xdg import BaseDirectory
+ 
+ import version
+ 
+@@ -250,8 +256,8 @@ class PreferencesDialog:
+ 
+         def __correct_pinyin_toggled_cb(widget):
+             val = widget.get_active()
+-            map(lambda w: self.__builder.get_object(w[0]).set_sensitive(val),
+-                self.__correct_pinyin_widgets)
++            for w in self.__correct_pinyin_widgets:
++                self.__builder.get_object(w[0]).set_sensitive(val)
+         self.__correct_pinyin.connect("toggled", __correct_pinyin_toggled_cb)
+ 
+         # init value
+@@ -300,8 +306,8 @@ class PreferencesDialog:
+ 
+         def __fuzzy_pinyin_toggled_cb(widget):
+             val = widget.get_active()
+-            map(lambda w: self.__builder.get_object(w[0]).set_sensitive(val),
+-                self.__fuzzy_pinyin_widgets)
++            for w in self.__fuzzy_pinyin_widgets:
++                self.__builder.get_object(w[0]).set_sensitive(val)
+         self.__fuzzy_pinyin.connect("toggled", __fuzzy_pinyin_toggled_cb)
+ 
+         # init value
+@@ -404,7 +410,7 @@ class PreferencesDialog:
+         elif isinstance(val, str):
+             var = GLib.Variant.new_string(val)
+         else:
+-            print >> sys.stderr, "val(%s) is not in support type." % repr(val)
++            print("val(%s) is not in support type." % repr(val), file=sys.stderr)
+             return
+ 
+         self.__values[name] = val
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
new file mode 100644
index 000000000000..2ff6a6240e33
--- /dev/null
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/pyzy
+	dev-db/sqlite:3
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	boost? ( dev-libs/boost )
+	lua? ( =dev-lang/lua-5.1*:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-boost.patch
+	"${FILESDIR}"/${P}-content-type-method.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable nls)
+}
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index d87c8e90cdc3..f49361d7c399 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,5 +2,5 @@ AUX ibus-1.5.21-fix-authorization.patch 6553 BLAKE2B 99207da7679f7751cc90ed9b23e
 DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
 DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
 EBUILD ibus-1.5.21-r1.ebuild 4198 BLAKE2B 9da040a6f282dae6c6a669672ca2e346e2ddb111dc2bb9d6469736258139a77c9dac2da81996a1f915110e3f8b588544c214d84dbd0baa2e6788890675c3fc8e SHA512 ec0eedb15e94a726375235e9fdc17397911a86755b94c68d6d647523b542c68cedd761011052117c4de9087c4c53f92d03a67147d01b237d703a31d7c4725b17
-EBUILD ibus-1.5.22.ebuild 4126 BLAKE2B 1ddb8d94ac83d214f080c1ad7dc63aa3fac674c2c03c1f9b6b0e4382f9d220d7ec556890f9b80eacfe84d519a933812f70d4df57ee18714100fc10e334c7b6da SHA512 9d89cae90bbfe5fc6d0492325bb4ac7f724e80f70e467bf12a32dd6d9e343abce9a064245c33a5b697dbbfbb01c4ba326fe0d83dc651d489ded9e924cd650346
+EBUILD ibus-1.5.22.ebuild 4120 BLAKE2B bfa4118b48ed6504f4876650071947002f87f10f6375fb3ff248f074ed640fc12411a78d69b25790f862c8fc2050ca58538f340fd44f320aa9a9b6d0d8fe4f6d SHA512 407ddbccaf6d6e603c06c512d2f26bae39c8d78ffa998f049940c42db0affab5b5a12793663a4016ea0fe0ff658223677ba773234ca60b65cfb76d5846f27e0b
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 5bd83c3fbbe4..237386ecfc42 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="emoji? ( gtk )
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 9678e23ef53a..6a7af8aece0b 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index 15ae71e53c7d..b9c015898833 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -1,5 +1,5 @@
 DIST abduco-0.5.tar.gz 15790 BLAKE2B 6541c758aa5b2ece2f4eae744e9d9da7f8b4cf0d1e39546708e73631688d31c71c74af31e65cdb26bb046b6bf7f595409c0a71027c681fba1d4b3997020b1428 SHA512 e0772b8eecc1fb6f16c7516a6956825b9bda4149f00f56b34e68ec3544f74c2270ba8cc2642599de26ae34d11ed78b8bba70497bfc9a79f3008f50de02ce49d8
 DIST abduco-0.6.tar.gz 15829 BLAKE2B fd6c1670e0a4cf95bfaa00734b981c23877b79ffc14dadae8c84fb198cb4f585cdacf874e127190b6f8c8b784cdfa403a8be0f4cae8bc442d43723967f4525d7 SHA512 3b70a5cc10f0a2743dcbdf6eebdcfcee0e4f4ff8c6ce0bf0aa9f55c3fa85ab43aa659997735e063eab36aba69f91be7bb5519f3f632bff1b9098f5179165c1f2
-EBUILD abduco-0.5.ebuild 850 BLAKE2B bc7ef19288730e9e4c867d8df3d95f8eee6c2d7efea37347c1ea33a24f2b952d9f53c15b03c978e00c56d3d8b2d78ccada1f72202f648436e6b7084fda6c9b48 SHA512 9635efe7b043c02b3fbeee37ae1b6f3c35cd95782d4dcd7d00e0550d95b49f283419eda86f94f58849b76b2b2ca082efaeb3bd1483901d74fb94f4931ae313a2
-EBUILD abduco-0.6.ebuild 840 BLAKE2B 5dff2465e0a29ddbfe5aa217b773cf84c26601c8eab4bfb4467a7af4df9a52a74ac38af89aacd8d8b005581db75c3773ceb5b0256db2488b8f949cc5eeaaf97f SHA512 ca7b46ee13e03afa73a60f8b301b91720fef4e6aefa457cbb4e42ad3ca897f8e6a587e133f974fac6b729c9a40f0673ab2ed6e788cf677d7970edc273217f336
+EBUILD abduco-0.5.ebuild 849 BLAKE2B c603251f7d29c92f882c7f8f98a1550b5abb02243c5c23da97fb865e40aa146bdf42621d5854e426952d1bcd832b47ae5d102d49186a49ed237ba1d227af48ef SHA512 3d34be8f90ab6f3016cb5431466821c5b122d1ca6f9989c9f19f95aef368092b9281c0bf3c5ce25a0cf97bc2f7c67ff676d45b3867d787f73b87ccbfc86b08c0
+EBUILD abduco-0.6.ebuild 839 BLAKE2B 0af65b0c9f0bd05b80511574bf67706a1eb6ddc33f35fd541d102847041d196356220a285c52ee8855aaa022388ce5d082f02bcf3d7a0fcc76e8fd0c18027611 SHA512 cdcdc9017752b118c7f38643048e3d73c28ceac9dd95c89a25530524fe3211c620af7e891fc0c3e07bb5481acf56b86313f8f4b302052ee69c285418106e84b1
 MISC metadata.xml 522 BLAKE2B 46bbeb1dd0a4ed305a71aad81f6cc505ab1994ed6f1f4d04f608523f1570cee1efc69394dd50c3e3e77409a90dfd29ecc5a60488a319074bb40a5ce7edcfa1bc SHA512 419afcca69423826de2226f6d577d610a1565d499e001531563e3f4c7952da0b5c8d7824a7d35359de153e68434de9c8326f9406d9833387423d66c7c111426c
diff --git a/app-misc/abduco/abduco-0.5.ebuild b/app-misc/abduco/abduco-0.5.ebuild
index 569c89575b42..6c804288e637 100644
--- a/app-misc/abduco/abduco-0.5.ebuild
+++ b/app-misc/abduco/abduco-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils savedconfig toolchain-funcs
 
 DESCRIPTION="lightweight session manager with {de,at}tach support"
-HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
-SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.brain-dump.org/projects/abduco/"
+SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-misc/abduco/abduco-0.6.ebuild b/app-misc/abduco/abduco-0.6.ebuild
index 43df63cf6123..636f2f8dd807 100644
--- a/app-misc/abduco/abduco-0.6.ebuild
+++ b/app-misc/abduco/abduco-0.6.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 savedconfig toolchain-funcs
 
 DESCRIPTION="lightweight session manager with {de,at}tach support"
-HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
-SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.brain-dump.org/projects/abduco/"
+SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index 25b36c216b4e..b373695a8dc3 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,6 +1,6 @@
 AUX abook-0.6.1-tinfo.patch 577 BLAKE2B fb012f1baf2ae0915e797c9f6d506d3c636370e5d112031ea163b076cfdbdd5d5eba080c210b552af426fdbc60c1841c9fefb2aa8779e1d829c3382f9231ba2d SHA512 0c7e657f67749e05aa2710e65ceadd8960a842f4029231298458446c9286945d0c6d89e837020a90e1f1ddc20ebee205469eb1355416d3d98e13fe9341007a99
 AUX abook-0.6.1-vformat.patch 497 BLAKE2B 7f3c57b05048be59f4037416a3df8c0e3a5ac3661e59c1f1f9afb86756de7852208b565aa40f5342f9bb4e4fb10efe4aaeca90ec4b6e5c1b38b487c8493053e6 SHA512 7073146a80bedcb7bc447d741028dcffd47ce60007b4b276438fb6437e19243f3a088b99ba9da96d2ac1b64b3d0f265613aa9d0426b5c03f57fd4c834544c247
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
-EBUILD abook-0.6.1-r2.ebuild 977 BLAKE2B d7ecc8166dec84b1eb448a5040d8505b400638f7304c65d86d12b53cf08ec7ca77a5af63cbd002a0c06e3f0f1a7a9de154cb4a813b87db5ffe6a78ae08e1a02f SHA512 7499e0d1e1dc3027ce849e727a623fe30dc98d611020e02cf85f76934e9dc79b93659fafa5dc60c0d7cefb02c2dd6d3012427d0eb3b5aba40e0b3ca2bff40448
+EBUILD abook-0.6.1-r2.ebuild 976 BLAKE2B 125703fe65276f7c87e10eb5cc998b6a97f884271d87e30281bdaad2aa7083610facbfc77bae81c2aead15c25a7ca6a89d4bd84f408d6d6f1c8d0f52ff8ca9a8 SHA512 766506ce7fe43a5bab40f6778f64cf0920789344598ff784b394e49f8525041c606f60f53e9e9e32accdea1cdb3640b5acb9ae8c3d4bf95f13c550c76184feab
 EBUILD abook-0.6.1.ebuild 959 BLAKE2B 16201ee33578c18ac8b91ac2dbcae233421142d371fb3091a45c8975213081f9a51c8ae09fc3d03c3bbd58c33e4d8d894811acc2d877dcfaae0b0417297f7fe1 SHA512 be92ae79aa58b4ccee582460406255f4a89d4c1a7b68d7006a2f3c4986310779f897c837b2adc066538a954fe201302c54586ca0c91700c2fa98cc611c33c1b4
 MISC metadata.xml 394 BLAKE2B 7bf50f13c562023ff4695feb92a21827004491743cb073e3e25dc6ce24b69556e8027c21b5f6a4c039032c7222fae4d0a7275940b170a689257203b12266ff26 SHA512 c10bb50afc5cce1b6067662d498b43a37a6718905ef47c6e0b5452d819c704972194516868ac667a35a3266f7d408d9ebc9a92076c53d8236075135c9f034334
diff --git a/app-misc/abook/abook-0.6.1-r2.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
index 77cc9716f4f2..deec4303f985 100644
--- a/app-misc/abook/abook-0.6.1-r2.ebuild
+++ b/app-misc/abook/abook-0.6.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 91745b2847e0..5623f2a7d548 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,6 +1,10 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
+DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
+DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20190110.3.43.ebuild 5773 BLAKE2B 927d1cbccb998ccb5286abf1b5bde99feffe8f31bc115f32cffc560a8e3c6d948a1290ccd094b2907a8db688ee74968c2947fec3e3aa83ebdd7d18a422d4f959 SHA512 89a403d3e7c90535c076dab313dc810c4b7031a423a43141333c71cfbce32be020b6a3c58ddc99b75f719da295233ea515f16edff57d2c5863cfe05265733278
+EBUILD ca-certificates-20190110.3.53.ebuild 5782 BLAKE2B 7902584ba0350809dae7d9754e55bd5b0b99fe6d85b6d660ad0a456e6f4c32f692e8d018a74b98db584d61deaf9f1d66731799762fa7196ad4b7c178d87e74d7 SHA512 d4dd05c0aca99f6ba8ba55af8c17ac3f39a0f5017adbf852e4606b7eacdee7a1010a1d0beaf46a2e1a1aa4cd98ce2918ca2791785ff7d72bf6c61aa08d74d07f
+EBUILD ca-certificates-20200601.3.53.ebuild 6034 BLAKE2B 6aebfc6277578170f29afe806179090332b8b8c73d9c7cbae4bce84df1b11b33aac6c77f26cd3916c6a61665a986433a5f54a333f53ee14490697d73fba5067a SHA512 a19d49d5b99c35a570952dab985dec6bd321eff099aeaaf176933d6096b896b25f493df29f0fbb3bf429bd6742d5ba0bd03698792669c66585f47c271540d70c
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
new file mode 100644
index 000000000000..0297708d122c
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit eapi7-ver
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+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 ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CAcert_Inc..crt \
+				"${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
new file mode 100644
index 000000000000..42e6aad920a9
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit eapi7-ver
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+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 ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED}; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]]; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CAcert_Inc..crt \
+				"${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index c77cacf7e61b..b8b21c4dcade 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -3,8 +3,8 @@ AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d81703
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.14-r1.ebuild 1499 BLAKE2B 49e023f5e5d59597de5214f0a374908349d733b6e4ed51d9eae3ef7b612fc9325696b3da822102c1e3155a77bd3ffd4ea9ae776443edba4038699c252b3cce17 SHA512 c904db8a5cf986a1bb3cf48708fe43bcd501d52487b0a410ffa16b1feddd4533c9dcf0e1d4b9b3baf118f662ae7f17b19e6d32b6b7bb1f9a8a1acb210085fc16
-EBUILD dvtm-0.15-r2.ebuild 1252 BLAKE2B b614650745ef0d502cf9c8ec66cb1e491f4b002ea40a12860353bf62fb1fa91dfadb7f276e527ccbe751229358ec376d3174ff84e6337519b3fe8598d17c0029 SHA512 7cb4060410bb7b4282477268637362e2c5337992941155621651972064d1021502e643184d769336eb465146dfb2a000d33ce43c632eb93b76223cc92a8ac4c8
-EBUILD dvtm-0.15-r3.ebuild 1247 BLAKE2B 8c04394660d30f532aebce68a1a23ccdaa5d0a89274d293785231aa24072506210d32477df448bcf578524fc6f8a60955cf76ce58beb4e39a092df38257fb9ab SHA512 192554add146d8214aaad50676369edf0cd860a0483c848cc50388c0edf5de1180a398df33278b588f20e5bb137b3ef7725c319355642c821a6dbe024d7de33f
-EBUILD dvtm-9999.ebuild 1251 BLAKE2B df136b7502f1845791061909b9cbc1d6c8c75867dac56b47ceda726430e69c85796c265cafddf9c853051243706fb49a9d299518556cd67d446822f4c8f0e638 SHA512 81903f29b1358bb1b9dc4d3fceee38ac1b05acc5cb46d4fe45a9be03ceea7a2a919649144c62f2d94eebbab9d11ef897c069df17ad38f7cbda0184277da06b26
+EBUILD dvtm-0.14-r1.ebuild 1498 BLAKE2B 6c302340c26178aac39dd6faef7071c2c325998470dacf015504c31fb1146151259b556742b2d70e60f1da4762654c8e281da70d7bb57ffcc2ad4a9b0b9dbefd SHA512 4b3df60690e4468269eb614d04166ab953159da9bcb807767c3afb4f153091e17cc6722f80d30c7028cdcd936748a7bde1fc6253c209c6fad2ff00079bd3b298
+EBUILD dvtm-0.15-r2.ebuild 1251 BLAKE2B ca2566bbfce7e9ece7adf4b02b02ebee3d381b23c02219970837f286f6e6d9c15c2dac78a6f51cfc39bc2454920e5fe19fc47aa623df7aeff3d53c9ba2489550 SHA512 0265a5d734176a3c23ea3cd609a13ba202bf4b199471c37ef9e652eb5a78cb58a1cb5d6367c9e66b18202519b826583160993fb202900da43a3fc0b32300815b
+EBUILD dvtm-0.15-r3.ebuild 1246 BLAKE2B 930eea360ee8e5a801e6f4ff3f890c57bffe069f70b22bbb746297ab1fb42e1da23a53642ecadb939c10abddbcc880ef47606767f91334a25ccc4f194fe5f38b SHA512 30122399a8a54a7b3fad309ad8f20f2c8ffd5252f0b5c7a4540b4c8ba7fdf23aa5336d7374b204855d40d82387610a95c5335f21694b5f5729a59697b57cb3fe
+EBUILD dvtm-9999.ebuild 1250 BLAKE2B d4d4479d93a67b41de5ac9b514e4241479a34ffe981e1a6264e36ea05ba8eaf3f788d314f3488dc089f0b046563294eaefbd4f9c5d9ee24a1412ff8ec43ffd58 SHA512 66a0ef9a78ab35d0f40ca41b6d1a1bd66beb4e1df54d3961905421ddd0f923a6accf2672fb2927b3cfb3062f006cad617ce0defd7bf3ebf78361b613b08e3b2e
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.14-r1.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild
index 302a81e984be..c9a8065da403 100644
--- a/app-misc/dvtm/dvtm-0.14-r1.ebuild
+++ b/app-misc/dvtm/dvtm-0.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,13 +6,13 @@ EAPI=5
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm x86"
 fi
 
diff --git a/app-misc/dvtm/dvtm-0.15-r2.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild
index 6c0a09bddd82..46ead862d726 100644
--- a/app-misc/dvtm/dvtm-0.15-r2.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-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
@@ -6,13 +6,13 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
index e31217f2b0b0..f83a6475a961 100644
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm x86"
 fi
 
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 8de03bafd8cd..44e2ba21eb3a 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 225396720633..c0cc80a85ca3 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..95d5527ca525
--- /dev/null
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# Automagic:
+# glib-2.32 dep
+# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
+COMMON_DEPEND="
+	>=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
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/i2bits/Manifest b/app-misc/i2bits/Manifest
index b72f8e80521f..ffc31a792ce1 100644
--- a/app-misc/i2bits/Manifest
+++ b/app-misc/i2bits/Manifest
@@ -1,3 +1,3 @@
 DIST i2bits-0.1.0.tar.gz 2649 BLAKE2B 050e7eddadc4e8b4e1da50128b735adbe6fbace35a06709fd2f31db3e8ffb672b3d51eced0ecb9c87c3566d32c9aac7a431c641e53597ee55ae431328dfbee48 SHA512 9f7b2fe8ca66740cae081c3f74f0c5d67d956c8cd2b5f39cb7306e58a8f75d6d5848dd640e7e514638dda6f3d1efe5f292605dc4fddffe5e530bbd5f173a1db9
-EBUILD i2bits-0.1.0.ebuild 338 BLAKE2B 443017c5d2a904e5478d4f73519699f8ed86498d96c7fa4919f8d7c16cffa92dfe703cdb9516ac51cc52c7b26d74c37cfc5cc81b01f25e611b4736f7b46e03e2 SHA512 02c2078fabcb663810d7a533ed1bc0295c4b63cfb5032d920852bc653d5a05a9bdf5d6a9cdf8ad0d8aa78d78dcf4ee7f75fea27e93fa43f106061183c8ea46c4
+EBUILD i2bits-0.1.0.ebuild 556 BLAKE2B fcbe0849f8519097023a46ec0fcf87b59d00039d71cb9a387536b612cdce7fa82fb1a9131ea3ae0bc7ca33409d3922ca5715c11da2c9c350190f105acd5a31bb SHA512 ccb63ffe81523a3959c99d01461c26afb881aafc9d173f2f61b42d8d88a994288c8f6db0de1d4feb46fe6794148db9a16f5e12bd054d19b071e6386ff663c27c
 MISC metadata.xml 334 BLAKE2B 02924a4da850188a7552708c5e13c82b3d8912197d09b8a83678960c3de0e408e9dcd458d8dc18a8ae829e33c1c9b9a7754f6b2a6f8a7bce85b35a3ddbebc1eb SHA512 62b95a5794d247168cf9351ac0d70e9d910416241897ceb6b8203eeaaec82cd0c462333b7559f1cf68a7edbb9660af8892cfa50e6368f24f18a0200d78458e74
diff --git a/app-misc/i2bits/i2bits-0.1.0.ebuild b/app-misc/i2bits/i2bits-0.1.0.ebuild
index 4bb902c770b3..e877529fb905 100644
--- a/app-misc/i2bits/i2bits-0.1.0.ebuild
+++ b/app-misc/i2bits/i2bits-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Utility to convert hex or dec to binary format"
 HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
@@ -12,3 +12,11 @@ SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
 LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
+
+src_prepare() {
+	sed -e "s/^set(CMAKE_C_FLAGS.*/set(CMAKE_C_FLAGS \"${CFLAGS}\")/" \
+		-e "1s/^/project(${PN})\n/" \
+		-i CMakeLists.txt || die "can't patch CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 9eff0852328a..9fbabcc70b63 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,6 +8,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r3.ebuild 3848 BLAKE2B 86b6a69cc1b3127806884dd52cba85aea21a7621aa21fe46daebdd250bf7f8e98da1347c0f7caaaddae06696724bc82b07ffecb21390878487d3329a95829a6e SHA512 75ba28d58e744557c82f7aa9de722ee703c0596cc769726a5480b469b32d295b956d65d02fe3a13fd59611f95c5eaadd53f5af8d6ad4c95965da1488f1be7937
-EBUILD lirc-0.10.1-r4.ebuild 3895 BLAKE2B 5b598a3a94abf8a80710f643b264fcbbdd18cfea180118db6fba9ebbe68fd23a0f4b17d9bb363226448da163c93c65b594b966eaa21d4598c9fe9e25c95208df SHA512 f276a6c04cbd28c54a140428dbb22c98cdd664e709c8432a35d0249006761712a46a8343a88a9596573ddda8c4bc0c444587ddae40d0dc7ea1544edda8f157b9
+EBUILD lirc-0.10.1-r3.ebuild 3850 BLAKE2B 901ee4538227ee8fea67cd7f3368d2d1bd1d4d675a08389876f1e5592a66066ad48c81084e3309e1115c69dc9eb07ae5b3f31a766ab6ee421014a72820fe063a SHA512 0b5e2140748d35febd8271ed0edd17fe9b207349f961a6f0ffaebb28d3bc8e5354ffd1306303d68ed8e2fbfc877482586e82e76f47e7e82f83261057afda8646
+EBUILD lirc-0.10.1-r4.ebuild 3897 BLAKE2B d07c46d8720ffac34b0fb886f2b63cac81cf7aca425aada49a4151a30c617f4ae8f18d4d9e6c61690910079edc626d877eb556a9110fae7b032033b63d3231bb SHA512 86405d22b09629e9a564860f1fd215a9efbe600d94f338e57c66fbafab94ea4e81ecb9589bc3658fdfa917e1c3eb69a349430949de9dc1a0d5915276643828b9
 MISC metadata.xml 818 BLAKE2B 01aa3a8beeeed191a70a2154861022ce2af9fea56e1e3b8d8fc2126b647629823a750f0a64040fb65e376e6ca78070747ff40903521c84fc78af7aa5be45cf76 SHA512 4de2c162a07647f17797f827936626710a56980baebb8596436417aa0501d3b2e44c633c8c298813bed9b9ec12425e5ec89769df33e858f6a86fa328e6e252a1
diff --git a/app-misc/lirc/lirc-0.10.1-r3.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild
index 368f73717811..25782aaa0924 100644
--- a/app-misc/lirc/lirc-0.10.1-r3.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
+HOMEPAGE="https://www.lirc.org/"
 
 LIRC_DRIVER_DEVICE="/dev/lirc0"
 
@@ -17,7 +17,7 @@ MY_P=${PN}-${PV/_/-}
 if [[ "${PV/_pre/}" = "${PV}" ]]; then
 	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
 else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+	SRC_URI="https://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-misc/lirc/lirc-0.10.1-r4.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
index 52fbdf73aa50..9d7322574f9d 100644
--- a/app-misc/lirc/lirc-0.10.1-r4.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
+HOMEPAGE="https://www.lirc.org/"
 
 LIRC_DRIVER_DEVICE="/dev/lirc0"
 
@@ -17,7 +17,7 @@ MY_P=${PN}-${PV/_/-}
 if [[ "${PV/_pre/}" = "${PV}" ]]; then
 	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
 else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+	SRC_URI="https://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 0d81c1b010e0..a8ae364e54e3 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 872 BLAKE2B 1b80b0ae1b9114dfcfb5af2a7c5792eca44a7bd40d6a11b0749cad8437d2611df10dc47286dcc1fe173569f74e379dda5ab700aa80a98d51edb6780877b59f3b SHA512 8e8a5ee1c02680f322daab204eb4bfb6e56693909cc334a9f2ad37b2a28c6feaea0955fc80f32b000f030845daf5d777bc0bfe340bc091c6562229f747412fa2
+EBUILD sl-5.02.ebuild 929 BLAKE2B bce5d502dce09912bc5aa6b129d981e9dee66f9279a2e55dd091931914dd9fca254cca8ccacc8b4ef43fe3680e446be5a057a375b781035f37ee84d5759919a3 SHA512 57aed5f53941d8b9ad6046cd339ae08d5d8f0964d5a56e477e2d19cb30f075bafdc58083dc9cf10d76e939badf3dae9b62b0e49d071c34e674c273d35c2733ab
 MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 5601461b6792..74a22148b898 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -22,10 +22,14 @@ DOCS=( README.md )
 src_prepare() {
 	default
 	sed \
-	    -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
+		-e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
 		-i Makefile || die
 }
 
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
 src_install() {
 	dobin "${PN}"
 	doman "${PN}.1"
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index 7fc8bddc551a..17ec603b82da 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,3 +1,3 @@
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
-EBUILD ttyload-0.5.3.ebuild 712 BLAKE2B df20be59eae2251acad8beebeed734804d524a379684a93ad3fe04ae922bf6b79ffc4736b23f4830a5ae33b11b553a65915e4f15556afe1e7f045fa9b39d8020 SHA512 9f1d6f671d9ea250c8817fddec5a18c2270985046cc0f6fddc34b70897c654900cb33b96c5cf7ec7fa75b5bc79a5e4cd372e8babb7c63faca3f34c1e28be7978
+EBUILD ttyload-0.5.3.ebuild 802 BLAKE2B 4a29f5d4d29d6d4f720dd8fa6362a52cc01c49a49bb4b5d7dec9baff453adbfb62827898fb0c13fc7897d3d9c290e2a2dd5a25b4011b2328f22481ed4c9fe64d SHA512 53be4bbef175cae500e6c8d5480f3cc1d5e8e3c399a7997397911f7caa683701f98f64d7f0f11db097b8a67cff6785076da949a7389e71c5d31e50c846a26693
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/ttyload-0.5.3.ebuild b/app-misc/ttyload/ttyload-0.5.3.ebuild
index 09ffb3b75712..a3d6358a8315 100644
--- a/app-misc/ttyload/ttyload-0.5.3.ebuild
+++ b/app-misc/ttyload/ttyload-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,11 +22,14 @@ DOCS=( BUGS HISTORY LICENSE README.md TODO )
 src_prepare() {
 	default
 	sed -i '10i#include <time.h>' "${PN}.h" || die
-	sed -i -e "s#make#$\(MAKE\)#" Makefile || die
+
+	sed -e "s#make#$\(MAKE\)#" \
+		-e "s#^CFLAGS.*#CFLAGS=\$(INCLUDES) ${CFLAGS} \$(VERSION)#" \
+		-i Makefile || die
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 40e433136ff2..58f24283c1fb 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 8fc763d77dc8..ebf470cd32aa 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,9 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
 DIST texstudio-2.12.16.tar.gz 34528802 BLAKE2B acf13d8bcd9a2017f19ab4484f6eab3f41868bcbbe364d869466d971b10f602652145be4082f1cef6a6d3be91c51d7bfa35e992b00cca0748f2178ddf36a263c SHA512 0c17fda78e0cd491d2869ccb1a164ae2348281a39f9883d813ceb2ed6a0287c4cf9e784cafb9c0a12b8839d7afc8897f8f74acffd87a5dfcb50d3b344f33ad28
 DIST texstudio-2.12.22.tar.gz 35965795 BLAKE2B 28d78e4c429d306e86abf54701395bcc6457c51f3264094f9d5737082161bf157d248f7913bda4eec8319632c4b2c38e8a3d4916c902cc3b86cd91b64c0238d9 SHA512 c589285d1fba00812583a3d58602a99e044eb4bcf6a84b939d00ad7fe4ba8f15788031361fc9b4cb8df19f8098911c437d1de5459c1736fa40888b88d13b10d1
+DIST texstudio-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
 EBUILD texstudio-2.12.16.ebuild 1846 BLAKE2B fbdd57c5d8193cd0ca80acd88e44fa1b2ec98b0d31fb10e049f81b3b13fc9a14ad5cad140f6a15e7a3c8abb729592433fb47dd9f0410cfad10ce1b53ef41b7f6 SHA512 58dafa200d68e6253c368f28db95c2ec4b1caedd2e8830a8e3c12e4c2c71619365671732c33fdce1d7c2c24cbd16a8fa7958222b4d5c7438a29b1d02c1a2e35d
 EBUILD texstudio-2.12.22.ebuild 1846 BLAKE2B fbdd57c5d8193cd0ca80acd88e44fa1b2ec98b0d31fb10e049f81b3b13fc9a14ad5cad140f6a15e7a3c8abb729592433fb47dd9f0410cfad10ce1b53ef41b7f6 SHA512 58dafa200d68e6253c368f28db95c2ec4b1caedd2e8830a8e3c12e4c2c71619365671732c33fdce1d7c2c24cbd16a8fa7958222b4d5c7438a29b1d02c1a2e35d
+EBUILD texstudio-3.0.0_pre20200601.ebuild 1763 BLAKE2B 07467ce7354ec27afa459d9af5eb0a66dc5be2a5baedfe9c7c2d8ce08b0a6debc566bff74b5e08fc4ffd721d8be18f110b26b3e09947cf5ed0f6555b8115be7a SHA512 b1d4f77572331862f6edb6657ff17892769aa030e937727c13e9789c1087e87c3a0a483644bc5201b4a11aaba6e0a4b88d83214c75e3d40473c4f16fac5aff5b
 EBUILD texstudio-9999.ebuild 1884 BLAKE2B 381765c70b04066aa53d50c402ace018ec79adb50e9af9a198ad867167b5f2f131f4aaa4c836f6a4267da96fcc2d0b75dfa6a8f2707d74a896af25e20aea82e7 SHA512 90966c2bb60be15fab68db843edc48b89edb0db76e0fd7c3bac9fd853e3097c2938511472c4fb84f749d36fbddc5d91b3562ed7fcbe8459fbe11570a4b7679e9
 MISC metadata.xml 411 BLAKE2B e545d68a6bb26046f5e43df2bcc64371e5a4237ef20a83c8811675ddde9dfec1eee8f5dc6405e7005a3ea35e39e2f3bf019d92bbd4b68e5c74524c7e785a2214 SHA512 c82d3d1b0b50af84b34a1c6cc17e19ab50afd45206939abe3c96c2d8b93a69201eeef81c72e1eef56dc717ecdf1d0c67637b59bea94160188a673f233d57458b
diff --git a/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild b/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
new file mode 100644
index 000000000000..549dc6356a4c
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix qmake-utils xdg-utils desktop
+
+MY_PV="3.0.0alpha6"
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="video"
+
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( media-libs/phonon[qt5(+)] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base"
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	default
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/qtsingleapplication.pri/d' \
+		-i ${PN}.pro || die
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 203171e1906b..6fd0548ee480 100644
Binary files a/app-officeext/Manifest.gz and b/app-officeext/Manifest.gz differ
diff --git a/app-officeext/barcode/Manifest b/app-officeext/barcode/Manifest
index ad2e7072f4b3..3d2f88f7afbc 100644
--- a/app-officeext/barcode/Manifest
+++ b/app-officeext/barcode/Manifest
@@ -1,3 +1,3 @@
 DIST barcode_1.3.5.0.oxt 263583 BLAKE2B eafc3897af7c4d0a6cd025945a4f5c8b9e5e27ed5aa82f9e6933dba0cd46ad748b47d98d81da031a7e6e841853686cdd43a47104c5a93fef6cdef9be040ddcd2 SHA512 45133fc58ac211033c199411820029d921dcf1ba714652093b6647861b611eed39bb5b69c8ceef866e80b716da04c92eca0b3f9c990e799ed25cbb2ad8999732
-EBUILD barcode-1.3.5.0-r1.ebuild 449 BLAKE2B f70d73d6f054409a202f22f15f9c27c681a2cdf00460be1a53f4486135a48df041388ba0869ff499f63df5efb3d43f313e1b2ae848a5dc8731cb7fa4b9269245 SHA512 db6ed4ffe302cf7dea2d4ede33a1c061533dc1d404cb578b03a6a5eef0c10308375794a2fa0a86991a6e5bf25fc4f8bd8347d65442995fb14743983312bc68c7
+EBUILD barcode-1.3.5.0-r1.ebuild 448 BLAKE2B f8a6c107d0fe2b72dd0be03a7a394da9e1475cc375d68617a105b632585e5f76d68eb6d5396314589c76a05c1038e1595adc542063db7655aed0b57e2d1fefe1 SHA512 a62e72f73e8afd549d8cd811ce5c270625349e938b7204aa891a9e5b1a78ef45f5ba481cc8484f12d45a1581a8b475fa91b25fc5e0c8042354907f44302f4c35
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild b/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
index d924d627468e..2092af9716fe 100644
--- a/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
+++ b/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,8 +9,8 @@ OFFICE_EXTENSIONS=(
 inherit office-ext-r1
 
 DESCRIPTION="Extension for reading barcodes"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/barcode"
-SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}/${PN}_${PV}.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/barcode"
+SRC_URI="https://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}/${PN}_${PV}.oxt"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/app-officeext/dmaths/Manifest b/app-officeext/dmaths/Manifest
index 351366b0761b..ff61dd351664 100644
--- a/app-officeext/dmaths/Manifest
+++ b/app-officeext/dmaths/Manifest
@@ -1,3 +1,3 @@
 DIST dmathsaddon.oxt 10197006 BLAKE2B 14b38c25a997d1ede4c5796d03abc0db6c6430447f2e6538095db03aba00c52f28260fa8940ecf9789cfec44bddd48120bb6b611cf297164710abd05f49fe978 SHA512 732cebf490008fabed520dab13d30278545ef91f96feee8d0a39dff0b0cd1275621e1c315521ab0955e0e5f70698e2f7cf58fe88d576d5c75fa785bfe6201677
-EBUILD dmaths-3.4.9.0-r1.ebuild 451 BLAKE2B 3da67627f19f2be724e4a7699cc3890d1f3613e632b6b2022c9ef9fe05949ae23133feb9d1715915186c2496dbf853b992fd43c8f0f753a1a402b3275e186b73 SHA512 e3716602da6c8f21177a224c4cb2027faeb77ba7a7be4e01bac8d2f6764162a52638bc3e207af667792026279c0697ce6c871abde7e07ac89dc18bab07bb6225
+EBUILD dmaths-3.4.9.0-r1.ebuild 450 BLAKE2B a549834697006ff0195e8eaf4f4403107dca152bac6c5ca51de2a628a108fddaea6c4ac19506f021939a7cc1c283ef6762987bbb7546d3f29bedb3797085519c SHA512 490d1cbd9878eb5d6fd48455420df81dae471519eeba243532acd928c64f56d5c649f1a09a72c5b48075e28310ffbdf76d3875d7871644f41891396baf44655a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild b/app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
index 0edc2524704c..93a7545e5a35 100644
--- a/app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
+++ b/app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,8 +9,8 @@ OFFICE_EXTENSIONS=(
 inherit office-ext-r1
 
 DESCRIPTION="Mathematics Formula Editor Extension"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/dmaths"
-SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}/${PN}addon.oxt"
+HOMEPAGE="https://extensions.libreoffice.org/extension-center/dmaths"
+SRC_URI="https://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}/${PN}addon.oxt"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7f3d0590bf89..2bb59c5af210 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 91064b1127bd..d42eb49a4555 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,8 +1,7 @@
 AUX dash-0.5.20.2-gcc-fno-common.patch 1131 BLAKE2B cce4ed8a97d95e294aa7679c0ef164337a836ed9f0b7e18b38a6032545796260eba8c7502817e57bc5948aadb74b9826eb7cb5b02e66cdb954e35a5ed762f460 SHA512 6056f196a353f382b97c6865e89dbc5a63295c404fc9be83551b1458e2a42f93786ec3d0b7dac1b674b40b59e90cd968d6f1e9e0c8ca953704f4de8bb9251cbb
-AUX dash-0.5.9.1-dumb-echo.patch 2592 BLAKE2B 95e79281e579d0d40e320f0433fa94185f22e971a2e5c6b8a7686e96479a490c2d7820545875de2bdb81f52f7ce0b7ea0811a207c41601d7e2272c0829f07d14 SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf
 AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
 DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
-DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
+DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1
 EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
-EBUILD dash-0.5.9.1-r3.ebuild 2097 BLAKE2B b0b5217070496dba9ad28d466a20ec60d7e215ce08d232dd709a07db513d43734b4d82f551c14b4c3793555b4c0d6dc7e1cb2dbe9c1bf0db28b320b8408c693b SHA512 3fd4a0426acd6a10011c248f415e9c206fb027b18a83c7eab4d4c049ef50ff034e3a7f3c5def9b11dd4ec0b3d0f9a7121764606d5820e351dd0e3348fc902cdc
-MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
+EBUILD dash-0.5.11.ebuild 1494 BLAKE2B 1d49135606a56d499170d54ada356dccd2cc0ca40b2aa701ead2cabf1e7f09a53eb3af44e6dab5ea371a6032e74a2690bab9da6c2e9ce9d28a276ad94245928f SHA512 bec31e98044899ef233c5a082c9d480a5e6a1e19f7d850e3528d21167c4b8e52285a8f4ccc14ceabaa00a41d14b6db915139bec302f77caa50e5be73434bcdd9
+MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.11.ebuild
similarity index 50%
rename from app-shells/dash/dash-0.5.9.1-r3.ebuild
rename to app-shells/dash/dash-0.5.11.ebuild
index 4463f80ecbca..1bd542ff8270 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.11.ebuild
@@ -1,43 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs versionator
-
-#MY_PV="$(get_version_component_range 1-3)"
-DEB_PATCH="" #$(get_version_component_range 4)
-#MY_P="${PN}-${MY_PV}"
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Debian Almquist Shell"
 HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
 SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-if [[ -n "${DEB_PATCH}" ]] ; then
-	DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
-	SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-fi
 
 LICENSE="BSD"
 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="libedit static vanilla"
+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="libedit static"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch )
-
 src_prepare() {
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		eapply "${WORKDIR}"/${DEB_PF}.diff
-		eapply */debian/diff/*
-	fi
-
-	#337329 #527848
-	use vanilla ||  eapply "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
-
 	default
 
 	# Fix the invalid sort
@@ -53,24 +35,17 @@ src_configure() {
 	# don't redefine stat on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		export ac_cv_func_stat64=yes
+
+		# if your headers strictly adhere to POSIX, you'll need this too
+		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
 	fi
 	append-cppflags -DJOBS=$(usex libedit 1 0)
 	use static && append-ldflags -static
 	# Do not pass --enable-glob due to #443552.
-	# Autotools use $LINENO as a proxy for extended debug support
-	# (i.e. they're running bash), so disable that. #527644
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--enable-fnmatch
-		--disable-lineno
 		$(use_with libedit)
 	)
 	econf "${myeconfargs[@]}"
 }
-
-src_install() {
-	default
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		dodoc */debian/changelog
-	fi
-}
diff --git a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
deleted file mode 100644
index cbf5febafd19..000000000000
--- a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-http://bugs.gentoo.org/337329
-http://bugs.gentoo.org/527848
-
-there's no requirement for `echo` to support escape sequences. bash, by default,
-does not, while dash always does.  POSIX permits either behavior:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
-
-however, since the behavior is not portable, no one should be relying on echo
-having any specific behavior.  they should use `printf` when they want an escape
-sequence.  it also makes dash smaller & faster to disable this logic entirely.
-
---- dash-0.5.9.1/src/bltin/printf.c
-+++ dash-0.5.9.1/src/bltin/printf.c
-@@ -449,21 +449,12 @@
- int
- echocmd(int argc, char **argv)
- {
--	int nonl;
--
--	nonl = *++argv ? equal(*argv, "-n") : 0;
--	argv += nonl;
--
--	do {
--		int c;
--
--		if (likely(*argv))
--			nonl += print_escape_str("%s", NULL, NULL, *argv++);
--		if (likely((nonl + !*argv) > 1))
--			break;
--
--		c = *argv ? ' ' : '\n';
--		out1c(c);
--	} while (*argv);
-+	int i;
-+	for (i = 1; i < argc; ++i) {
-+		outstr(argv[i], out1);
-+		if (i < argc - 1)
-+			outc(' ', out1);
-+	}
-+	outc('\n', out1);
- 	return 0;
- }
---- dash-0.5.9.1/src/dash.1
-+++ dash-0.5.9.1/src/dash.1
-@@ -1182,43 +1182,15 @@
- option turns off the effect of any preceding
- .Fl P
- options.
--.It Xo echo Op Fl n
-+.It Xo echo
- .Ar args... 
- .Xc
- Print the arguments on the standard output, separated by spaces.
--Unless the
--.Fl n
--option is present, a newline is output following the arguments.
- .Pp
--If any of the following sequences of characters is encountered during
--output, the sequence is not output.  Instead, the specified action is
--performed:
--.Bl -tag -width indent
--.It Li \eb
--A backspace character is output.
--.It Li \ec
--Subsequent output is suppressed.  This is normally used at the end of the
--last argument to suppress the trailing newline that
--.Ic echo
--would otherwise output.
--.It Li \ef
--Output a form feed.
--.It Li \en
--Output a newline character.
--.It Li \er
--Output a carriage return.
--.It Li \et
--Output a (horizontal) tab character.
--.It Li \ev
--Output a vertical tab.
--.It Li \e0 Ns Ar digits
--Output the character whose value is given by zero to three octal digits.
--If there are zero digits, a nul character is output.
--.It Li \e\e
--Output a backslash.
--.El
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+You can replace `echo -n ...` with the portable `printf %s ...` construct.
- .It eval Ar string ...
- Concatenate all the arguments with spaces.
- Then re-parse and execute the command.
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
index 0d01a34d50df..096fcd3509dd 100644
--- a/app-shells/dash/metadata.xml
+++ b/app-shells/dash/metadata.xml
@@ -8,9 +8,6 @@
 	<upstream>
 		<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
 	</upstream>
-	<use>
-		<flag name="vanilla">Support echo -n, and enable echo -e all the time (unsupported)</flag>
-	</use>
 	<longdescription lang="en">
 		DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell)
 		and is POSIX compliant.
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index f86dbfc1c1b4..374971973787 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,4 +1,5 @@
+AUX 2.7-ldflags.patch 837 BLAKE2B a1a873a898f3090dab586b968a755e1920ab20158237b9f375a9da2df18d87ba0b3cdf2f671a02ec3163f1ee95436a0c0537b2f7fccc0f8326f1fe25fdcc73c3 SHA512 85872900eeb44e46685b9a229bddd569d06d131ba4c187b44ee916a8ae1e705e10a47b87432c36d855021a0e0e3880c5fe80279a9694ac42f473a06ef3a33565
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
-EBUILD powerline-2.7.ebuild 697 BLAKE2B bbf4002244911524b210c3f051c9d5c2e2ec380fbaa3a413f9fbc98b357cc05e77bb2f5bf145d70c50630245e6f03f7dc73864b81544d09d3c0716dc29c0506d SHA512 05f969b77f3ad5033078bc79de74d6ac5b5717d18fcde20c37153aae549cc3756985f96585f11e594fde744b6e1c86ac87143826aaaa0dcb6b6e3ee715d498a6
+EBUILD powerline-2.7-r1.ebuild 743 BLAKE2B bd93e5352b00bd1bd73db6e5dc7d6ee85e0f4d30ec05e7b62d54ef79d7ba368a8d560b2d008cb6476716f19133614aea9a6eaf52ec3cd6aa126462c87d4a5bbd SHA512 c967665b40de94391df7a9e33cc20371fc7d2146865d63ec6c9bbb4a6ca0441e8bf16fd09aed8ff28451821471df7853aa8f3a21c3aaf6e4fd74a6abe49757a4
 EBUILD powerline-9999.ebuild 730 BLAKE2B 5d75497b2323d373e00df5deabaa205d6286363f4181f409e8cecaf614b0bb7ed4c3b624b61fe54f5d94c27307cdf97bd69109e8ba508b62e76a1c9693428bdf SHA512 c08cdb58cc2b88a88860eefdcc03a7894b4bf2765ff0ed23cf257c36c4436e8153ed336838c13035e21334c7571452bb48f4d098b60047100a4add9fd88b1a34
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/files/2.7-ldflags.patch b/app-shells/powerline/files/2.7-ldflags.patch
new file mode 100644
index 000000000000..077c28af2a07
--- /dev/null
+++ b/app-shells/powerline/files/2.7-ldflags.patch
@@ -0,0 +1,15 @@
+diff -Naur powerline-status-2.7/setup.py powerline-status-2.7.new/setup.py
+--- powerline-status-2.7/setup.py	2018-08-12 14:41:44.000000000 -0500
++++ powerline-status-2.7.new/setup.py	2020-06-01 14:56:25.977968288 -0500
+@@ -30,9 +30,10 @@
+ 		from distutils.ccompiler import new_compiler
+ 		compiler = new_compiler().compiler
+ 		cflags = os.environ.get('CFLAGS', str('-O3'))
++		ldflags = os.environ.get('LDFLAGS', str(''))
+ 		# A normal split would do a split on each space which might be incorrect. The
+ 		# shlex will not split if a space occurs in an arguments value.
+-		subprocess.check_call(compiler + shlex.split(cflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
++		subprocess.check_call(compiler + shlex.split(cflags) + shlex.split(ldflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
+ 
+ try:
+ 	compile_client()
diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7-r1.ebuild
similarity index 93%
rename from app-shells/powerline/powerline-2.7.ebuild
rename to app-shells/powerline/powerline-2.7-r1.ebuild
index 946e4c10304a..623ac6d9568c 100644
--- a/app-shells/powerline/powerline-2.7.ebuild
+++ b/app-shells/powerline/powerline-2.7-r1.ebuild
@@ -25,3 +25,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/2.7-ldflags.patch
+)
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7229855a7f65..4363a0bdea8e 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 0dce7e4021ae..7383a2809e86 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,17 +3,9 @@ AUX calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch 2717 BLAKE
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d3281379c96d0ae63b3073b6b5ed055bd2eca0ae728f1471460e3aa8cf9b3afa3e489c4c2f02c6849b39b94e2c2023a SHA512 64f1779ea16e2aedbc91e815b015ffbcfcc2d50035dddc9b33588007ceeeaa5cf4cca84b40fbc9c5808e9b6dab3b04047f37505815120a1e66650447363672f2
-DIST calibre-4.12.0.tar.xz 36823140 BLAKE2B b8dd24152b79790c8d22d3c0aa9482f69250fe177499e01c6c0564bf31946d0266a2e3053549f037c7ea7626b18a27798097bfbe0caf93f97585d4869c475ab9 SHA512 628308273b507ee2557cd089e5c7b77f8304c1728b9aadfe5493b22042bdcf2da4c07652a6432121b5dd432807bcda21fabb81c37e59f87d24ace52539f3244c
-DIST calibre-4.15.0.tar.xz 37033864 BLAKE2B fbb8965f438b438e0274fd8fbd23b633fb39bf3d746b0d8d1947e54cb6a21e39346031be6723adc1ecb83b4145562ec8a1e36805b96bad00451c0afbccb8d570 SHA512 d06bebe672864b2270a76f097f353aa727a3918d1c87766c9dbad615a6225621bb12d4040c1001415d188b15f1b7c068e77fec7964f4bf26e83ad7f3609bcc04
-DIST calibre-4.16.0.tar.xz 36964244 BLAKE2B e2c94ea882addff3a7def2b7d0bc286fc3bc499190469e9bfea99d710b4cdbb6b59ca2848ef5551d4375d22c582462962634c0329f0adca05dd6dc137dbea0ba SHA512 96803578c7b609cf146571df38cd9ab75c3fcc6e8b429d7083b4383974161193d544a22c249ad3934c621823a3b1d1bd52e564c6ef70fd4012aae40a1056715b
 DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
 DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-4.11.2.ebuild 8545 BLAKE2B d9d02091f3118ffe7d2fc7422e342c82a73ae13f7c761eb3d855b7f3837d8acace61d04ba36aa72a3e9ff7f543397f9911150cfb2feb32262eef8cf04ea080ed SHA512 77787afa92e929a8ecba0ef3a0c22780c4ec14a0ff70d8c8fa2cc9368b62f0ec0e97a91015f6222d0203ccb9fa10a25cd1d13a7429842ebf9c121d36af1bcff0
-EBUILD calibre-4.12.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
-EBUILD calibre-4.15.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
-EBUILD calibre-4.16.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
 EBUILD calibre-4.17.0-r1.ebuild 8765 BLAKE2B 5fdb90f47e390d3935639673f63c2fdd9a5e64ae5635f5a1e5732c176831f5b91decb2dead5ddc79eafd786b64ccd95aa6b0943038428f8aa6331ed45beda222 SHA512 3235f8bac83d558268c0e41b6a313204b87e545dd7606309aaed0d2b9ab8a867562f0dd5127e90bd8d8d56dc4371c46c2d0091bcefa9815cbc3b1da31f00b4ec
-EBUILD calibre-4.9.1-r2.ebuild 8584 BLAKE2B 9e4061e96e543b69260fa51e7408468ff6529a8276782e166830f4266a4b58e481e01ec761ba5e4a7b25ac5cdcb1e2cd7955926392368cb341da6a51353b3d23 SHA512 4a89fbc43197765fa47070537eed2663f6bceaf3f0ac9ec51b46aaba1b12b6a341d446dc8a094f6df08fddc968de191da8af57c5c767ae861adad4563d572047
+EBUILD calibre-4.9.1-r2.ebuild 8799 BLAKE2B abbcecaeec5f818cf7ed218edef294ee45d53861b3a8a573ac8c119deeb3d6f25ee16c42433daefb41a1b05eb7ffef007759632d6823b731931c57b60272cd30 SHA512 8989bcbb4e122b2e7ad8fde2b671ed71173658a6b05932b2b56e270e600d84ac916d61af1e2eb63dd146b9ff8801670cd42a2ba8db5a6aca3f21e944f1ecbd43
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.11.2.ebuild b/app-text/calibre/calibre-4.11.2.ebuild
deleted file mode 100644
index b5a00a083e86..000000000000
--- a/app-text/calibre/calibre-4.11.2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.12.0.ebuild b/app-text/calibre/calibre-4.12.0.ebuild
deleted file mode 100644
index 0191479d6be6..000000000000
--- a/app-text/calibre/calibre-4.12.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.15.0.ebuild b/app-text/calibre/calibre-4.15.0.ebuild
deleted file mode 100644
index 0191479d6be6..000000000000
--- a/app-text/calibre/calibre-4.15.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.16.0.ebuild b/app-text/calibre/calibre-4.16.0.ebuild
deleted file mode 100644
index 0191479d6be6..000000000000
--- a/app-text/calibre/calibre-4.16.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
index 6dd804fe08ba..0eb5f2c1295d 100644
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild
@@ -10,7 +10,8 @@ inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
 
 LICENSE="
 	GPL-3+
@@ -122,7 +123,8 @@ src_prepare() {
 	eapply \
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch"
+		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" \
+		"${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
 
 	eapply_user
 
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 3f265d2d3c44..4b3c1323b8d6 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,8 +1,6 @@
 AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63bb7cc034f54e8edf59434127e495d5878dfb761c990f9f106fbc0436513220ade66bb107030093f41c8e4777e6ccb279259aff912d06 SHA512 08f4e4473359a2633a785cd34fc3a89feaab8619843a93c5ffba0bf00e31aff2d1ce5a54aeea3eb51e63385b3480df1f196f54cdd568ff49558860460faa1c8f
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
-AUX dblatex-path-logging.patch 537 BLAKE2B 1ed23e355e64946ac0bd8839edd26688fbbfbbd56e090470c07ffb8b2cc91ebe32500002468c1f4333adcf786722b5af8623581ae4a4ca5af53be4a5e80959c3 SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213
-AUX dblatex-setup.patch 773 BLAKE2B d32b842e52caddd1587fe2fe0a005b148bb1a231b0b4bf4cc6c62cdced6a47048639ed9b5f98bc42a72f19a8e4e9dfd1bc4bf1eff62fb032bdb52bfe396335da SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 EBUILD dblatex-0.3.11.ebuild 1622 BLAKE2B e22f30327fbec58cf69839f1aad790aab5c024bf70df5faa3b4f5eb75e6619b6c3b35a9e52e8df0dab0d942b71c1bce8836bd1a468d2e66992b8fa90fd1d3a46 SHA512 25818584313360bb615da8a8dd6c88f6fe8ea41066e564d8e59849aadd30e0b2f13ad1b2aad511deaf492179d8b3e9d64b71c105793de7ca07f395b02a8e961f
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/files/dblatex-path-logging.patch b/app-text/dblatex/files/dblatex-path-logging.patch
deleted file mode 100644
index 7f0fdb6c52a6..000000000000
--- a/app-text/dblatex/files/dblatex-path-logging.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur dblatex-0.3.7-orig/scripts/dblatex dblatex-0.3.7/scripts/dblatex
---- dblatex-0.3.7-orig/scripts/dblatex	2015-08-07 10:47:53.000000000 +0100
-+++ dblatex-0.3.7/scripts/dblatex	2015-11-08 22:30:50.362571505 +0000
-@@ -1,8 +1,10 @@
- #! /usr/bin/env python
- import sys
- import os
-+import logging
- 
--package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
-+logging.basicConfig()
-+package_base = "/usr/share/dblatex"
- sys.path.append(os.path.realpath(os.path.join(package_base, "lib")))
- 
- from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-setup.patch b/app-text/dblatex/files/dblatex-setup.patch
deleted file mode 100644
index f6cf4a24283e..000000000000
--- a/app-text/dblatex/files/dblatex-setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- dblatex-0.3.7-orig/setup.py	2015-08-07 10:47:53.000000000 +0100
-+++ dblatex-0.3.7/setup.py	2015-11-08 22:39:03.076213227 +0000
-@@ -23,7 +23,6 @@
- from distutils import log
- from subprocess import Popen, PIPE
- sys.path.append("lib")
--from contrib.debian.installer import DebianInstaller
- 
- #
- # Build the command line script
-@@ -363,15 +362,12 @@
-                 status += "no"
-                 mis_stys.append(sty)
-             print status
--            
-+
-         if mis_stys:
-             raise OSError("not found: %s" % ", ".join(mis_stys))
- 
-     def run(self):
--        if self.install_layout == "deb":
--            db = DebianInstaller(self)
--        else:
--            db = None
-+        db = None
- 
-         if not(db) and not(self.nodeps):
-             try:
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index d4be6c3733b9..dc9b53c134b3 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,3 +1,3 @@
 DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
-EBUILD grutatxt-2.0.16-r1.ebuild 608 BLAKE2B 534c345006207ed5a897470de505c8deee8f03e564a8bfa5eebd44a642b2dea951752f583349d6d901c0ff496de4004369dc56e0b02cc1a998a47e3ca6d39a19 SHA512 0b987a2df776a43d7728061a0b4e18aca2f3c25dfb1348b6e028ca7bae3b025690e3bf6d849efc53b9a62a60d7f15d3b7c908d89968b1912ea85e89ea8ec64ba
+EBUILD grutatxt-2.0.16-r1.ebuild 610 BLAKE2B 49e8ca2d3d83e190ca7fe7ad05ede8548cdc7889863aeef4f58cba43e35538ec46f4cc7d7c6b13ba6a0cec0f23641a9617aedaaf1e1dc4014887ecf7af90cb9e SHA512 0a665914e74e84f4a361d4243d1bc513c9ef4bf544a4d6e92019750bd7c6587b6fc34cd00e7e2b3721c0d89f5916ec5441e1d71ff8fec45b5db60b155b045d2d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
index 871fe3df62d4..68a3e9b6acbd 100644
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
@@ -10,8 +10,8 @@ MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A converter from plain text to HTML and other markup languages"
-HOMEPAGE="http://triptico.com/software/grutatxt.html"
-SRC_URI="http://www.triptico.com/download/${MY_P}.tar.gz"
+HOMEPAGE="https://triptico.com/software/grutatxt.html"
+SRC_URI="https://www.triptico.com/download/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 
 IUSE=""
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index d2ae51b6e2e3..8a2f23d4caf2 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -2,6 +2,6 @@ AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2
 DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
 DIST jo-1.3.tar.gz 143425 BLAKE2B 32efaa84f64b0d3e82173a5121a30e13ce7fed991ec09f26400c90071e5e3cc5cc8af372550f4d9769cc338e852bf50497782c11ffd7d32a52d5769370742fbf SHA512 3c9480257d0ab9d9f19f1aaeb3a5b72e69caff6dcf87118bea8aca74a3b0864c0d17ed52bfc5550783c4636ee3a6acb8578f08316d976cea4f06af7096c12f02
 EBUILD jo-1.1.ebuild 426 BLAKE2B 7752fa82f7f4f99ca1873eaa98f9a2f9612fe57548cc7791e81ffb15bced18061d1bf4d17367506dc6a6f860fd0fea2c314d240f9d6fbb84336d77f00d867a79 SHA512 eafeac07b4a04c94a03de806eabcf620685043815a4df4db89e06783533767e09c38aec38197c34ff86c854ce29ba6456b555b18a0df7373a35620dd3e34d893
-EBUILD jo-1.3.ebuild 490 BLAKE2B e8a02cdb30d8bfc30f3406aa57d36e0e6b8af9e33a4e1c565335740031f4f0df40925303c6636de2929facab79db5844a78f3351347fcf44d84e923d5b530a4c SHA512 02b318c953290fe717adc703ee5edd40a5b8e7cd5194434671a80c00e87170bbcc4f93b3471362e18e76e7eefded218ee28fba3321147477e2d5f63d0d233d64
-EBUILD jo-99999.ebuild 507 BLAKE2B c2fa9c3ea3f20f0120057115f3322e66b717a9dc63b1dd05e945b054c57d3d2b7080b909652a90af1695ee82f99be049df512f4540fdd748712295e9d9c6c926 SHA512 a86dfb9daf822102d59b250b62d3e4ac1bae147b5353ef37d33bd31ade1cbf6e750c50b07c83e0f3099195f1bea8c893b21210f0969fa1bbbedee615b3dc0c75
+EBUILD jo-1.3.ebuild 482 BLAKE2B 5c70116b7537387cb64f0433609044b5ee296b5ec68f756e6025ae85d66648309cfb1bcd91fb299763eb6731714416f335e9bae121dde052972329907d9db7a4 SHA512 11336f4a9d07c484f45f106b4f9dcc3f5513e894d1f4b63d40bcb54384d8108758aa1d2daf694d4f6628b3ae9367287e95a12399df1c1aee872cfcf7284b8780
+EBUILD jo-99999.ebuild 499 BLAKE2B 0981dc4e2d1b9baec1033b5fe560e89be50d1dd76ef365ff108b635ced839d69ee3b25296263c4651f0ed8974cd28c7d8efa1694ea1fe7f52bc34bc01e8c31dd SHA512 2e20cda5b9d668024a0c121a235afb6e45441c37eb326006adf84bc8b74147900a66b1ca64ff7ab24f078b880086a5e6dc750acd1267e7b8fcdbf3fce96e043f
 MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/jo-1.3.ebuild b/app-text/jo/jo-1.3.ebuild
index 432c8d4358b4..d2d6974384b1 100644
--- a/app-text/jo/jo-1.3.ebuild
+++ b/app-text/jo/jo-1.3.ebuild
@@ -19,5 +19,5 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${ED}/$(get_bashcompdir)"/jo{.bash,} || die
+	mv $(get_bashcompdir)/jo{.bash,} || die
 }
diff --git a/app-text/jo/jo-99999.ebuild b/app-text/jo/jo-99999.ebuild
index 430a4993680b..06279f5b7cd7 100644
--- a/app-text/jo/jo-99999.ebuild
+++ b/app-text/jo/jo-99999.ebuild
@@ -24,5 +24,5 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${ED}/$(get_bashcompdir)"/jo{.bash,} || die
+	mv $(get_bashcompdir)/jo{.bash,} || die
 }
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index b099e32c03b7..13af88bb7c3c 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,3 @@
-DIST kbibtex-0.9.1.tar.xz 4185284 BLAKE2B 437fb2473095e89bc26446bf4dfcdd56ff0b402e604fe67f2f76073628e8e7f3fc8982c56aa24174303dde101c42d19abfac2b3c1e371bf930ff6bdb4307b7c0 SHA512 710ef3f0ddfe4869f079068723a2056866be9aab5907ea7eb00efb4b597270e4c1ec9464d6a15509e2a62749393d27bf0798022367536d3c879a0cbd10dc3129
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
-EBUILD kbibtex-0.9.1.ebuild 2060 BLAKE2B f880aa792f236a7525c42b7dcee2caebe5770b9893c47be6f4fdebe6c77b99d37fa94a5bfdd4acb00006cf12200904414e670264286dcf94f1c57f8352e81a84 SHA512 62e204d3e7451301d0845c7a652e9ea16fe710f32f46ae7229ec50ee3fb800d7a9074df0a9ec35b327af3be7d2bada93f862d26d1471725bddb808ef263508df
-EBUILD kbibtex-0.9.2.ebuild 2070 BLAKE2B 826203eea2dc3856fd17b7e58fa1132127f8241280817e41251eb4307827bb61efa2eb3c919a5fd3adc9e7798390e4970bd76d365254c144457b7961628b4e95 SHA512 223a4f3eaede46fbf38df658400fbe77b058c8d3a1ba69634356ddd07cd2be61698b26cfbe62c1beb8d134f46a7c5d6ffd72d0df7278ca62b6ac59d243c076c5
+EBUILD kbibtex-0.9.2.ebuild 2069 BLAKE2B 9aa3159a7840e89c6275b0c9355b7abf8765ca37d6ad18edc2d2d2ef44bd7bb5ba3bbec5ed6b7528fab97fca493314e8f659f32c93973bb67dd9e656dd6cb5e7 SHA512 c86f0d22dfcb5673fe676e5d4b3903f67c4b7d3e17181e7a7a80fe41552f788d1192aac0b325d6d0d82ab708d0ee0db54667d471e7ab76d563f1e86c1a4113c7
 MISC metadata.xml 440 BLAKE2B e5121ee173f89412a1bf3339de23a9e13fcec40f52c82129ebd185732759e4ad586b922d31e6470f91e03ba2ce614ba6de75dcb340e0f20d5b799c3476bde23b SHA512 cb2f6751bff9d468dde56635a792813de84b6c383e488ab5764c9656e54a892f5a9b9fd4932d49ec603bae4716f9f0bdd3cbe90b0c796017fceeb6b61196f1ef
diff --git a/app-text/kbibtex/kbibtex-0.9.1.ebuild b/app-text/kbibtex/kbibtex-0.9.1.ebuild
deleted file mode 100644
index 89524913afe2..000000000000
--- a/app-text/kbibtex/kbibtex-0.9.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="webengine zotero"
-
-DEPEND="
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	virtual/tex-base
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	zotero? (
-		app-crypt/qca[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	!app-text/kbibtex:4
-	dev-tex/bibtex2html
-"
-
-RESTRICT+=" test"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package zotero Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-apps/okular:${SLOT}" ; then
-		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
-	fi
-}
diff --git a/app-text/kbibtex/kbibtex-0.9.2.ebuild b/app-text/kbibtex/kbibtex-0.9.2.ebuild
index 76ffc2685c2c..57e69f9c8e25 100644
--- a/app-text/kbibtex/kbibtex-0.9.2.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.2.ebuild
@@ -15,7 +15,7 @@ https://userbase.kde.org/KBibTeX"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index a655dac6826c..07c28258985a 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,5 @@
 DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
+DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
 EBUILD libnumbertext-1.0.5-r1.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
+EBUILD libnumbertext-1.0.6.ebuild 547 BLAKE2B 1a08a4acf77cec1ee6ad97206badb8c594e057f2a8b17275db251676a7ebb1a806b89bcee25fc44ef126f70bd93e0f98dcd8d3973afc003c6a726eaff02447c9 SHA512 bae5fdba976bb5ab02f407887916f1e247bd5352e597195889bef0b26ae3d15123232490cbace05fdca002b0363b1aea8a07900caa96ca850a0eca7640fe587f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
new file mode 100644
index 000000000000..f652a58f5a45
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index b99f64247180..2bc2c7c0d92f 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -2,5 +2,5 @@ AUX libspectre-0.2.0-interix.patch 654 BLAKE2B 5be37013c202c2191c8169ebd5b769737
 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 1123 BLAKE2B 2c951e895fa4f570ab69be8ec050ab190718e5905231fca43691abb0593ca2d5978140c5217b132da3a5b4e488527d9669c61bfd3887a4b52084182b28ac9f97 SHA512 a89e6088859d8fd9349df40e9102a37d882eb47ad8071ef54552c65d98a5e9a983559dfa8ae202a1c5ba915c763e865639ba612456ed75a5d6912833b1d752b6
+EBUILD libspectre-0.2.9.ebuild 1142 BLAKE2B 30f9dbe411a2981fbc30ae2182f829449f9a5a560142a30c5df54ed0ee0bae9c6fb08895e0dbfa30b2475947e132c441f83253cf1b8be6b3ba2a274f8bdde632 SHA512 289d0bcc10ccb6ef3a218dabacdae54e81cbdc80b5ecfcc46142990ecc722763daddd652c7118f77fb818d76d482beee2c03c8b3751b83ddbe73ff503692eb20
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
index 0053bce742ac..60f16522aa3a 100644
--- a/app-text/libspectre/libspectre-0.2.9.ebuild
+++ b/app-text/libspectre/libspectre-0.2.9.ebuild
@@ -35,6 +35,7 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug asserts)
 		$(use_enable debug checks)
+		--disable-static
 		--disable-test
 	)
 	econf "${myeconfargs[@]}"
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index f6280d7a1299..42e34228cab5 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -4,6 +4,6 @@ DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d8
 DIST po4a-v0.59.1.tar.gz 3624434 BLAKE2B 9837a7317eecd3db540bc7c23b3d26a9110f00d9c441b1bf1d61af80bae1fe0952f875425f14d66a939456f3a90e9ea74c189d94da7471c7c9a4d0b15f3875ce SHA512 904cb5817586fef19de55e76f3a33c264f9864b5c720b727a75e78a3b690e1ecd7b10603304a762d07b340320143b83b686c9918b9fe95499ceb55482950a4d4
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B d648029b8afc30b50ff4b216bc46b37731ff7bb471aeec21ada1244f37f9b431c392e0f32b1bf3f16cc15e7fc79946a23aef976548382b998057812d8366a593 SHA512 1ee6216f7c8f1aa4ba51cd96c6a2fd4b5361d8727fa056a333d96f1413aa76fe19480d5e77602a32b526d99a4b436a103fbe93a58856c2e4021c85c5cc20d53c
-EBUILD po4a-0.57.ebuild 1321 BLAKE2B 1b21b1f84467ff062d888f126133dd76d61200b3e0efcd10485f68bcb654d4015dd8d8c0e55b8ef6a9a9c4959ddc68477f6e8489f92e808734063924902c631e SHA512 deedbdc30a91b4e7b8e7a7cc9d54629d6affe9744f3c8b1a38eb882a6f5000594939a0eed60fceeaf064d858e40e7d543f764fd02092dedfdddbaa60a7e5ac43
+EBUILD po4a-0.57.ebuild 1316 BLAKE2B 2e724ec926121d37a4622449163f99649f1a8f48c10ed2b26c94debac26dd5f4439093734f15077c3342e5ddd60575d5152ba6d852912027919e84df30ec0134 SHA512 0aaa25109c6f1dfcd88cbadd2d0bc4214133e4287959bbd5efa86a1f6fde721ac6de07e4670a4675fe5f67b2e39417c5cd5f419ccc980d22c67696711fc1d1d2
 EBUILD po4a-0.59.1.ebuild 1365 BLAKE2B 1d2364833b47fd38ad32290cd4942da8bebe13a266dd27dcc21b6265361bea45689a86771c49aab3a4f2478f6a350188f80bbaa9cca9572ca70619405ed52d02 SHA512 291da03d42b6039bcb35505161b8da6d7198b7f995130293d9d2582e26d7c01adaeee344791c84b55693c45ebbfc974743387f604bcbea6efcbfec6acf1536ad
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index cdc50e83c814..365d22d8b0f7 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index cddccdba71ab..112c3550de69 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,5 +1,5 @@
 DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
 DIST yodl-4.02.02.tar.gz 309075 BLAKE2B ce9da287ca59e20319ae8a132553b669ffff926c79e7ffbf7891af3e777c45815cbd784eaf8d706b7f4b8240ceac41c38882c7b5d2b51e2691da249b0f5be43b SHA512 531b5b61f85ed556163b0cf76a30451212849e5e03e11819cc466603db0856737a9d3bc34ba11419befd7925ec1bac33f92b707c38acd2fa8047e3e1223d0a78
 EBUILD yodl-4.02.01.ebuild 1184 BLAKE2B 7547e9d39fd312c30e1d465cec9f95fc15ef1acfd04e45af85105b95ef57a5fa8a24949d2d70348c9c03a89a060c59a785f771f0a70eb99b673753c0ea939bfd SHA512 a33e23178c78cad05f8f3c1e1b67cab2676706e2c989346a823c993ee3ac60dbe3c303a01c71d38ef9bb5cbcbd8ef039e0ef63c8cec52409a9ed200a6d53dbf4
-EBUILD yodl-4.02.02.ebuild 1634 BLAKE2B a79333320d7ee5e49e0980ff33ac83c38dfd9b6ab68deaf02e5573481f39762189aa682994d759cbd570a0150a12ba7d2e2c5246409edc5ac350962cf8ccfa3d SHA512 d0daf25c56ed5e7efb7503ed691a6133f77910fcbe42a415e5be251bda1cb740978795198c122b955f9ab2b1db9c3b585973a85c0d8b0fb547f473f6ce93efa8
+EBUILD yodl-4.02.02-r1.ebuild 1796 BLAKE2B 40a83cd6c04bd975f6562f80b4c699027763816ca55594cdf647ba2f06f47328eee0c4351a1a7f94849b793ebb96dd8de3c3170613f2380b3a8a580fb1d3c994 SHA512 a9fa0a475da628273c15a772983821aa1ebb50656be96d2724f104f2c6eadc087ad354ac5b6812ca96970a9f21eeb6fd7ade54a03294b63ba8d3df3f1316825a
 MISC metadata.xml 244 BLAKE2B 256b5e0596820baf1555605a91d2b5a2454bd96180ac95ea34b705405212a37eca42f21754f8f11f875607f97b82badc149211361ec253226593297d867d1376 SHA512 4116d229be9545299fb52d43d3c5f3f1bcd44e53ebb05483cf231f05d76758b59a6a1a6b7b2eb0fc78304dc3a2422d9ba70c89ac159eef4afbcc5730b58f297e
diff --git a/app-text/yodl/yodl-4.02.02.ebuild b/app-text/yodl/yodl-4.02.02-r1.ebuild
similarity index 80%
rename from app-text/yodl/yodl-4.02.02.ebuild
rename to app-text/yodl/yodl-4.02.02-r1.ebuild
index 25f75b909934..b54d4d14d58f 100644
--- a/app-text/yodl/yodl-4.02.02.ebuild
+++ b/app-text/yodl/yodl-4.02.02-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
@@ -14,7 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=">=dev-util/icmake-8.00.00"
+BDEPEND="
+	>=dev-util/icmake-8.00.00
+	doc? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
 
 S=${WORKDIR}/${P}/${PN}
 
@@ -42,6 +48,9 @@ src_prepare() {
 		-e "s/ranlib/$(tc-getRANLIB)/" \
 		-i icmake/stdcompile || die
 
+	sed -e '/strip/s|"-s"|""|g' \
+		-i icmake/program || die
+
 	# required for std::filesystem usage
 	append-cxxflags -std=c++17
 
@@ -49,10 +58,10 @@ src_prepare() {
 }
 
 src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
+	local target
+	for target in  programs macros man $(usex doc manual ''); do
+		./build ${target} || die "${target} failed"
+	done
 }
 
 src_install() {
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index f917e388b8ea..1f901e23193d 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index c48f5a7347c2..8e6f68926bc1 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -4,6 +4,8 @@ AUX editorconfig-vim-0.3.3-python3.patch 5601 BLAKE2B 4a9bee66b7b3b2b016d13a557a
 AUX editorconfig-vim-1.0.0_beta-wildcard-slash.patch 808 BLAKE2B bc35a580b10a9fcad5916197fb891fa4b9bb8abf7842fbd292b2a91dca60f95282b1bddb365d2286bc2eda4b4a8d922e8aea89312aafbce3a039288adb112e71 SHA512 004f27b01d0f8bd2a71687ce2c09bc70895377034775ee7b2705874d2458cacf36b5d1300d6ed9e1a6925b33428c7a208e223e4f65824cd3bedf56b938c7bd92
 DIST editorconfig-vim-0.3.3.tar.gz 35395 BLAKE2B a7b65c1472024017dd408e5c4ac5048004d0bd55f44c7cfba49b5973cb445125ed89cc3d4363fb902a4c5fbb507f3ee5ed0ca48aece3fb6915e643bae0dbf70c SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1
 DIST editorconfig-vim-1.0.0-beta.tar.gz 31519 BLAKE2B 2d5e8e55e8dccc0b45453b8da9ecad80867a84d1ea20146581886f793c093c201521a7d1d4451122ae441d30f58acec28d29aa20da9de737b5beb7f44d55c0ed SHA512 159e3ca32a7ffe71853ba62a14d0469310b81345b0e704dd6a9f42c56f6f6b9a3f63502ccabcf43a15443acf4acefdaf078063ae747f49315b89f5518d7f9816
+DIST editorconfig-vim-1.1.1.tar.gz 33287 BLAKE2B 4c79ac3bf1f82ca6182480ab2f3c2ee24b8234f5845c63d90434bb57271981554a0651d8bc0314c718ad9700adf7903fed45f5e400d8ae8a0b6d42932e89e071 SHA512 7b94db4b2f641ecd2d2623bf55bf9b457c007b2b5c8553cba5b7a75bc34823d6995d3c9ed13febe0f59de6f87c52eb0367591213c43c6fcd7c331c529126f4d6
 EBUILD editorconfig-vim-0.3.3-r2.ebuild 984 BLAKE2B 4d5151da95882cc23e8d05553e52ec6c926e9d3b8167d6509846bc76f9ebc87b6797c0fe928ec48bae0b711d46fdc416e2de835b0f9ba7a5887b866325899fba SHA512 5b989484463ab68fc9a07d90174a79b7a8cd0d18bf817b2403ff6505d04cdb710f668cec5cbfacdcab8c1a9df10ac3214aa3a651dab5aed0c27520a4c26a84ff
 EBUILD editorconfig-vim-1.0.0_beta.ebuild 781 BLAKE2B 2580c0c64c53203e5e09fe72459239b8992f5f644c6d0af485525fc445417fef88fdd62adb22019066dc6860ae84be82f01a1febbc2742808e6b84e529f4a14f SHA512 eda756f5ae0697fba4cee959571ef3314f575b6d11c1aa1023f71cd3bbed9c147f8d210235ef306af74e6988849cb242d8baf45ceefb19421ccaa0b3eb3ea13d
+EBUILD editorconfig-vim-1.1.1.ebuild 704 BLAKE2B 17d50178a129dbd0d2101ae9ae6c57019d9ba591956cd95773713eee9b3084c184c7412613690317e6afe0c426818c063afb5ebea695935994e5b5ac92e94012 SHA512 53df4304686156829f24ce7a75f1a72a7f4fd1f88c7163606a3bf7c25b9539262aed1620f8b5a097c850e987ebedd26df2515a53fa91013bcc320e200d14e640
 MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
new file mode 100644
index 000000000000..300d91dcfbdc
--- /dev/null
+++ b/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="vim plugin: Support EditorConfig files "
+HOMEPAGE="https://editorconfig.org/"
+SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2 PSF-2"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
+
+src_prepare() {
+	default
+
+	rm LICENSE LICENSE.PSF \
+		mkzip.sh .editorconfig \
+		.git{ignore,modules} \
+		.{travis,appveyor}.yml || die
+}
+
+src_install() {
+	# we don't want to install the tests
+	rm -r tests || die
+
+	vim-plugin_src_install
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 7cb6f205a1f2..2edf2eb5285f 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 6b33c21627de..1c0621b0b492 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,7 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.12.2.tar.bz2 1437221 BLAKE2B c4479b66cff7811aa7b7dbe65684d2a11fb675df53e9554c2871fd4e3a8e32d262ae701e98198d508f89463da48d4509f12e8db87d033a91d55e00609207a351 SHA512 7ce2c9e846059a2205eca6bde285eab81164fbe087d51d35a33a07be6208049fcf07fc1ac33934a758b6b5907e56f3377e20bff10ffc9268376f81c6fae4e34a
-DIST asio-1.13.0.tar.bz2 1472744 BLAKE2B 1fde414bfc782f25f8ad7d7caf9ac8971bea22ebd3b74846584a242d7df164895759b74777b2330aa98d34c5b8c34f266a2f85fcc27413990cc05420f7685398 SHA512 30b09c6656c9beaf091e72d518930bb5650f4bf66b286d11457a949a690a2b9ddcad0c95cb2098b41a2226f354741755ffbc92098f2844f3253e1921ff60cd5b
 DIST asio-1.14.0.tar.bz2 1473195 BLAKE2B e28960d585a1a84c6be7d6205be310bd2baab36e93630b9f5f4fba593377e57d6baf1c60e2503c46cd00ae73b20b622215358cae2068e86b62dac7e782210ecb SHA512 84855a06a3facc41e3c1c61be443d8b73a01afcb9bc3f1f444f0f3fd901ea1d5c932266ed94a031a0abd83171d5a6b83b6ab850e44aa31d175081a7e07b4793a
+DIST asio-1.16.1.tar.bz2 1493978 BLAKE2B 810fd735a0cbea8e07bfe30cbf02d44469c3c7eebed3822766c0a658fe8972681232afe4a6124537886fafd0769eecc40b8eabbcaa2771b84b93cda56329394d SHA512 e8cab449887e3e362f9d3c2aa1b1bbb2f81954aeaf2cd12cefe7f848cdc30e1a576130b49f551efd49611b9d4941e724baea42739c043e158626f3c982b75311
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.12.2.ebuild 985 BLAKE2B 4e7654ea993a07accba9dc4a180c704a4f8a9e45508627ddbb3192f5b5393961c76069d55e790c87d1ab59779d8da8a944c3ce067b1bc7de5f87e542240beceb SHA512 9e0fa2f4f7901efd5bdc16f8ac003c2f07182d1742de352c91877d45766f778119864bc4c2074fec3afbf48bd0fe568995a11a2cee8f5b240a7b8db973aff5c3
-EBUILD asio-1.13.0.ebuild 985 BLAKE2B 4e7654ea993a07accba9dc4a180c704a4f8a9e45508627ddbb3192f5b5393961c76069d55e790c87d1ab59779d8da8a944c3ce067b1bc7de5f87e542240beceb SHA512 9e0fa2f4f7901efd5bdc16f8ac003c2f07182d1742de352c91877d45766f778119864bc4c2074fec3afbf48bd0fe568995a11a2cee8f5b240a7b8db973aff5c3
 EBUILD asio-1.14.0.ebuild 980 BLAKE2B 93c1570ab4c7d9a7ebe0eab38c7e59cbe8f0f253f893ee61fce4687b58a180249e196e16131d94d4eb609dc691f3bb2471f938ffc397c0ef6297851096601022 SHA512 e0d83ec9c30147dadad5cf11c151efe4bfde83980c655067639943d19a6d6ab94cd8ca0b8d80d560d348341c9e83fd9d569425e8ecb7b5e9b4a364a80e9cc25f
+EBUILD asio-1.16.1.ebuild 985 BLAKE2B cda24973c883e3a98eae64aa40ccf35bea72e7faec4ee4f53cc58a64ae1a45a424627cc372b0195bb0ff5f5ffb6215b86a1046dad726ae771887a7cd23214931 SHA512 acea4016bcf4d4eb3ff1176c9dbcd1ca09aae430b191a5eaa28c311e3a9670de066604a7e3b603613a47a3b37570be334193fee40a96c77a4ac619314f6931d3
 MISC metadata.xml 321 BLAKE2B e14808aaf0f0d648b8de65363250523777e9e4ae52a47f840af9c22321ea2f8329f6ac82ed5a05e7757d17e1c895428de69e46a60efc465dc2fd6657ebfc24c9 SHA512 a913fd91dff169b361b10efcbe51e2d55822319c06c9fd292d8fe4232ef9bed98541cb55caf37f56b27e9e135ce7ddc449d55f9159a57a8ac993f43f3ba1b751
diff --git a/dev-cpp/asio/asio-1.12.2.ebuild b/dev-cpp/asio/asio-1.12.2.ebuild
deleted file mode 100644
index effe4bef8029..000000000000
--- a/dev-cpp/asio/asio-1.12.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples libressl ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/boost
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.13.0.ebuild b/dev-cpp/asio/asio-1.16.1.ebuild
similarity index 96%
rename from dev-cpp/asio/asio-1.13.0.ebuild
rename to dev-cpp/asio/asio-1.16.1.ebuild
index effe4bef8029..d14123c94662 100644
--- a/dev-cpp/asio/asio-1.13.0.ebuild
+++ b/dev-cpp/asio/asio-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index f6cfb1d9c5b3..4e59c6d04231 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -6,5 +6,5 @@ DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb5811
 DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
 EBUILD yaml-cpp-0.6.2.ebuild 923 BLAKE2B 56c096aaa6f7be157e5d83594968e2e65bfee0ea152a95f6a8d0d3b7aeff202a97ef8b70739b8430120978ecb416ddd94c15b9c20e25580fb12c4f011bf8251b SHA512 41a527eec285e4ce2122cedbcc6aed7ae38eb6b5ab21ae5d691205d7990a7fb6bebb9d8b93d4253939b96cd3b232e7b3ec596d5d3fc8ddaa2df35b13f0396af1
 EBUILD yaml-cpp-0.6.3-r1.ebuild 972 BLAKE2B ce630cbf1b1f58728cda0a79f8d922f8fa57eb1dbd11e64efe3983bf1fbe52412c59d651ca9bd7d53006670238953e67ecea4e9b224590020635d6431cf3fd29 SHA512 8796a6ce430f75762a7b3689a2c5a85922ee6329aefe1d998d9b4b99f0b1dbbad6ca5dc492a8104dd99c392606073cc02ef14d656db766647b5177227efcead7
-EBUILD yaml-cpp-0.6.3-r2.ebuild 1012 BLAKE2B 22566cbbfea39f50fc2addfb9695cb6ef8809511a51e2fdc7bd69b31149b1629ffb58bab0e763b4d9da76ba243cce169520fe5c838bd1f6c4a2a22c4db795e2c SHA512 a1fba028cc85e435e2e2616f334f1af0c2152043ea52dabeff0c27f71fdf616e6860e33cd67a993921fd65eaeb412b6b164f7f0919c46cc8289b465f8ed05c97
+EBUILD yaml-cpp-0.6.3-r2.ebuild 1011 BLAKE2B d9190eefc6a50c9a8400fe03e0158ee5707bbd6bbeb45c409362b89e345be3880fbe571e3e29952d35cd0234efe45c4291dbea1b08ae60eaee16d8c9b9833e45 SHA512 b933fc3e00f6c88750d9ad3252881638fb9698e8ab5830116b0463a694830459f07a501eeedaf9fbf752bcf8253d4ee5e8bbe600e010aa3191df9c66d457809f
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
index 966f37d2c32c..5dd5c5e5e7a0 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/0.6"
-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="test"
 
 # test breaks build
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 08da5332f046..aa4b2801dbc5 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 6c7b9c705ff1..eefaf29b9b6c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -15,10 +15,10 @@ DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B 2aeb9d6c575ed9dc2d00d3e51e6391c
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
 DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
-EBUILD mysql-5.6.45-r2.ebuild 27033 BLAKE2B d1d7621c9b9535776e8acafa7a0a13923bfa19b28923a376769cb83f4d824913d192482efc8358549974ad454a036e480b695e584d45c90614ef82cb2682a3c0 SHA512 ba2d27d934f207fa9073946d650d0a709b491141f98410342d9491002cde51866126125b41356d86ba8387474f1a9c28ee6eff8d156e56828d3f67bbf10d6dd8
+EBUILD mysql-5.6.45-r2.ebuild 27244 BLAKE2B 09077b737c88aeb95632be7c8e92ea5e69d84763567b5d0b489d06e7b1816f246fc2461e100929a896e1ed27c7129842e36a41645289b4c4a0605e644cab1637 SHA512 3967bc8f033d64c70aebcb7e251bde7caba187ce51daa3e1865bc862f094a2489000b2fc90ae1b84425081c1430984bdb9615045d46bb8efe1fcbd2808a4c96f
 EBUILD mysql-5.7.27-r1.ebuild 31684 BLAKE2B 9ff6937c77124bc8b6a01f6b56f23941599a517b1d89519045ede1c67312c78e594ece5ad0a0ce3fa2b93594dc6eaf811a85867e1c6a29c4e931f6b1c7000429 SHA512 725c6023e23d8341cc474b29c5929d920795abaa2d7d0af995eacbd4d7f8fef20bf054226f3756960e1be7f45c87242f331aa70add9af3cd43501b7dc9189148
 EBUILD mysql-5.7.29.ebuild 31420 BLAKE2B 7afa9f1af981304087cd0c1d6fbddf3031b1b0b9493e528acbc6befbf32432934a4920d6345a4ff18d3ea7973da0233d278f104295c75d232be3353960eb3922 SHA512 80a092af7eb3633973edf413ab07de355bc928648b7f42e89fc432e4143d3afcd34aec83f64329587ff4988a8d301006f43a32b1e3a2096c397e97be92b838e1
-EBUILD mysql-5.7.30.ebuild 30434 BLAKE2B 054987d9bf5e8f13c88e177e49a6d923cc3f0b66b0a0036a22e26545a2e8fa1bba8be56e4e3219b7380db1a72dfdc4dd36bea1aa076c17addb0109bacc929440 SHA512 2027f3640624607c99e7791120309c622506239c8b2cfa85e01d50da482bda5fe7db00068dacf314cfaa54fb3b871ffd7bd276a249191b903c34d00fae3f3e7a
+EBUILD mysql-5.7.30.ebuild 30645 BLAKE2B 085102ee102234cc8f44754496a936a985bbb33afa3e3bc70be014ddd9daff716c40d10424814f41d4ba00b7a604cfaab9034d46df7923388f4c9ee7097b331e SHA512 d89f6a403f408c7bd1c3943be03cd5f552f59213629cf60c2a81496b5c2f9e994eee30889a671d94b592fe9a2542ccecacc2f77a62d059644845d00fb7d114d9
 EBUILD mysql-8.0.19-r1.ebuild 37911 BLAKE2B 90a40972a8cd9de954aa6c89ceb81276f68f541809ba4d0484043878163ae0ccce7144cec51a262b84a2a7bd9cd53c50f7fac48abac5cf006d01a40bb5918563 SHA512 07bdddbb4b82eed2b383c2eae03cbe1e58c06a3bdc1b595703d6e32c839d17d34e8b1c8d4d2a7c4bdde2c6a04992fe8ad4758a3124d8b432dc2c2f23048a9d17
 EBUILD mysql-8.0.20.ebuild 37179 BLAKE2B 023e2f80e351cc3ea2daf0350783e05afdd59bd655f54b57b50d30e5acd3218e430ca404b7d4eb7e70c1f800ebacc65f183a344838a5441788a54a9a04521b56 SHA512 f5c03367c7ccb1b6c5acb42a3c344d8bf7f07d4f559b7fcda6dee78b5cd932b902cbccb9d335e9b6caa5c2a6b5091c176e4148bfc283839207ae8f63975f2079
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 18821fa038c7..87c3e81d6358 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -601,11 +601,20 @@ mysql_init_vars() {
 
 pkg_config() {
 	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
 		local section="$1"
 		local flag="--${2}="
 		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+		local cmd=(
+			"${EROOT%/}/usr/bin/my_print_defaults"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
 	}
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
@@ -724,7 +733,7 @@ pkg_config() {
 	fi
 
 	local options
-	local sqltmp="$(emktemp)"
+	local sqltmp="$(emktemp "${EROOT%/}/tmp")"
 
 	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
 	# see http://bugs.mysql.com/bug.php?id=31312
diff --git a/dev-db/mysql/mysql-5.7.30.ebuild b/dev-db/mysql/mysql-5.7.30.ebuild
index 4543221a9e40..71716b437ae5 100644
--- a/dev-db/mysql/mysql-5.7.30.ebuild
+++ b/dev-db/mysql/mysql-5.7.30.ebuild
@@ -747,11 +747,20 @@ multilib_src_install_all() {
 
 pkg_config() {
 	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
 		local section="$1"
 		local flag="--${2}="
 		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+		local cmd=(
+			"${EROOT%/}/usr/bin/my_print_defaults"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
 	}
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
@@ -872,7 +881,7 @@ pkg_config() {
 	fi
 
 	local options
-	local sqltmp="$(emktemp)"
+	local sqltmp="$(emktemp "${EROOT%/}/tmp")"
 
 	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
 	# see http://bugs.mysql.com/bug.php?id=31312
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index d4f6c7a05e84..af6cae475154 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,7 +1,3 @@
-DIST pgxnclient-1.2.1.tar.gz 87275 BLAKE2B 794ee6201988ba523cdcb4ee5a6287625cb3dd8a30ad750266d7adb739792b7f8e852d5d01f746fb6b05b54c98d677854dceacc57e41b05efba094efabc6a129 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf
-DIST pgxnclient-1.2.tar.gz 86436 BLAKE2B 796191d31000ff75360e0990bb20ca88af0fb1b908aac9ca7a6b7309b5420c56d045a67c775e8d5dda166f37ad956314f65bd2032c114cac7414bef9ad1a0d8e SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb
 DIST pgxnclient-1.3.tar.gz 51976 BLAKE2B 84ae5573588e6da0b01d5b05e296adc09f28a0b21ff81e5f2f14f3035a98ad5eb834d6793acf0a48a8b19190b989562e75094341f7c01b371028a0dd6a87b0f4 SHA512 fd9326107334d473db3466f776021186a5add389a93266b000c143131a0214b9773dd4cdd4688575cd720c8357afce1473838dea4aa5ff2564dcbc2c359de2dd
-EBUILD pgxnclient-1.2-r1.ebuild 788 BLAKE2B 6d10568406f8432c8773efc91d1a8b5662309c378d77f05175751cf8360bb59f39f87fbf2395656470384be6cf81621f46c376e3145dd4320642a7e94ed6d292 SHA512 84c19cd6a55d077484bdfa5674fce3da340f9a181987df8b5da99ed80da9f0353dab681bbc32b326e5525356b31e56f5a3384c3c7f4b81125e1e9ebe7c69a29c
-EBUILD pgxnclient-1.2.1.ebuild 788 BLAKE2B 7702c7c55c7fe507a7fa02016a7129a86cc77c23ea7650dee57d3c31b96caaced1c7cf34e344c57f4c2d4a55d3f88b4e5ee5c885997dfa2f8e0ca6ab86e43c8c SHA512 83c988cbecab73a3c2cfa1eeb0ba38ec498c0a06ba0c09c7c465c4443d5daa934aa968c427253d4e40ed245fbd5000da1561bbf3646ab8b51a2b66df4ece7d54
 EBUILD pgxnclient-1.3.ebuild 929 BLAKE2B 4f71c33bd21fc85c0c3ec4f7e9ace002669657f036a0ceeadabf101d5144b35561f91646b6b5336c5b88560d1574ef5eb6e3e10b5d25047ab6f92b36bb59baec SHA512 7ef32558533e7b719e18c08057979bc9754bf17340ce4782aac4ad264b93e15cd9d05c55ba1b00041af9bf2d75094dfd688932c218e1b02e3862dccf4598e9c5
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
deleted file mode 100644
index 476f29b4530d..000000000000
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="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"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-9.1[server]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# suite written onlt for py2
-	pushd ${PN} > /dev/null
-	if ! python_is_python3; then
-		PYTHONPATH=../ "${PYTHON}" -m unittest discover || die "tests failed"
-	fi
-	popd > dev/null
-}
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
deleted file mode 100644
index 7a21cde057ad..000000000000
--- a/dev-db/pgxnclient/pgxnclient-1.2.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="5"
-PYTHON_COMPAT=( python3_6 )
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-9.1[server]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# suite written onlt for py2
-	pushd ${PN} > /dev/null
-	if ! python_is_python3; then
-		PYTHONPATH=../ "${PYTHON}" -m unittest discover || die "tests failed"
-	fi
-	popd > dev/null
-}
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 0b14231fdd72..a62c06389fa0 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,4 +1,4 @@
 AUX fix_rpath.patch 2111 BLAKE2B 3aa9797555e0eb02a3d63e4e117e8aff5c7c0a09922cf6b0344777cd95b2480623f05fe68cfe63750ba00ff954bd6bb3e1a587c4e8af31086c94b2b3344cc08e SHA512 c0ee076d048d8ec4a77b036d0503776c4e3ca7a97c30cd8ba41cb0d99707ad5021613e1d308f6e73cc3432e0f71f7b38429ca0edcbc4edfe0d96955fc56b3504
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1502 BLAKE2B f3f3b127e35af7b20aa1d26cdc2af71f41be912558aa438d30005ea59feb0956d79867629964cab58f9972899be7c736ede938495dd4037b66fb7d8db5f3c9e2 SHA512 b7eb0b6003071a697e64477105020efcf4e41ff2605ce44cb6cbad4559f7f2aaedd40d71bf6c6028b1a54d774cf27fb31d0430f92e1b7d3b6d3e09acd1afabe5
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1504 BLAKE2B 8ad9d79e2f08e192fd9489b4b0ca3e7e4003386fc1bf127ad93291a0e6bbf7efd938bd419e12243504c4715950856bb336a2ea0689a12a127e4534ebf6af7001 SHA512 19fb959d037e74148e5284ed646558f100599fffad4e1eaf607c793ab75c5fe50b35527b462b9a96b6aff7c745aed8ee3a34e1201f4400e835b62b7468738b7c
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index 7d2247ade89d..6968612f4575 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils autotools
 
 DESCRIPTION="A library of routines for managing a database"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
-SRC_URI="http://fallabs.com/tokyocabinet/${P}.tar.gz"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
+SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 330dd0354fd3..f844cb253c9c 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 840844b8cf5f..af2663d9cd86 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,3 +1,5 @@
 DIST tiled-1.3.4.tar.gz 15860089 BLAKE2B cdc06f82a5bd92179ff4c6402da7094dfa33d1281f358cd82a5125fe9672b5f317f578f3332c1b07c4603bb8930dd50c736f0a41a156594fbd419d94147c0525 SHA512 f78772f74d9f7a241ff9191ed6152f965b7a5342db877fa63a2d84f266d956cb2fa487776cf503db36bc5da9aa825c8bab87e13293e43a129f560020e323bd61
+DIST tiled-1.3.5.tar.gz 15899657 BLAKE2B 3540fb9f4c6994d7b3df382aded53f16a2861f9864836ce295b0d6ab7cc8971b28272d52ff039c8281b7e453e4fbd98651d5b7cf6a2a8fc04f7ea4ab908f2496 SHA512 a8c5faba7eaf14c1062acf693cc0fd43b64003d886f876ac179d21b9aa18bbc1859a2b13dfabe4c0363ebe21a4d64bdd0adb697427ef68c82072cf8e706d7de8
 EBUILD tiled-1.3.4.ebuild 1316 BLAKE2B fa1511b48fc88dc9ef40ef246a0653720051c4c61e8224359e250a56a6f05df81d52fe41a4e0660c32df7d7218a6bc286b6452d686110038462f3a7aacadfd65 SHA512 e9396a9925d1d960a84067a78d694675d0212af603fb359d206474fa5b422505a9b0092ef8b44f75570cf7b6c26c93396372360b350926f900806cd7256cdc5b
+EBUILD tiled-1.3.5.ebuild 1321 BLAKE2B ce90087721e5494c1a894eed8ead807558a934e8bada5bb2edcbdb5df4d90abefba7bf9b539d695ac724396b06542df7b47151545b32fcc46693ba590b734dcd SHA512 0dd25ec9d68e69aebf01d64563fbea71638eb73b7e0058c9ad0b596dabccc60a3448c78e18136eb42b758baa06fa6d13a083964e8b6cef19f3d442088d3f49e3
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.3.5.ebuild b/dev-games/tiled/tiled-1.3.5.ebuild
new file mode 100644
index 000000000000..b0e8f2726bb4
--- /dev/null
+++ b/dev-games/tiled/tiled-1.3.5.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.10:5
+	>=dev-qt/qtdeclarative-5.10:5
+	>=dev-qt/qtgui-5.10:5
+	>=dev-qt/qtnetwork-5.10:5
+	>=dev-qt/qtwidgets-5.10:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5ebb3e29d822..058733f0fabc 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 992eec99323f..f689805341d5 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -8,6 +8,6 @@ DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0a
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
-EBUILD openjdk-bin-11.0.7_p10.ebuild 3092 BLAKE2B 408614638686de5d29145d3e30665f99d6d7a46594363f7ca8973b560eebc214d57c0e7ecdb3944dae23ffba95283e4050945c6d73960b40ea08598b348e8aaa SHA512 619777afe9911ac1d15079ff4947ba8cb90c1bee3aa8cf837de203100a754bb8f19d4a022759661ba3962f9ff49e0ee18e80228b76604e467416b83f53a0ae46
+EBUILD openjdk-bin-11.0.7_p10-r1.ebuild 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
 EBUILD openjdk-bin-8.252_p09.ebuild 2155 BLAKE2B d5832197b20177c54ea2fff0f636695f9755ebac665fb7eb72e2c010bda94d71aef30152ef41ffa6970292a56c73999587c3edee859cea7378da44a4c19417a8 SHA512 798bdc975d8b4073da3ee575b0a17ba929da4da9ccbbcdbbae0ec6fb32aed37f894707a3c16ab51ed3f61a6126d84a03b38ae6f6f988c9dc52e1cf619fc76e66
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
similarity index 98%
rename from dev-java/openjdk-bin/openjdk-bin-11.0.7_p10.ebuild
rename to dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
index b62ea6e8fe17..4ccc0089139d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
@@ -89,6 +89,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 3e25d1ec74cf..b4ad32b7cca5 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -2,6 +2,6 @@ AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
-EBUILD openjdk-jre-bin-11.0.7_p10.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
+EBUILD openjdk-jre-bin-11.0.7_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
 EBUILD openjdk-jre-bin-8.252_p09.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
similarity index 97%
rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10.ebuild
rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
index 33938cb19738..23e7a0fbadc0 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
@@ -75,6 +75,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index ea7b85cc5d09..4c115e0091e2 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -21,8 +21,8 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.7.2-r2.ebuild 4599 BLAKE2B 40622f45bbed4e5ccd75088e29aa1715faceaa3ff4823609ee832ef068ebc4d08c921f5b8f7e2a656c46f3f69ba7c8edb32c1defea7cc4c3f723f5765e60b1dc SHA512 9a97b882c2f18f0e9dc552a5dde1476fe360ef478741735601e6aa5cb847aad35b71c3f258644b9ca2cc1b1649e0838cd44ef7278f3f02682afc0f7c9d24da8c
-EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28
+EBUILD swt-3.7.2-r3.ebuild 4394 BLAKE2B a2c1c7a1c6868cf51076dac11a2a62e87381e846e23e704e3b9bde0b0066d37faa2e509e05a8a1c2ca48de206a0b8861eea61d90f07ba70bc456a3c597535d1d SHA512 131b78564d4024b556ebed24d30494d693ce1906bc9599c962acdd5569f2fb524b6c469954363e22954f8024454c2be3d58b00644fbc2f9c7d6fe417364b09b4
+EBUILD swt-3.8.2-r3.ebuild 4242 BLAKE2B 3abc77ddac021ab859bc95fbfc13b7a4f3e951e65f5b07d4d7e78baf167743d10e7da8e4385c6f5a0d18dc0429789b898fc7e26d2a2e610eeaec3a915bfe37fd SHA512 73477a7eb5069d1f785e6d4d58c7f822bd3e6e3c9e25e8383e9c47ec6eb8c3eb5f5518785bb8ee7290b11f61c90931f6306c0e059d4665a7b85defe89646744b
 EBUILD swt-4.10.ebuild 4534 BLAKE2B e331f67fa0516ad79467543694f22ee36ee2621200ecb30b84abf493ddce28d5ba10a20195a42e9a32271ae86f578555ad31b730e3140ff83d7e1f642ef5d853 SHA512 13ae51af08ac1653a8ca5c226cb7b69e8f9d64b50a311b74e30b90f3d30376d486e132299e2de8853efc4074d422419b71d65ac53c1f5777c98198e2367b5dfa
-EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130
+EBUILD swt-4.2-r4.ebuild 4491 BLAKE2B 45d9983f66b5748d7fa585390c318d8bd48160a2e8e6a299ed4d7854d8d54f9fafd497b1f2ef6be531e2fd29e5729778694da20d664e5b95b92f7353996105e0 SHA512 e76933ea8f2d9594cc034c12caba59bb0ae19192b0d3a3ce4f8dd8df787f49ebce48d4235b780716de40265bb29e01821c413249fc88749ea68a80599e31d36a
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
similarity index 83%
rename from dev-java/swt/swt-3.7.2-r2.ebuild
rename to dev-java/swt/swt-3.7.2-r3.ebuild
index 8444b55d8ef2..082fd3c27e7f 100644
--- a/dev-java/swt/swt-3.7.2-r2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -18,38 +18,32 @@ SRC_URI="
 	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
-SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="3.7"
 KEYWORDS="amd64 ppc64 x86"
-
-IUSE="cairo gnome opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				=gnome-base/libgnome-2*
-				=gnome-base/gnome-vfs-2*
-				=gnome-base/libgnomeui-2*
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
+IUSE="cairo opengl"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
 
 S="${WORKDIR}"
 
@@ -123,11 +117,6 @@ src_compile() {
 	einfo "Building JAVA-AT-SPI bridge"
 	${make} make_atk
 
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
 	if use cairo ; then
 		einfo "Building CAIRO support"
 		${make} make_cairo
@@ -157,7 +146,7 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
similarity index 83%
rename from dev-java/swt/swt-3.8.2-r2.ebuild
rename to dev-java/swt/swt-3.8.2-r3.ebuild
index 64b28cc018f3..83fd139c6032 100644
--- a/dev-java/swt/swt-3.8.2-r2.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,38 +18,32 @@ SRC_URI="
 	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
-SLOT="3.8"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="3.8"
 KEYWORDS="amd64 ppc64 x86"
-
-IUSE="cairo gnome opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				gnome-base/gnome-vfs:2
-				gnome-base/libgnome
-				gnome-base/libgnomeui
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
+IUSE="cairo opengl"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
 
 S="${WORKDIR}"
 
@@ -120,11 +114,6 @@ src_compile() {
 	einfo "Building JAVA-AT-SPI bridge"
 	${make} make_atk
 
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
 	if use cairo ; then
 		einfo "Building CAIRO support"
 		${make} make_cairo
@@ -154,7 +143,7 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
similarity index 91%
rename from dev-java/swt/swt-4.2-r3.ebuild
rename to dev-java/swt/swt-4.2-r4.ebuild
index fdfce91451a6..430e488a08ca 100644
--- a/dev-java/swt/swt-4.2-r3.ebuild
+++ b/dev-java/swt/swt-4.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,33 +21,28 @@ SRC_URI="
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.2"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo gnome opengl"
+IUSE="cairo opengl"
 
-COMMON_DEP="
+COMMON_DEPEND="
 	>=dev-libs/atk-1.10.2
 	>=dev-libs/glib-2.32
 	>=x11-libs/gtk+-2.6.8:2
 	x11-libs/libXtst
 	cairo? ( >=x11-libs/cairo-1.4.14 )
-	gnome?	(
-		=gnome-base/gnome-vfs-2*
-		=gnome-base/libgnome-2*
-		=gnome-base/libgnomeui-2*
-	)
 	opengl?	(
 		virtual/glu
 		virtual/opengl
 	)"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
+DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
+	>=virtual/jdk-1.4
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXrender
 	x11-libs/libXt
 	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${COMMON_DEPEND}
 	>=virtual/jre-1.4"
 
 S="${WORKDIR}"
@@ -123,11 +118,6 @@ src_compile() {
 	einfo "Building JAVA-AT-SPI bridge"
 	${make} make_atk
 
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
 	if use cairo ; then
 		einfo "Building CAIRO support"
 		${make} make_cairo
@@ -157,7 +147,7 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 4734891b0aa7..c21176b3d38a 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52 SHA512 89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
 DIST tomcat-native-1.2.24-src.tar.gz 419572 BLAKE2B 572f6d64b8f4c22ed1ab68efcec5cd1c57fe01e7b0830dea979039cb702a2930458e7bb31abdeddcacc6d673513c896ca46d28ece681c6c42938498351962b36 SHA512 5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
-EBUILD tomcat-native-1.2.23.ebuild 1178 BLAKE2B 10749abb4552c7f7411f65b225afb1c8f42095912077b1f8783de3f597152c5783ed0d986e644ebac986d9a59e835ff888e4ac0d0461eb31d2202b6fd01e6ece SHA512 b62fc8cc5d355898530a7a7dc9db642ce3074d5d72a6da7a2ee25a211c55120d29b631a61b1d3ac5cb4aa7c1341333a18929c0d6c1fb8cd2223ea5a9b12f64a2
-EBUILD tomcat-native-1.2.24.ebuild 1179 BLAKE2B 6f6768247218c3f40ea7b89d03468e1bded2962b354f9d14cb4956a3d0656ad84017a2d9b717d12b0bb4c65c7e5587f21ed014974ca86e7c84911261ae81a0b1 SHA512 25aff507afd4a8b1e4f0a485b643caa31b234079ba368a6a8d524f2cc70d9c32de19a967f176c8a59dd276eb3504a01bb684ae6b438fbcd102f1e416b1e863ad
+EBUILD tomcat-native-1.2.24.ebuild 1178 BLAKE2B a99246469d416372df02e87f7a401e3caf013a260c8d75ba519c26ad0fe0b0b7d56462b738690b6635b265e6d343942320a437699e3837f802929b30829bdb40 SHA512 eb969c2d30befcda019b155e8845a922471d16be31aefa8b2d15ee21c14153a491b812d838b31261867e669d35759e2975674d719e6bb80990a2fa0ccac8e215
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
deleted file mode 100644
index 566f24ceaf17..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
index 2dd1db52c691..0b63dda09194 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index cfcdfb2e7ecf..d458f6211f4d 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/logtalk/Manifest b/dev-lang/logtalk/Manifest
index 21aaf7e5c93a..95b5f74b048e 100644
--- a/dev-lang/logtalk/Manifest
+++ b/dev-lang/logtalk/Manifest
@@ -3,6 +3,6 @@ AUX logtalk-3.18.0-portage.patch 1179 BLAKE2B 25fad57b8969a487a45ab254cfba3f17bd
 AUX logtalk-3.36.0-portage.patch 1179 BLAKE2B aa40ea0df4f01778d01e2f7c174f9587d5d18f7ea80125ff198203081344eca3e050d3612c16627806e36171ca13a7875ccd0f935c4507ca987ef6529e691290 SHA512 5254edf0fced32c64d6848dad300ab48e53f7aa9f160e7b85e11fba5395b83da659134329846f281619b9fce1827ebae7c306fe1832fea8ece755fdfe7df7795
 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 3883 BLAKE2B 46f5263f30f6b10285d292981482e1b74f1f6a726fa3035f90bb29e0b1d420c7220256a10929f308fc0da934b7e39a815cb6c5794de4f16d8e86b365d67cb126 SHA512 7c8699c2cfafae06ef07061e7eb855a622ab1500d591677c3f1cc48edf2a157ff4825435dcc45b53ce0bbf3f331cfe9d4bc983c349468c62f427706cb9d1e8f6
-EBUILD logtalk-3.36.0.ebuild 3880 BLAKE2B 0213ef4aacd286ffa4483286e40dc18ce57d66559fb4f2a146b1c53f743514cd3ba88cab52d43ee0640dd5c078c2aaedafa33a32cf1fb565a9f34b0bc994c3ef SHA512 be98746464a03c93f5509acb377359cdce5d8bcf378c142d68f55b17c03fa09afe734496534c05cc9dec8f99c9e4fe431ad79e0f28b47b5d559717166bcf7a49
+EBUILD logtalk-3.18.0.ebuild 3882 BLAKE2B e1df1f189373ef4292ad98bf16b17a4045455d756fc963072334b407684827dd7d791955817d9f97fea58f21a0806605a07d2432e50e290179e7d23dd91e0547 SHA512 b621d6ade513a690d1c0ea82071b5e295914156e6e5353d19485bdf856438b34c2d9a84149ebe9b9092ccda19d8a6027e70e7fed7ff70dd1eabac1cb2535aa61
+EBUILD logtalk-3.36.0.ebuild 3882 BLAKE2B e1df1f189373ef4292ad98bf16b17a4045455d756fc963072334b407684827dd7d791955817d9f97fea58f21a0806605a07d2432e50e290179e7d23dd91e0547 SHA512 b621d6ade513a690d1c0ea82071b5e295914156e6e5353d19485bdf856438b34c2d9a84149ebe9b9092ccda19d8a6027e70e7fed7ff70dd1eabac1cb2535aa61
 MISC metadata.xml 404 BLAKE2B 8eee9851c967beb38e36f649b8eaefc8b8329f06adf298702a06b427edeb9a0e556a2f47e63c2b4cf4219027ed18502336b4a9e032d876bde18897985aea7dd8 SHA512 1faeefef2f7670809936eb73c4e9e4e18f44ee6e5851cc7386e996768ab88dbfa7c24801daa2cf4edca8646427eec1c871136540d71b7e0b0add3d00c78691ed
diff --git a/dev-lang/logtalk/logtalk-3.18.0.ebuild b/dev-lang/logtalk/logtalk-3.18.0.ebuild
index ebc48ba9a70b..63726459ddf6 100644
--- a/dev-lang/logtalk/logtalk-3.18.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils xdg-utils
 
 DESCRIPTION="Open source object-oriented logic programming language"
-HOMEPAGE="http://logtalk.org"
-SRC_URI="http://logtalk.org/files/${P}.tar.bz2"
+HOMEPAGE="https://logtalk.org"
+SRC_URI="https://logtalk.org/files/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 
 SLOT="0"
diff --git a/dev-lang/logtalk/logtalk-3.36.0.ebuild b/dev-lang/logtalk/logtalk-3.36.0.ebuild
index f7a62987873b..63726459ddf6 100644
--- a/dev-lang/logtalk/logtalk-3.36.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.36.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils xdg-utils
 
 DESCRIPTION="Open source object-oriented logic programming language"
-HOMEPAGE="http://logtalk.org"
-SRC_URI="http://logtalk.org/files/${P}.tar.bz2"
+HOMEPAGE="https://logtalk.org"
+SRC_URI="https://logtalk.org/files/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 
 SLOT="0"
diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 1360f435a741..99fe6b750c32 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,6 +1,4 @@
 AUX micropython-1.11-prevent-stripping.patch 827 BLAKE2B e4da5582029c800dd166104a36834e23c20826af3f9988a85f1b29c1ac8c82fe762ddfde9a83a0a8b45ab07ab7cfed89ebab9a7a35c7276d292b51f003665c9e SHA512 366abdba975f9f7a54c1e0882414744b0b216fb6d9a4ce4c2022c7bedd3c31349a3652b751c4b3157584de9e0490e5435c17c20f9d453b1aa4eecd62f716ab07
-AUX micropython-1.9.3-prevent-stripping.patch 787 BLAKE2B c050420f5dae60edb93c63b504fdbe047a8c9ed56c543ffde817c86a6fd9a53efeb8561c69823186121a5727fbf29b8474eac223398fa7ee43c825e50745c6fd SHA512 5e7fa7481f4bfab15a041bbccf452d5d6fe5a5c1cd8cfae2e5ec3475d84decacc0b9c0631766582173fc4cda82d78e2370e402f95d5989e13bf3adbdaf39add4
-AUX micropython-1.9.4-prevent-stripping.patch 787 BLAKE2B 6e92c4fdfd44b89d1fad69c056dbab1493d9dc45c4223cfd2f011254db72400c6ac9a62afe84f54c301a86abd92deb56866dc25e2f1bf8af74edf308b15eb29f SHA512 8f994394f42d7fed5fa35b62c01c37ebea3b487c029d659134a263ef8d65e1ec17bec755fdf57cde2f234969bc4f7f4ab30858562d7f8cdb2bc6cb819ba2ae0d
 DIST micropython-1.11.tar.gz 23010708 BLAKE2B 8deb29f2a27b8299f62c8c3d332654889e610ddc6854dc38c6cf7504c89f2f9cbbacccdc2d8e471d96b8bb28bbb920fe7ec1b8fd49b14209924262f54687c3c1 SHA512 255860e56bf51c4f35a00cf66fff3ee37fbef1e0d674af6ed580367d8b3d2d60fb88609a675e8f322fd466a23006e38078b67edd6f306e639d6be12abb2972d2
-EBUILD micropython-1.11.ebuild 1099 BLAKE2B 1899b0063ccb85b383deeacb0a6cf2cf5ef785eaf5e9c3bd7ac2981805d475ddf31c58274887858c4aa3731fb68f8b6e7a70fb29b158aafe3ae9b0a235e9a2ef SHA512 02ff5c432ffeb1b4e11b30df00abe107513a7e52f6d9b5a1b242ce55037b8b989e2d151012bb105336b6fd8e563de308fa52dd02b38caf3599eb433790ceda36
+EBUILD micropython-1.11.ebuild 1257 BLAKE2B c80c0a4d17da1d31e17b7aefe1c5cf24bd7bbf19170eb0fa8bb486ae88ef1d9fd538e1418622e2cc40c417d552d69cf25c83e80f369cb4c11489f916d6d432f1 SHA512 8364ee081509a8db4bb356caad93a078bf345f2a97a58d8395b0c75c2480c82a039e2b07e7b4abcefee5edf22a2690f059bf309d5cad635ca133625dc557a8bb
 MISC metadata.xml 1347 BLAKE2B c121e2eafde4ab3c49a352ab96ffbcc042ecddb5a765f3192589a41f5b3bc5f92e6a6f1a58df21ef2812424aac94e6cd579cfe1d29b4dd16983048768f1694ed SHA512 e8dd8f7cc3d0c570da6b9982596e39891e78e302581dbc0601d622831f976f16b9e9f78d7e0b55ae58ed3c81c3e7113a4217ca1671cdd8929f0b34b4647efc3a
diff --git a/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch b/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch
deleted file mode 100644
index 5ae7299f9f9c..000000000000
--- a/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/py/mkenv.mk	2017-11-25 09:52:30.921836372 +0000
-+++ a/py/mkenv.mk	2017-11-25 09:52:35.257861233 +0000
-@@ -50,7 +50,6 @@
- LD = $(CROSS_COMPILE)ld
- OBJCOPY = $(CROSS_COMPILE)objcopy
- SIZE = $(CROSS_COMPILE)size
--STRIP = $(CROSS_COMPILE)strip
- AR = $(CROSS_COMPILE)ar
- ifeq ($(MICROPY_FORCE_32BIT),1)
- CC += -m32
---- a/py/mkrules.mk	2017-11-25 09:53:13.107078063 +0000
-+++ a/py/mkrules.mk	2017-11-25 09:53:31.898185592 +0000
-@@ -132,9 +132,6 @@
- # Do not pass COPT here - it's *C* compiler optimizations. For example,
- # we may want to compile using Thumb, but link with non-Thumb libc.
- 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
--ifndef DEBUG
--	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
--endif
- 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
- 
- clean: clean-prog
diff --git a/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch b/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
deleted file mode 100644
index a130b72b6131..000000000000
--- a/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/py/mkenv.mk	2017-11-25 09:52:30.921836372 +0000
-+++ a/py/mkenv.mk	2017-11-25 09:52:35.257861233 +0000
-@@ -50,7 +50,6 @@
- LD = $(CROSS_COMPILE)ld
- OBJCOPY = $(CROSS_COMPILE)objcopy
- SIZE = $(CROSS_COMPILE)size
--STRIP = $(CROSS_COMPILE)strip
- AR = $(CROSS_COMPILE)ar
- ifeq ($(MICROPY_FORCE_32BIT),1)
- CC += -m32
---- a/py/mkrules.mk	2017-11-25 09:53:13.107078063 +0000
-+++ a/py/mkrules.mk	2017-11-25 09:53:31.898185592 +0000
-@@ -129,9 +129,6 @@
- # Do not pass COPT here - it's *C* compiler optimizations. For example,
- # we may want to compile using Thumb, but link with non-Thumb libc.
- 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
--ifndef DEBUG
--	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
--endif
- 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
- 
- clean: clean-prog
diff --git a/dev-lang/micropython/micropython-1.11.ebuild b/dev-lang/micropython/micropython-1.11.ebuild
index 0c8219f76706..e0c69a12c7ab 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,18 +31,18 @@ src_compile() {
 		-e 's#\/usr\/local#\/usr#g;' \
 		Makefile || die
 
-	emake CC="$(tc-getCC)" axtls
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" axtls
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
 	cd ports/unix || die
-	emake test
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" test
 }
 
 src_install() {
 	pushd ports/unix > /dev/null || die
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" DESTDIR="${D}" install
 	popd > /dev/null || die
 
 	# remove .git files
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index f0c5b7587fc4..90da711d722c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -4,10 +4,12 @@ AUX perl-5.30.1-gcc-10.patch 2993 BLAKE2B 81f934f334d3a1c5e166118e21a55230055bec
 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
 DIST perl-5.30.1.tar.xz 12367844 BLAKE2B 7e5dafb218a993301b986d198c02179d2d93d7418b910f813c7e5bc44ca4d22f004d4d768273ab5d4b6f16103d8a1896237ee14e195d2644fc4c05f5ade5404b SHA512 8f3339efdcd1bb58fa58a90042181bef86bb09e4598c737e446ed43b56d2ab23d67eced5e36fb08fc61e076acfdb572a12e46a1277f5299a3f412054df0b88bf
 DIST perl-5.30.2.tar.xz 12373480 BLAKE2B b34344221409fad8aad5c24a9851a95521720bfd85ff150fec02a70d78188cd3a4d6327931b955323c86eab6b16979128dd323f78b797cf3244518df840f70b0 SHA512 b945c95f44a58b9cc920c926e23017c4270c0dc8daf0bf8169cd7c8f6b8f980f1780bee4fbd525df518edc50f08364ba65988cb17e72a1667f50226459b65087
+DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
 DIST perl-cross-1.3.1.tar.gz 106723 BLAKE2B 473d90dbfe5d69e17d088664c365190982db400b0617d951fb7a4ccb84dd269fd9e861a6255c0469fbf288125db67ed9fc692251f14c31181f6e9dd1dba447bb SHA512 4715c1f65e39a7d0c605558b345a0a037e61afa992b3f723d66277d5ff7f1c7368ff1dfdb726895d75c4afdb6f710743708fdd9e79569a7d14a2d7002cc9f3b2
 DIST perl-cross-1.3.2.tar.gz 108350 BLAKE2B ddb352fdbec66a04de62425f5cae1aaa3bc7251b9d6f4837b66a0bd79c53c60212fad3997dad4c38055774a2769d45b5b83927bf48b0fb00a130fee429eba702 SHA512 d61d25066a8d87c34aeacc5b9bd86fab964b33c4c65e84a89e4077fe1d8011c0bdf810a304631af44fae32edcffd6c99fc17b0c584ea83d1ce5ce492aaedfea5
 EBUILD perl-5.30.1.ebuild 20271 BLAKE2B 1b412c3ab85bd682e054d80fb09de739b686cef20c8ba64471da2d884326e4d7e82de3eb9333873370b6cc815d11d68209506fb4cb913f9e468e4bfe8190b92f SHA512 6cf2c92b23c4d45becea1a9a68123ee0f087bd8cafc06d0602074f5d8bbd1f6a0259bc8859b8e8d2b6c443d633de01aecc428d3599dd7637b8667ff71c9ef724
 EBUILD perl-5.30.2-r1.ebuild 20249 BLAKE2B 8c1f20dc7e49f679bcd960762fe020d952e8dd4caf664bc2755a65034cd4349ad291b2d4b661047150e0788778ede2bb3c0b757ec7a862554ecb4c4efe858b52 SHA512 a9130908388b276211fbeba454ce482a712b1a687a23f09bf3f179f7f35a0c7081c869f076103e439197b3aaa0bad86a63bff3f33d9421b06b33b82bf7035f67
 EBUILD perl-5.30.2-r2.ebuild 20458 BLAKE2B 3713a9b07a5e2242640baf1974cd22454a9170afd04953849905b46bf7c89e435e4821f3317af8c658768fb0a261a3d3984aad91fec18364e9891ed92db05c6c SHA512 2dea0da7a28b4dafa0ca4029fc9294af18a611b302db70713b761654b08237b935307bccd6330a90a9675a822fcc35110718b4fae56f2be36b2615a65469c705
 EBUILD perl-5.30.2.ebuild 20226 BLAKE2B 06fe835beba602f173b0077b6993f886d25ecf6e7d6e3e2587a4a2b89d451cc51d105a4c124c23084c8b635e366396f11e0b64643b992bf4710fb138b4dde273 SHA512 7b17273a2691a45d03133d44c651092fe5ba8e644762dc162d3c2325e4296e72a9be3e35640e8d07f23edf0f1a996d6788afaccfac24edfeb3d410ed275fc7c9
+EBUILD perl-5.30.3.ebuild 20239 BLAKE2B 3ba4d616c2501afccb3a48d4cad060c4a1e7c61a53d1bc01493cb4b1c1b210d614fed2643ea5395907b4c1da0e5173c7cd91f46ffe74fb9e1c292cbb57547722 SHA512 ec3381d980f8870e7a2ecd5c811d4277c6df4f9d1998b54869d0a045fb92acbb253ff6e90d07b620ec9a1969aebf9ffd36adac44c61e77a9de9962d381d3fa58
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.30.3.ebuild b/dev-lang/perl/perl-5.30.3.ebuild
new file mode 100644
index 000000000000..04bde1a07ee7
--- /dev/null
+++ b/dev-lang/perl/perl-5.30.3.ebuild
@@ -0,0 +1,653 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.3.2
+PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
+
+DIST_AUTHOR=XSAWYERX
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN="5.30.0 5.30.1 5.30.2"
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.30.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+	mirror://gentoo/${PATCH_BASE}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
+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
+
+IUSE="berkdb debug doc gdbm ithreads"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=app-admin/perl-cleaner-2.5
+	>=virtual/perl-File-Temp-0.230.400-r2
+	>=virtual/perl-Data-Dumper-2.154.0
+	virtual/perl-Test-Harness
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.320.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.220.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
+	src_remove_dual      perl-core/Encode             3.10.0        enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.340.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.6.13.0_rc corelist
+	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
+	src_remove_dual      perl-core/podlators          4.110.0       pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.110.0       /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*-interix*)   osname="interix" ;;
+		*-aix*)       osname="aix" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
+	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
+	SITE_LIB="${SITE_BASE}/${MY_PV}"
+	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
+	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
+	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_update_patchlevel_h() {
+	# Copied and modified from debian:
+	# Copyright 2011 Niko Tyni
+	# This program is free software; you can redistribute it and/or modify
+	# it under the same terms as Perl itself.
+	local patchdir="${WORKDIR}/patches"
+	local prefix
+	local patchoutput="patchlevel-gentoo.h"
+
+	[[ -f ${patchdir}/series ]] || return 0
+
+while read patch
+do
+	patchname=$(echo $patch | sed 's/\.diff$//')
+	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
+
+	# massage the patch headers
+	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
+	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
+	s|^Bug-Gentoo: ||; tprepend;
+	s/^\(Subject\|Description\): //; tappend;
+	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
+
+	# post-process at the end of input
+	$ { x;
+		# include the version number in the patchlevel.h description (if available)
+		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
+
+		# escape any backslashes and double quotes
+		s|\\|\\\\|g; s|"|\\"|g;
+
+		# add a prefix
+		s|^|\t,"'"$prefix$patchname"' - |;
+		# newlines away
+		s/\n/ /g; s/  */ /g;
+		# add a suffix
+		s/ *$/"/; p
+	};
+	# stop all processing
+	d;
+	# label: append to the hold space
+	:append H; d;
+	# label: prepend to the hold space
+	:prepend x; H; d;
+	'
+done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
+echo "${patchoutput}" >> "${S}/MANIFEST"
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+src_prepare() {
+	local patch
+	EPATCH_OPTS+=" -p1"
+
+	if use hppa ; then
+		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
+	fi
+
+	einfo "Applying patches from ${PATCH_BASE} ..."
+	while read patch ; do
+		EPATCH_SINGLE_MSG="  ${patch} ..."
+		epatch "${WORKDIR}"/patches/${patch}
+	done < "${WORKDIR}"/patches/series
+
+	src_prepare_update_patchlevel_h
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Generic LTO broken since 5.28, triggers EUMM failures
+	filter-flags "-flto"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$(
+			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
+				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
+				   -printf "%f "  2>/dev/null )"
+	fi
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$(
+		echo "${PERL_OLDVERSEN}"           |\
+			tr " " "\n" 				   |\
+			grep -vF "${DIST_VERSION%-RC}" |\
+			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
+	)"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$(
+				for v in ${PERL_OLDVERSEN};	do
+					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
+					echo -n "${v} ";
+				done )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		myconf -Dinc_version_list="${inclist}"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__
+
+	# fix unaligned access misdetection
+	# https://rt.perl.org/Public/Bug/Display.html?id=133495
+	# https://rt.perl.org/Public/Bug/Display.html?id=133803
+	# bug #676062, bug #688432
+	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \
+		[[ ${CHOST} == armv5tel* ]] \
+			&& myconf "-Dd_u32align='define'"
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${myconf[@]}" \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 3323717c40a2..8a4fb47086c6 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -4,10 +4,10 @@ DIST swipl-8.1.30.tar.gz 10921576 BLAKE2B ce163c7600554e5a2f62a75c4fc17444c115ad
 DIST swipl-8.1.31.tar.gz 10949562 BLAKE2B 60a4dd1da1cce309f45e557b25d7fa384ac0d75bf819b5e49d8303cae260d6576b01adb9c26bd7496962ae64a3b012c146408f8adaf6a253c526d50f5ed6b74c SHA512 629dd038fac868b0a2bcf71807ff6e795fd9c83a21358ef679b27bde8197b6f0aaf588a033720db9b1dd88c27dfeb0a42a13bc04e938f504524b48fa34891f1d
 DIST swipl-8.1.32.tar.gz 10959244 BLAKE2B d67a1f675d70862df4afa103b118d88750ee5937920dd7ecbc02773ddc1c4762a4d7d8afc7e822b5989cbcdd2feb0980d150c59b67dc129873619cbb40721564 SHA512 d0fbfe85b375bdba2a585b609c1a66cbaca50081d0946803a43b10813f4d7b6e138b644632dde7f8ac06f590f2de9aa3dbc927a128f105c1c3547ac6ae9a9c25
 DIST swipl-8.2.0.tar.gz 10955744 BLAKE2B 3f1a534a967c86054596fe8ec5fda41ae2ab09d5617de2082f549211dec39674c2d53a210e697a9399be6061f7cea1f0fb241243c9c6226e64aa4ab22c990c85 SHA512 aa0d5e8e8c35e3ff1b6827c9a1ea53de44fa71698b98c974c9e65f2071545d0b71fba7f897327db38791f3cb706072c5dffdb46b4865cc26b9b25ad97522de4b
-EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96
-EBUILD swi-prolog-8.1.29.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
-EBUILD swi-prolog-8.1.30.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
-EBUILD swi-prolog-8.1.31.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.0.3.ebuild 2492 BLAKE2B eafab4e38fb1f4cd0102edbd327f8555c09784688ec8ec539edc2c164fb268d522c61da06d1c90bd0ab3d9aff534e6765f5bc518f8f311c5cdd56924651d32ad SHA512 036eae0123ed0286ffef4114c089984500babbb9adbe2acba68f49f2516d749a0ddd5b4eb8b9111746072b87e920401f26366c7b99ad27355580afbf7c3d1307
+EBUILD swi-prolog-8.1.29.ebuild 2555 BLAKE2B e58bc85b5e88bef7eb96f3dca8293aed19a5c94407888cab6bafd77d485698efb9f0527a139d57ef526210fe66db3ecc059b774eddfc29a16f4681034172a0cb SHA512 d6469f8f583ebf5e8478d28e35b6bcaa973d2dc9ebef7679eb28c9d923ad461ff6b616d9c70b4183f1e708ce66189ff7a327798d1a00c6aab019ade090d4f017
+EBUILD swi-prolog-8.1.30.ebuild 2555 BLAKE2B e58bc85b5e88bef7eb96f3dca8293aed19a5c94407888cab6bafd77d485698efb9f0527a139d57ef526210fe66db3ecc059b774eddfc29a16f4681034172a0cb SHA512 d6469f8f583ebf5e8478d28e35b6bcaa973d2dc9ebef7679eb28c9d923ad461ff6b616d9c70b4183f1e708ce66189ff7a327798d1a00c6aab019ade090d4f017
+EBUILD swi-prolog-8.1.31.ebuild 2555 BLAKE2B e58bc85b5e88bef7eb96f3dca8293aed19a5c94407888cab6bafd77d485698efb9f0527a139d57ef526210fe66db3ecc059b774eddfc29a16f4681034172a0cb SHA512 d6469f8f583ebf5e8478d28e35b6bcaa973d2dc9ebef7679eb28c9d923ad461ff6b616d9c70b4183f1e708ce66189ff7a327798d1a00c6aab019ade090d4f017
 EBUILD swi-prolog-8.1.32.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
 EBUILD swi-prolog-8.2.0.ebuild 2554 BLAKE2B bb6772dc66a33fb77f0151499856766586edb458fb4cf2ae9b81f41d8a412e64ca7bbe3ba7268bfc53ca1a26084514a54fa1f99bf008a30b53833c87a6636088 SHA512 bca5df7dfe17dbdd56d54f457c3c0ebd91d7f97de3329e304da123d9620a70588b6ede401f2ed1f187b2a02ca9ea8ab113a4d37453d28ac8d12ccc8092f532b3
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild b/dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild
index 328da7dbf93e..88f1c0cd8880 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.0.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
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
 PATCHSET_VER="0"
 
 DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
index 2293c183ae1c..357aecc392e2 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
 PATCHSET_VER="0"
 
 DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
index 2293c183ae1c..357aecc392e2 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
 PATCHSET_VER="0"
 
 DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
index 2293c183ae1c..357aecc392e2 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
 PATCHSET_VER="0"
 
 DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index db444b2dd314..21aa5139c03a 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -4,17 +4,17 @@ AUX 0.44-valadoc-doclets-data-parallel-installable.patch 6063 BLAKE2B d27b69ab82
 DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c
 DIST vala-0.40.18.tar.xz 3429060 BLAKE2B 113cebedfefec3a510085e6562012cefedcc6879f4a21eed835e779d850c39ea0c5d9ce5e5e036fa5d849c28f803fd80f1b4e55d4eb3db0fb0fa8f2706824823 SHA512 a58afc4ecf5a7c5c35d3f32d06947ed656f66672fd496d4963b5267d8be9ffecbbc0415af8ef15d35c92f986cb7861dc09d2ec35c2b6f77f3decc4adba24ced2
 DIST vala-0.40.20.tar.xz 3443256 BLAKE2B 4cb53448ffabd29ea2c1411d019aa3749be113371e411d90803aa77a5ba19790d3766dae43af58a107680acc04870b30670fd53d4ce239de8d15dd79571cadfb SHA512 767f156c85bd901e6e672439c2bf7fdfe60e4f7b088ca89f8787179e57b42904c92749ca8bd79c1e4319ec998e0e3f6bd6f13ed679be1f5240041f797657eb36
-DIST vala-0.40.22.tar.xz 3458916 BLAKE2B 3a9516ea22f550ad4ee0bacb15c77be1f8fa971725cad30fb97ec6939c604406881ca6b2e981e6ed99a8cf6218bd55f54aff6b06e074bc09089d01c554ab817f SHA512 913af4725ff56f330815fc76ac4bf7f7fb28182fe2764db1b9da5d2452dd264df071f84f62eef6c56719ef4abe595d88ba5d89c0fea15d9e1835e0fdb23668ce
+DIST vala-0.40.23.tar.xz 3462092 BLAKE2B 49eb5f7205d59b0806e807fc0f99771ace4d188222be60f12ef2f503bf8da9116ee7eedb742a6e50400655ae86d1eeb383f3b8ac1832e82f2787b0162c2a4dc2 SHA512 9d5638d44d8a42124fefd02b66454d19cc5d24291ec1525e1fd9c1c8df814d55d2bdc6f5be0168639a8712766cb4828abf3ae70ebfc9e0a72393dd584c25853d
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
+DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
-DIST vala-0.46.9.tar.xz 3413264 BLAKE2B 6bc14f9316b3d5a2c81b0fbaed48ca85ffec37c616746b1bf432c883838097938e13931d06efc1e4abd027441e31fe73b2e76ba9b578ea33948f4dbe38a18bf2 SHA512 64ce902a15de9a477d50e3b0a0f64007c1acea7ad620ad224ed49cecbb029ebf8c9fcd79df6f0c64f46c0fd25cbf34f94be145a937460329dc9c38087073f240
-DIST vala-0.48.5.tar.xz 3445096 BLAKE2B a41fd6b5b06526eb1a743c2e8681b4e3891b19a24213669f28407f9e8e29c3aa1a077458558491e0af05aed5659a7a6d4a0a18d711465d9c936e719245b944b1 SHA512 129097880c0dbe40cb84dc60a0af454b247759131ce29e9b5cbf74ca9dae35917e1ba973eff1d5ee025e54afe5a0881eb37d11ab433346e5e4c9a7625952b2d3
+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.18.ebuild 1189 BLAKE2B 42ec55f24d20afeb5c3e268c5491be25084e9cd6f94e306568e9a0377c0e2a3197b4a5da9ec5108ce39433d31a339075a26485546d59ce9bc5a845f6efc40500 SHA512 18066dadbb427a8f494fd28402bb3dc71752209f47432e29fa9935c82e8a9f417eeea6fdb5b6e63a2f95ffdf6fae8bc133aa1ac1e79f1bd8ba9a2cb3cf97ffab
-EBUILD vala-0.40.20.ebuild 1189 BLAKE2B 4a5c40c8863c286464f60c0efc9ddf5f597fafa7b3611481b8b100ac967b2cec34487eb04488968144daf25b99726ebc4782300ecfe11ba981d02ae9cec3e6cd SHA512 470e44183c5671bd3c13ece022061cb44bdadc626ba94ad85cf2dd08b5f52ab0563a7ad5cd0fe9278fc79524ccbd149e5ed93ae71484252ac0e82f930d4371df
-EBUILD vala-0.40.22.ebuild 1196 BLAKE2B e2c6de7f13f532e577c26db204f440ee0d9256844618ab02d1f4761646f1cb74f1f268fadb5d043701aa64f014464bc9b6c9116856ef7c96abde436f10c5d62f SHA512 a4bbd7dfdcf4e6351f7abb0a4ffe7fbfe09846e883152c9e178f78f108c22e8cc9c3d2d340eb409f60fe923c97805fe503254b16e3a3e7f6779a32c48188c3f3
+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.44.11.ebuild 1110 BLAKE2B caa359b186daa04e09b9f3c2185280dfedabd8428ad060304e78cad7fe106ec00c1ec023dcd2f0a7f4239ab5be705413667cfa9683fc30ac88ee2b0b1389e588 SHA512 e14b37221c39f2b50c788c31c28b929251db44e944bae83cb81907c2d304e4b6a9838c7173fc5c74f2ffdecc89d8d0f1ee3cb8d6ffea023491e8f7f92e25c79f
-EBUILD vala-0.46.7.ebuild 1305 BLAKE2B de813fe44cb24ec67df6af60a46e5ad8a6f04fc6775661b5de30c95f20288b6556bca13a64a4bb86525e570c59c72407086eff79e3f088164fd364d5cfb4b412 SHA512 d4645608f63b51d142d52f4eaef984d8a0ed52f156a10623fe74652d7b5bd5934cff77c496654e407a73327885b9f2ed5060ad84d14f13d007d7109619dbdf48
-EBUILD vala-0.46.9.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
-EBUILD vala-0.48.5.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
+EBUILD vala-0.46.10.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
+EBUILD vala-0.46.7.ebuild 1304 BLAKE2B f5fbb3aa0f8d3b488dddd4681e1a52796c97d60cf11556cd9c43d38f68b35ae31265ebcbbdb4484549ef98fc167d18866642a319bdc201db44867891d667f185 SHA512 8c9931cb50247c3680e1d166b529ff7df1c9261117f6ebba202e9c682cb22f250e04c4938a0f3bfda12d0398aeacd6958341323890591b6328830da3855f7be6
+EBUILD vala-0.48.6.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.40.20.ebuild b/dev-lang/vala/vala-0.40.20.ebuild
index ea7bbd80a286..e38c24e44f45 100644
--- a/dev-lang/vala/vala-0.40.20.ebuild
+++ b/dev-lang/vala/vala-0.40.20.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.40.22.ebuild b/dev-lang/vala/vala-0.40.23.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.40.22.ebuild
rename to dev-lang/vala/vala-0.40.23.ebuild
diff --git a/dev-lang/vala/vala-0.46.9.ebuild b/dev-lang/vala/vala-0.46.10.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.46.9.ebuild
rename to dev-lang/vala/vala-0.46.10.ebuild
diff --git a/dev-lang/vala/vala-0.46.7.ebuild b/dev-lang/vala/vala-0.46.7.ebuild
index 442ede904d89..3d7fab768755 100644
--- a/dev-lang/vala/vala-0.46.7.ebuild
+++ b/dev-lang/vala/vala-0.46.7.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.5.ebuild b/dev-lang/vala/vala-0.48.6.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.48.5.ebuild
rename to dev-lang/vala/vala-0.48.6.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0101d809aa9e..66ca4392008d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/antlr-c/Manifest b/dev-libs/antlr-c/Manifest
index f5f89be395db..60a169f992b6 100644
--- a/dev-libs/antlr-c/Manifest
+++ b/dev-libs/antlr-c/Manifest
@@ -1,5 +1,5 @@
 AUX 3.5-cflags.patch 632 BLAKE2B 34051800ce235fb8b913abd1b3c01f2364d73a7103d380cecc861d2b89eacaefe65a6038199799c3974789e6d4cb17aae43c74a3276c299a95dbd3406a6e8ed8 SHA512 8f68bc1d56de08d144ca6dc29c530a6d89347aed58d497a7f5525d5375086cbce1c4365e4ac917ef92eaae9471c6031d38df98244dbb426620073f697c8fbf68
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-EBUILD antlr-c-3.5.2-r1.ebuild 1386 BLAKE2B 03f4c638d3f6c0d933b39537a53e40b7a8bf8a30722e320a9e2eac2619ffba8dd4cc349f7ea043461094d983b67bfbd8a6d2a6de423449b85b2269c3820c0374 SHA512 bd23886362f0f2f102f620cc693e7fb968e9cf21b2b35e3c521a93d57855b8b8c1c18da0e29bb7b4e464948ee9f03d7e78817018dbe993c85a8b1f0f19761358
-EBUILD antlr-c-3.5.2.ebuild 1372 BLAKE2B defe2ee7fc43d5ecce704174b859ed19b8e82a8f47933de7e30d17fa16f547086ed17fff377152ce0e00316f6553837fb6712f9ed4779658a84eab79906fea45 SHA512 6279f86cf49fae38177f3546b8474c983ab484281836358281ee17d492f9a68645eb36a852a565c2bf96fe7c1b104381b0af1128b0d6e11b5f5b895a9f701de1
+EBUILD antlr-c-3.5.2-r1.ebuild 1387 BLAKE2B 57c75124fc536bb156a4638a7a74f41482803db897e5be36fdc4dc612b0a5c19cf9fdf811a1f6f5150abb443146c6903a7be53a9bd852ecc15f5396ba64f63a0 SHA512 48afd4378769bd1ddf00bab876912b1fcca17d49ecd6526cbf28d7757ad6379d27de398fff56a8798032771e6140978ef0f4c3ebd33bec78ced96c03db5c6fce
+EBUILD antlr-c-3.5.2.ebuild 1373 BLAKE2B 0dfce85d2268ba4a767db3f7911b7d0ba5c6e8ec138060ae55fd4a7cb5e33ed9a716d7c89bea2a6204a3ad803b0863c55f4d10047655c524231b2f00930cbc69 SHA512 2f3f0d094d75659159d74937e0ffa9db8fc0405aafb9021938359e2b34313ec535e73c759b1b4c2feba77d495eae597106d08815ec927942357344f66813a9a6
 MISC metadata.xml 336 BLAKE2B 980e56da4035d18792f5f65654223bdfa1bca764c18677a1e4cb6ee7da3e2f59a09944c0c6bfd63045f0c2855ed353d0cc2bd68a3cefced82ec9f3d82f478401 SHA512 4d1c32d4948359f596c0b006237cf7ee33d662c1730c4c68b9b4786fb46d762e3e4b1c89f9ca5ad99cc727c9be96c2a0f0ad92e5ceb990e71fcfd8b37ec257aa
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
index 743a7d4e90ab..b073fe008480 100644
--- a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
+++ b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit eutils autotools multilib-minimal
 
 MY_PN="${PN%-c}"
 DESCRIPTION="The ANTLR3 C Runtime"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2.ebuild b/dev-libs/antlr-c/antlr-c-3.5.2.ebuild
index f963e2b8d550..52c508bf9e11 100644
--- a/dev-libs/antlr-c/antlr-c-3.5.2.ebuild
+++ b/dev-libs/antlr-c/antlr-c-3.5.2.ebuild
@@ -7,7 +7,7 @@ inherit eutils autotools ltprune multilib-minimal
 
 MY_PN="${PN%-c}"
 DESCRIPTION="The ANTLR3 C Runtime"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index a4e291f653f4..3d9145dc025e 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -3,7 +3,7 @@ DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09
 DIST atk-2.35.1.tar.xz 294224 BLAKE2B e2e4d5768d8add243bb064e3ec43bd4665bf16f0211be721788a3a3bb96a93e402671e0bf5c7e2a1747ac673fee0b5022cb1798481a5ff0b1cc61f41dc0c8279 SHA512 da81cb4a6a5f2d8d83fa8a430b181b009e5407d906bb000a2d86481e7fea9fa6fb6e9dcd6790d4efdf513e5fe8fcb32ac3ec49d4ce3c76010145b8baacf2ae1b
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
 EBUILD atk-2.32.0.ebuild 1163 BLAKE2B 4582b2d1881b6469ed0dfbebbbbb45d833172e4dc459499c7c327eda8cc50ebece5a799352ab12fa6b86d4acef9010bd323655d8afcd4a15acbba3f4da64db6c SHA512 b80731afccc28f9b9cdb6e5f9e19925aaedbbd5279786a947fe5c004c358f3f586dde4fe262b38b670a18a9b6155754c1595aab95c566a79c446a675b4d3fdfd
-EBUILD atk-2.34.1.ebuild 1165 BLAKE2B 4305b5e2fc3f8c19c6145aadb08395d2f908d5ae7d71257e61e9cdbc713bbbbdd296d2be7c25aad7eca005056056f568c4fd63fba891ee3227d4d8e5a55ea169 SHA512 de61378966f5c9d18653cc1425c17a4eea96cbb9f25aa5810de69061a7768b4281b39564a6ed310850efd32a9edfb27cadc58095bf6ce18fa52e903a11724e30
+EBUILD atk-2.34.1.ebuild 1164 BLAKE2B 0f96f33efd18f6cf633ef5672fdee921a43dd12846d0288be3a7c17ac7b0bf001795e0dc649f0648c089665b785686d41cff2dd0648bda07c07de17a7f2b783e SHA512 bde758b85036a8be576484109bfd3a038cb1904e7bf6ce49c940c8425e036b9a77890ce569105e9447d2784b7db2067a040b2c2990c6b2d148f2984633b4831b
 EBUILD atk-2.35.1.ebuild 1171 BLAKE2B 09ef391df20e8888a5d549560f80f89757da1683c7d55abb34c09185c754f51dcfaae2b904bf5787f5a3ca45fa5f323706f347bc2b6b66641daf89480bce01b1 SHA512 deabb24be76f47cc4018769efa10780eded48ba75e9d7f678277dc1f361fa1714ee9ca0c74ad60c56f661b45a3f36a4db3817c259337cadb024710ea00f183df
 EBUILD atk-2.36.0.ebuild 1171 BLAKE2B 09ef391df20e8888a5d549560f80f89757da1683c7d55abb34c09185c754f51dcfaae2b904bf5787f5a3ca45fa5f323706f347bc2b6b66641daf89480bce01b1 SHA512 deabb24be76f47cc4018769efa10780eded48ba75e9d7f678277dc1f361fa1714ee9ca0c74ad60c56f661b45a3f36a4db3817c259337cadb024710ea00f183df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
index 0b76246278af..2e35381ded45 100644
--- a/dev-libs/atk/atk-2.34.1.ebuild
+++ b/dev-libs/atk/atk-2.34.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index bf6a3954c160..22facd4727c4 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,3 +1,3 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
-EBUILD cgilib-0.7-r1.ebuild 605 BLAKE2B dded992b743a9fc03cb5fd6c11bd5429788a2608bb29c3db4f45e9cb147347e6b833bf354dc46a8479cd9b1a31980a21300f9574581d3324a8290419c6bb52cd SHA512 4cee540bf61f230f3e2d80d491529424577ab9c0df50a09b0c04d604c5f8bb79f7bc369e1e32c1f73764ff6fbee1bde8f1356ce03b5c3c350d21d7e1af242346
+EBUILD cgilib-0.7-r1.ebuild 607 BLAKE2B 1791838cf524d65d3de96b2401d1689ffa287e4101de95c860be8ae56c34bc55ae586102823193308312e0bced7f113e53e138f39dcaa6bc5f2b7e88b12f74e9 SHA512 e896622899bf05f5cd1927859b4c708acd5dc9204b6bb65f13af3ba837c2b34cb36e6bf5907f75409423826a9f293fec9b43e246c4bf95d88bcb6cbf0c25516d
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index 5358afd54380..4f873fcb0b7a 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="A simple and lightweight interface to the CGI for C and C++ programs"
-HOMEPAGE="http://www.infodrom.org/projects/cgilib/"
-SRC_URI="http://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
+HOMEPAGE="https://www.infodrom.org/projects/cgilib/"
+SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index eff76fb1c8c5..df6d428be91e 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,3 +1,3 @@
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
-EBUILD double-conversion-3.1.5.ebuild 455 BLAKE2B 6b6456dbf67f13ad2c7c748405e2c541fb2dbc6a9e0548cf57f0d75a615568b05387ba4e0dd7e27c527d813aa4c333750d3ad12298d0245d8a3d92727e0ac71a SHA512 8c6c27d13c2e5c7c89880e4592765d3b29d5f84132fd5126303741255b6a4109f92bced87993a2b6625fed46106fd9b60fc04031ee03aa139d812a4af4bc6f2f
+EBUILD double-conversion-3.1.5.ebuild 461 BLAKE2B 8da1f66857c34396535a0e0cfe091f6ccb3ee7e20899e48a2799bbcd428fa86a1b672f30d60e374d14073d599f04605d52f063c8cf4c87bc34db5381da4e8526 SHA512 c927a034b3e1643013e10770f05393aab1506dc1c655b9c54e274f092f9fa3866ce748b4df70fe865ab7757ae25b790ca4295b62e96767f1d6f91996061f9b76
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
index 678e180ce05e..a3d7d4366520 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index e6fb1f2eba64..9a2c25070b72 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
-EBUILD flatbuffers-1.12.0.ebuild 698 BLAKE2B db3f39e1236522dc831d5b850d2196956f32394e5cee5a919986bdc8706f4153c58365f94ced93357be649bd5e0d6e6d9a366e778380b2ed13295a7305bc36d5 SHA512 f3ff7651a14564edfb3b9f151a5a60f6b4d4c2ef2c928a8c4edcc97049bacc8e8b35a21617e08aeff7cc606ec15518a0a22f4a83a08bc34d5de3d6f7d28a0eda
+EBUILD flatbuffers-1.12.0.ebuild 705 BLAKE2B 4eca88d359a88c4edb61cbdb8645fdf3ad4465f3428d94ede5b4c5423534649751cae4f0451722626e5a10117fe1f7a768a1e2730c469629b46b5d140357e958 SHA512 e59becd1abe09fc50ac1db458c5380201a9aa56eff0e9d9ce9f0a38d4d3dc9cba6ca070d85b521fcf61b023bc95ce7a5d6bc3f78df8f8259c1dbfb00f5ae7af0
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
index 3b0fd0e17e73..4b2accd3e233 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index a149bd91f59f..4e24f2ffa8ba 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-1.0.8.tar.bz2 2077095 BLAKE2B 2b9a0887a02bf6bdd7f285aa1df012e5e8f675fc930b612f53a2cce5ef4ef275610ce9a1aec9debf4c5239164fdab4b175e36f8f07288949adf2496d01c95f67 SHA512 d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
 DIST fribidi-1.0.9.tar.xz 1141684 BLAKE2B 6c9e9866ad900c041968f96ffc93e118715a319fbc47a5fe09b4a68daa5096e8c3cc1f0be1f8754ecf60b265f51fada75ac71f8bf1853f59e891644a97eaf644 SHA512 e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
 EBUILD fribidi-1.0.8.ebuild 1003 BLAKE2B 70a3496da4ae7c7826b940140020bdfa814600ffb67ec581a029d76d91e6eec39fc5cf86fb9e77bc19ceb1e8a3ae06dd8b7d954da32c8c15b3b216c7b07893d0 SHA512 b5b0c6d9a5e0188402b48b17a0ce1beee7ba1f5b19ceebdb8b6e881f3d1cf3c82359b7ff7da7252edc359680d74854f56a2a9a0cd16ab7d05a2bf4abacad6915
-EBUILD fribidi-1.0.9.ebuild 1004 BLAKE2B 783ee89d4567ace33c7158614851312553eae3c293cd6e354060367cb1ce0800290c231d4fd19539461e94c0927b39fdb02e0b914ac785bef788da3c13b5aa6f SHA512 7c265112005cb6c6d5bf2f1d2353b8c16cb7f1350af5f4b7994160337daf463c19d4f6627217239ee7949af415013daa311542285d6e677210b5b4513d693ed1
+EBUILD fribidi-1.0.9.ebuild 1003 BLAKE2B 8739845ecc77716e05bcba4d1771e8bfa577a2288c31dac77d6d246135c9a16d22bd2ca328aa8e746b0a35e3783ae509d3ae7101ee94fee96f1edd5a91d05693 SHA512 92bb90ff789c6bd3e75b2a7ba1fc0ebbe4666aad86eb503a1797ef21c00e409cd3a629fb55afcd92c95e6be2dd43064689271c22a25855224874973032d5afe8
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
index 7474dcc3b430..6d219ba5269f 100644
--- a/dev-libs/fribidi/fribidi-1.0.9.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index a7f0d11c57a6..874ad3ae1879 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,3 @@
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
-EBUILD gdl-3.28.0.ebuild 718 BLAKE2B ba3464870bc5dd164669573444abb5c76ab39dbfbee74d33e87ec0d8b40dda7b73cd515041aec636eafab174420918dc586ad9198de4b002c37ace0781eb2b43 SHA512 30f3c1f39244997cf01f4d456c8b7b551770938b1a584cafea94da8a5c87cbfae70cb7714c3b00fcd99751198633f53478b03d74de3eaeb116ea085ae10d273b
+EBUILD gdl-3.28.0.ebuild 725 BLAKE2B f30e30777adf107bb2e9e79c5c070b9a8e7bd11589f648ea4640102c61d9fea5e9174cca4589ab031ea537732f0dd5ed662ad73317f69aad5ffcd4924466c8da SHA512 1d9e4bcb04a0e859dc2783b8fbdf87f4d1b29d683b0091f9936736256647bbe99e487b7cbc6f4bfec9c333249f4639ef36480f08c98878385e79f52987c76da6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index 2b38e3b527f0..d3ce4fb72df1 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 1e02196eebc2..ebe4e53471e9 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,11 @@
 DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
 DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74
 DIST gjs-1.58.7.tar.xz 638804 BLAKE2B eb9bb1ea0cd9b52b58a0c4497d5bb930ccb0c8451a94cf9e5e97a6cf1e7bd4dfa5f7a15c2c68fbba3c36a5d71e71df88f086b528e7c2e86d2a8374bfdeac8aa4 SHA512 0790cffd2f2230717b78266b356e88133b5fb816380bf96fc2bea0a039d96979796ad6455a4270dcde62ff2a023fbd73e2edc98428aa2a8b2fdf2cc6c8f8ecce
+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.56.2.ebuild 1716 BLAKE2B 2ce098c4264ff6e1da801f8cc2280760ba40fcc81919e3cf8097aa6a3cb51375e5e4b9b3282b8c399d03aeb52c27de23ab567ee3ba3ab294ed01129479e1eb89 SHA512 5fdcb266f181e8c29f33c3360b484a1d99635e336290896188760ef253a08e838ebd553643c02ae4bb348413d7bc19a689f8ae60e943b25dc7b7d20c434d7189
 EBUILD gjs-1.58.6.ebuild 1608 BLAKE2B d4b1bec5098b8c8175fc94c130acbaf0c74497578cf22ebb2eaf02a0386639c9d28baa1ea13e227bd1a85118612c9924e75b4f2270afb18983de3a03dee7d989 SHA512 4f0a732f0a4eeb31c2226ba83d8c1c2f3dd686f2aea986e5896ee480721212194039efb59dc706a6743de1c10e2a1f4e0c30e5d4faaa7f02d908bab18f5e1015
 EBUILD gjs-1.58.7.ebuild 1613 BLAKE2B 3857ae2f6b7f9fc589a9abb4b3dbff4042cd7ee7cd543630d7eeab4ab0b55e18c408bb84ffe1e6ed7de552d2d64580d0b1f966f259f5c465f59ed3042c04ece2 SHA512 eb4ef64e73ca226340352e5e5426cde2b95ec3bf4034b5a43a1c9ec98515aa3148ec25e2259a28d524a290bf9bbeddda55d7e81e8358e61098f4813fa3cb7e23
+EBUILD gjs-1.58.8.ebuild 1613 BLAKE2B 3857ae2f6b7f9fc589a9abb4b3dbff4042cd7ee7cd543630d7eeab4ab0b55e18c408bb84ffe1e6ed7de552d2d64580d0b1f966f259f5c465f59ed3042c04ece2 SHA512 eb4ef64e73ca226340352e5e5426cde2b95ec3bf4034b5a43a1c9ec98515aa3148ec25e2259a28d524a290bf9bbeddda55d7e81e8358e61098f4813fa3cb7e23
 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
new file mode 100644
index 000000000000..c0859f6c9be3
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.58.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+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"
+
+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] )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
+	virtual/pkgconfig
+	test? ( sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection] )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-code-coverage \
+		$(use_with cairo cairo) \
+		$(use_enable sysprof profiler) \
+		$(use_enable readline) \
+		$(use_with test dbus-tests) \
+		$(use_with test gtk-tests) \
+		--disable-installed-tests
+}
+
+src_install() {
+	# installation sometimes fails in parallel, bug #???
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f61b5ba50f73..87d987c1a4b4 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,6 +5,6 @@ DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
 DIST glib-2.64.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
 EBUILD glib-2.60.7-r2.ebuild 10254 BLAKE2B b0dfbc7218f55ef76c175843266fa68a217aa837dd90fb1b97a28cc258420da832cee5832703cc3cb31a402cd845fc41b6d1b7c6bb5119028b60107b58b0a169 SHA512 82206417d477653373ca1e023b6172e15d90e4f44cd7ef4f9fa25c45ebf267adc0f4e974bbc72d101d0c400c9b0f75670cb00a6ec07051600d35ee8b8f45db00
-EBUILD glib-2.62.6.ebuild 9780 BLAKE2B 2d579c9b3305f25ddec85e34a0d3231272e2751773250b5825cef468fc7886f06461137d4aff9dd0fd85f740470e7f510892646ca114d800ef57e9528f978a25 SHA512 3ad88843bf521fb4286a07191bd721a5a23f6a7d78704c6e7ce307c761927fac5e33cc2dff579b87661825630db95e4dfbc524e917189eb90fb3f7989be7e424
+EBUILD glib-2.62.6.ebuild 9779 BLAKE2B 8d787082716ee07cd866a81ccdc7ce5cd1f8501576a171283df96a119889a4449ee039b692bebaa3c4931c55589586f396444879c9bd904033a5e5ce91305cff SHA512 b486d513660b2f226dda6d99267dc1960cd960b6df54baa1c495f890dc3c995546dbf72e46614949f2cef0064102ad491fb765c08db27faeb7bd4e02b9480a05
 EBUILD glib-2.64.3.ebuild 10365 BLAKE2B 4702138fc2ac027dd6f694bf07b0cf9e1d147d5171c3f7d22955766e9d243549372570a54c31977e40edf1924b7d22441d91afa9d529278c2f4d5adecb064f18 SHA512 20ff3ca65e3506b8ab40998f5d7154d15c20808458ceffdc85b02801e05feb08f68bd40f9ac440e7796e76152c3cb872c11debaa273565598b1b93e8da75dc6c
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
index 3a343288c87d..4f713c38a19a 100644
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ b/dev-libs/glib/glib-2.62.6.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-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"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 999bd9c78804..2854d7ed7f7c 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,7 +3,7 @@ DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0
 DIST gobject-introspection-1.64.0.tar.xz 1000240 BLAKE2B 09e6dec65a53a107bee387cef9cb271345ae564f3520bd9a6485cf1796deaa47243c05f45a72f3243e811a2c1962a2ae123a6b344819187cbf36eae0ed58fbaa SHA512 d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-common-1.60.2.ebuild 995 BLAKE2B 9dc1baa0c18a297475f7af1bcf8db071e065ba5c792f432c337029a56a3315edc4705ed8c76e07ed9dbd22a4df14cdf1ecbd375310a34cf531228cda0c78288c SHA512 ad2656b8023463ac448932896f2569e2da326c7bfcd2f4e45d2d7759e4fedae1deea86833e9e4620958d3a546620d0a88241570074c81ed9aaf1a988cd247d5b
-EBUILD gobject-introspection-common-1.62.0.ebuild 933 BLAKE2B e3ccaee483a115a71e73056b02a03145d9d993996daba737d4d5923e94074dea4ca875dfa44fe99e328b73b6930acbf77060932478b825d816bb12688cd64a8e SHA512 114bc4bb11dcd8645e89b03dfe0bfb3825c11e29013c29fae10047d5b37ba60b272c36c7119768a8b244302fbc4463f05bf0d7f4a5abc5ac176c0574cbb1cd37
+EBUILD gobject-introspection-common-1.62.0.ebuild 932 BLAKE2B b8941f3e94df34faee66a96a86ae15596160a115a49d7c98b32d4aa929bc9e548bf3ccfd4e718b66c1f6d792f4eca8d04cfce60e13c7004561a49ddadca3fe3e SHA512 1d4c9d8b1c730e4f96da3a7d96b0dc56c036815ba9d9de54ac02b03db5e4a37844fca3d8484db217b26096973668bf6fad26cc562fa47800cbdde249623548e7
 EBUILD gobject-introspection-common-1.64.0.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
 EBUILD gobject-introspection-common-1.64.1.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
index 42dca4deacee..6459a460c26f 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 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"
+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="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 3c8f2a13b82f..d532da1c588a 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -3,7 +3,7 @@ DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0
 DIST gobject-introspection-1.64.0.tar.xz 1000240 BLAKE2B 09e6dec65a53a107bee387cef9cb271345ae564f3520bd9a6485cf1796deaa47243c05f45a72f3243e811a2c1962a2ae123a6b344819187cbf36eae0ed58fbaa SHA512 d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-1.60.2-r1.ebuild 2245 BLAKE2B cf38b83022bd32d03ed3a24d5ce3cf8baeef6638d050a151eeb0f45c95c9f47a1a9aa0dfc595f30d8cf30ee6733291eb4f78b2c8a310edbcdc1cd2b13d8180bd SHA512 ae09472bb63e9d926264c64da60b74b10051947d724e2f2e59f6f4880db2f9f9897b1a71769068bd57f5d853206f200374fb293656a5f204dfa996f3e1888843
-EBUILD gobject-introspection-1.62.0.ebuild 1874 BLAKE2B b04026e9a996a3cd74721a5200c1940a38bcf4e8d87b57c4df6834920bd825e2373b8b71c0b094d2c5d5a9e3acb71039aa3a3aee4512a4cb46f0cefc62323169 SHA512 e9503e17b9334055dec803f8c9ad19a8e5b170274e9868d2439cd8738ab45f7fa89b5a2c43f94961c48ef3d832c3c70cc439d19b238f4c97430671c78cdec326
+EBUILD gobject-introspection-1.62.0.ebuild 1873 BLAKE2B 3c2ff2921f591c858939d428777342c2037bf0be5a83a10457d05c73bb4b5d8e31c06c26a4f56916f0172ad4339f5e3e9a4fd023aa19635839399ac2209fa705 SHA512 8242e132acdc7a7f6bd3131f7d16361d7a4cc958c23e356961d736344f2475260d55da779a80c18a587cc9ada0cdd5c6201b9b7a938b68840e6664ac74b02ac8
 EBUILD gobject-introspection-1.64.0.ebuild 1889 BLAKE2B e331a2e6adc124300979f3cbea3fd96afe159c425c0f599b1fd4d8ce715f982787ca2e5edd877a1ee7651114d90af321efc31329ef6a033f376a876e3274da54 SHA512 ee596f425020b613d29b35c9ff431abd6c370089b22f9e3c6d61402b277f20769fc681c2650780d2e227ff88e883f54554a44b2802c9190edc7c120606080f1a
 EBUILD gobject-introspection-1.64.1.ebuild 1889 BLAKE2B e331a2e6adc124300979f3cbea3fd96afe159c425c0f599b1fd4d8ce715f982787ca2e5edd877a1ee7651114d90af321efc31329ef6a033f376a876e3274da54 SHA512 ee596f425020b613d29b35c9ff431abd6c370089b22f9e3c6d61402b277f20769fc681c2650780d2e227ff88e883f54554a44b2802c9190edc7c120606080f1a
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
index 2b35d0c8f569..c6d729e70ac7 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/jthread/Manifest b/dev-libs/jthread/Manifest
index 86358f65739e..9e815fa3d331 100644
--- a/dev-libs/jthread/Manifest
+++ b/dev-libs/jthread/Manifest
@@ -1,3 +1,3 @@
 DIST jthread-1.3.3.tar.bz2 8514 BLAKE2B ba24fb73f5b02e64af81f889401cc81acaf8c6d60fcfa0316b92e9356b36f8ec65a9cbf0fb999867ef2b590fe15a46136f165739279b14805d26dce8d55b1b0e SHA512 87c57db51014cd1af87cb4a7f6ac1ccfdff699cf72ff91ecbdb30702c844aad360768261d7bf6391b96639cc17f2fae29f3f3506a333b4ce6ed8a9ba64239e6f
-EBUILD jthread-1.3.3.ebuild 710 BLAKE2B 4780ef5cfe6bdec75d37b3721a1c5a1f9d750442bc585bc2fc94ff06535599963cd7bb5677aa0b6b322fd8df5a258e49c1b28829792520fcdb17136fcd8f96a8 SHA512 f2234e8f774c51761191fa8039a155539457fd6761479f0e86440f58670c69cab14c1188c0525a89037200cdbda8df53ece37e7a8ed9ace8915538e74fac170f
+EBUILD jthread-1.3.3.ebuild 709 BLAKE2B 8113dd23cc9148d0771c5e0eea1285baf4744a566189818c51e7913ded5462d97551054c44601500c6c8d99982061e79fa53cd6ffdc3e4bcc3636e15a12d3d87 SHA512 998332ba561ae05249794502f8f5f286b9bea046124e0331c707c1f2adef2c270b64877acde8ecc6239a343f05e8c4fccd66ca8fc846ed1bd67b4a5c2e660ec8
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/jthread/jthread-1.3.3.ebuild b/dev-libs/jthread/jthread-1.3.3.ebuild
index 0f3556d96b53..165ed9f222d5 100644
--- a/dev-libs/jthread/jthread-1.3.3.ebuild
+++ b/dev-libs/jthread/jthread-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-multilib
 
 DESCRIPTION="JThread provides some classes to make use of threads easy on different platforms"
-HOMEPAGE="http://research.edm.uhasselt.be/jori/page/CS/Jthread.html"
-SRC_URI="http://research.edm.uhasselt.be/jori/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://research.edm.uhasselt.be/jori/page/CS/Jthread.html"
+SRC_URI="https://research.edm.uhasselt.be/jori/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 1516b8c7b616..ec295f38a5c6 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -3,5 +3,5 @@ DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da
 DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
 EBUILD libgit2-glib-0.28.0.1-r1.ebuild 1327 BLAKE2B a7c182d2f1d5fad28b81bbbddade798e41f5a4a555b86c505819833024971e744b06a2901d67862e3feb62201e9fd077a7f470cdc137a36df333f881d12750ea SHA512 1e9cf655d40b85038309cfc2d943e0e1a0f6a83ba796ca3a92e8ab6a4d03e17ccd73d3e959006d32767aa4ae7b93e8baf43ca0f9db8278f602f770cbf43ada0f
 EBUILD libgit2-glib-0.28.0.1.ebuild 1256 BLAKE2B 7246cecc6ae927178611caab2ade6d38a954b041f55c4486e62b2846ad7978a9ce7ebfac2f6b49feb53f771e48813bef38a3a1bcf7b8b31b28ece90ceceb4019 SHA512 b330da636839cc73691f0a33c778dd37c3d9318e470ce90210333235601c030ccac76b81914c02ea4291649392cd52607003aeae1b4b8dafb1e519cf2e21e600
-EBUILD libgit2-glib-0.99.0.1-r1.ebuild 1328 BLAKE2B a83e5257c7fda75a7bafa407823429c1d73205c96896d7de510300b177eeaa5637e6d94c8c6bf703af0d2c13434aaa2ba3f1b4bc1a6b2e0acf9429c1e977f3a1 SHA512 774edcce23f14e0ba1c4ecf65ac37e55a9bc48afdde3cd4482c029bd119f17723f2eebe095885a0d4c20348c9af17d54931f9d39409c35c550e2f767fd8ea21e
+EBUILD libgit2-glib-0.99.0.1-r1.ebuild 1326 BLAKE2B e08dae84a9c13cd52b37f0ec9db186f0f41f9dc4e9b04720365297576445cb28c0c29fa5394f9c03259a060648f68516eb76ca5a6095ae9e8e13d1595ee938a5 SHA512 8e89fc44aca4e6448490e31e0e71d19f55036333f6d6ede90069df648c909d5d37f06a8dd461433bb7aab6a3e14259a8783df72216cef08ba63a2382b2d32e5a
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
index ee114890cc7f..9c356e90db4e 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk-doc python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index b20face1c539..2c4e3ddbaf89 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,9 @@
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
 DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a
 DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904
+DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
 EBUILD libgit2-0.28.4.ebuild 1648 BLAKE2B 3f281a4dc503b2692a451fa10786aff3a8dff090fc311d38ec0cba20fedd13018683e78674df806b4f7370e6a8ac5c09943b9e3fe7b30691c82056deaa286ae9 SHA512 87dbeaafba6af0bca7cc509dcdae5ef8ac5848aa2af048b555424be1be60a0da2329750fd4a9b2858b37ba8bb2c109b4b99d6a31ae15cb5187bb79a507fe5bfc
 EBUILD libgit2-0.28.5.ebuild 1656 BLAKE2B 33741203200169f36f1bc5d1d1d02343c64c1b83073b6b20ca356a822b80859bd0d7d645ccaf12549b8ef8739be17e03184d9c873f50f6f2f12ab6fe8bed9570 SHA512 cb24af6bf368eec37269693ee9a05f247d6d306863d6ffd8aa61a895ab6f72e5696059dceb447af122e973efd2cfad93bf10e3ad7d784f2f0af46c266b8bed8c
-EBUILD libgit2-1.0.0-r1.ebuild 1707 BLAKE2B c92ce64bff80f7732b336ee8fee1be4fdd35e785d6c0b1d2b596fbbdb20a4d4c5b89c89be7fa78f6f9557574b2b97a7bc9bd657fd45e1cb58166a29d3ad5a98e SHA512 25469f44f82e9a25562c5fa1cb5a9c86fe5531aff961a4f6cdebc7b09fbdfe60266a7dad7bd2251dd1d59881f922cca0f84c394e115ecbc09ab1efad9444d5ac
+EBUILD libgit2-1.0.0-r1.ebuild 1702 BLAKE2B 3c05beaab097eb0187a119b6b4d42fa242a657ae74f1796efcbbdde8044b6e3705f7ec00534edc4404bd598f620a2834919076b3afc95a6fb645d7ee8c5b9023 SHA512 8b5eb0eaa8ada427ba48b0ea8ab7c7387de20ffd9ee66f6c2cf1534752683ac7d5474d90bf995c5ea16250f821be53cf2a49b02ecbb41697c105616f39b0243f
+EBUILD libgit2-1.0.1.ebuild 1707 BLAKE2B c92ce64bff80f7732b336ee8fee1be4fdd35e785d6c0b1d2b596fbbdb20a4d4c5b89c89be7fa78f6f9557574b2b97a7bc9bd657fd45e1cb58166a29d3ad5a98e SHA512 25469f44f82e9a25562c5fa1cb5a9c86fe5531aff961a4f6cdebc7b09fbdfe60266a7dad7bd2251dd1d59881f922cca0f84c394e115ecbc09ab1efad9444d5ac
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild b/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
index ddff4eedcb5e..724a4f4b2275 100644
--- a/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~ppc-macos"
 IUSE="examples gssapi libressl +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.0.1.ebuild b/dev-libs/libgit2/libgit2-1.0.1.ebuild
new file mode 100644
index 000000000000..ddff4eedcb5e
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index e8b1375232b4..54f4e1472228 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -2,5 +2,5 @@ AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab7
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.18-r3.ebuild 1617 BLAKE2B ad00ce71749fd4ec1ad682e2fd1cbbd3a50176f3aad4ef0bcf5ad5a7216eb08ee2b1d7a4dce5b18718646f3c1d7c85155cf9906d2ac12687dfa68fd8476addc0 SHA512 39de68e975bdb74a57af75080c4227d7cb98286ef2fccfab7d0e190214b71efeece0cff18eb40b7cf741bebef3474e96a5d460cda339445f2ba6eca1bca61875
+EBUILD libmemcached-1.0.18-r3.ebuild 1618 BLAKE2B d0550651249eefcae28b5c4a602f6378ddd747c9e9a85443cc80889e46e2b805ca63b4551024cad593534422864455f7c4d65d8a602fa404fce2043b0a523b1d SHA512 3a7065264c69dd1cfcf9e7174c06e84445a0bf8368e0330fd47c75093af627e16400a8cf2fcdbcefc661412ed47796f866f8573d77e23739abc3cd2e4d575477
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index eb5b2c75f563..0943ad249abf 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils multilib
 RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
 
 DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
+HOMEPAGE="https://libmemcached.org/libMemcached.html"
 SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 8316564a94c3..38e5e1e0a046 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -7,10 +7,12 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 DIST libressl-3.1.1.tar.gz 3765769 BLAKE2B 8524a4d83e05b0f2992df8e3797cbf43220a8619431f4737887db2fa35419a925907691ac1aec5b3cc1660179d4ac5e44714540ae591c5aa4957db1f26068a7e SHA512 353a5c95bb0c160b698b95b91d6857ddb63a75b0685a233ed2515f46ad8369d40857aa1ff8407aa9bc78a5c3c29c25376e7a55a3c96fce40840633411944fb1d
 DIST libressl-3.1.2.tar.gz 3765944 BLAKE2B b0181a1936af3aad3908668cae14aa87e8dca594ebb1effa354eb57529c21aca2052ce6bc85958dd83645c9026c84410939018d16c8e70a60f336145d45790e6 SHA512 b024c5661777daa73feff7085ce7be76a2e766d2f3cb5ca35c208c471e5651a365252758ca36782e20cdfb2bc8171919a08ad592420878a5c95fbe646f5288c8
+DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
 EBUILD libressl-2.6.5.ebuild 1478 BLAKE2B 44e283811242efc54261ad1ab9a6241e3dba2217093b3226084fd143fa9ae30a127833a774cd725608690c720b97fed3e2c00ae92ac109295b485e6e63fd8564 SHA512 ea00fe358ce009a9e916897ffaf949c3c709455f5f69c5517845f2413a5e7559f2e1c717a941ef43e1776f334123cddcc730537428c63e38c7edf7e4fe3a972d
 EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa2528e26a7972e070667edb22ae0415a4fc42d639fda455cc25746653a3954b03688075355082d77a080dadc48513 SHA512 bbf59b1952b1892b56df2199613baea4f4bcf85c7b1bbdd25a6a4ed7ba6f645172b20ebfdad8c1cc63c7669f68fd423581677dede98bb9838a14393b6f9c701b
 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.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.2.0.ebuild b/dev-libs/libressl/libressl-3.2.0.ebuild
new file mode 100644
index 000000000000..ab31f2041689
--- /dev/null
+++ b/dev-libs/libressl/libressl-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
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/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"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index eebf44a103d6..cc3c76114718 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,4 +1,5 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
+EBUILD libspnav-0.2.3-r1.ebuild 1204 BLAKE2B a3ce05a95c08dcf5149a7bf982df847f014f9d935bc820991aca39b557d6ef981b0cfe2b8922ad699fe57fc5bad96a729044b6332a9317ab126597902501d441 SHA512 2530d9732f9f1f7a13458a10bcf28c5afa62fbc86e275480db0294ec527d9b710b4bacd068f2b92dd38f1c6623049db745434650ba44653df9955e1964bdcea4
 EBUILD libspnav-0.2.3.ebuild 894 BLAKE2B 7069d849b8e936289ee7c66805c8122038e331503311a607b20dacb34db97529a11b38c7530af70def1073baad08e6505b97fc88823bce3b09367600613709c7 SHA512 e535b119a9a967f262d78e22ba82d438a78a97e8cc56f1cf37c73b6056b48c3bd4a0264bc5c38a3258950358b85ba1e60e8a692b8516c7fc1d0a3eeb52857cae
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..49946c481da4
--- /dev/null
+++ b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib toolchain-funcs
+
+MY_PN='spacenav'
+DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="static-libs X"
+
+CDEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="app-misc/spacenavd[X?]
+	${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply_user
+}
+
+src_configure() {
+	local args=(
+		--disable-opt
+		--disable-debug
+		$(use_enable X x11)
+	)
+	econf "${args[@]}"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	local args=(
+		DESTDIR="${D}"
+		libdir="$(get_libdir)"
+	)
+	emake "${args[@]}" install
+
+	# The custom configure script does not support --disable-static
+	# and conditionally patching $(lib_a) out of Makefile.in does not
+	# seem like a very maintainable option, hence we delete the .a file
+	# after "make install", instead.
+	use static-libs || find "${D}" -type f -name \*.a -delete
+}
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 2917edc0d46e..5ce648c6dae7 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-1.1.0.ebuild 1512 BLAKE2B 70c4c8648cf0f6013b5a0d5d2159bf0e39e95e6372c4f77bc97bff49e2fa6a0390cd526b7b310e5db6d9f6bcdc296276ab7a710ee4a53c693afbd44df6f880fc SHA512 a1ee6deaa7c0d8e067a5255434b7f9ced22d7dd3abfa72eb6ba0ca1ff7888160c5ab6d4ada19c9453ec5ebb494b96c63c52c05c9d5652e85a494b7551f32151c
+EBUILD libtommath-1.1.0.ebuild 1513 BLAKE2B bf645873cb4e262f6244f1958369efe699b86480ea651942abe527018f846f1dc6748da60c42b1055ec41f86b25029efe5531a723aff7f24a5f77b6f257c6dc6 SHA512 8cee336bd78ba5392f3e595e76492144b59f241205aabffbb8bd790710333999e3a8fd191759aa99d5dc5f0f22f1f7f5d342a5b585d04b67667201799425f226
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index 00e1ca8c897e..70d7c93256b9 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools toolchain-funcs
 
 DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="http://www.libtom.net/"
+HOMEPAGE="https://www.libtom.net/"
 SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
 
 LICENSE="WTFPL-2"
diff --git a/dev-libs/libudfread/Manifest b/dev-libs/libudfread/Manifest
index a984a1735707..c3d6dd9a44ec 100644
--- a/dev-libs/libudfread/Manifest
+++ b/dev-libs/libudfread/Manifest
@@ -1,4 +1,4 @@
 DIST libudfread-1.0.0.tar.gz 31420 BLAKE2B bf68560d283fb88af54ee1a939166e68df94d60f1e8d3fc0d0e6e1d0faa0b9ef35825ff8a2dbbcdbfb0412dbe6e1639a34b844c10cf7424a659f974a53b59b2c SHA512 8b48d809197f3e9e4271755acffe74849aa3a01c6b23eab3acad6c2bb0c9045491f43657953300e5f84b27e99715ea2a2c4926f1120b3f5129042703c2804606
-EBUILD libudfread-1.0.0.ebuild 641 BLAKE2B d68779274f32c99167587b4a414fab5924f1804bc3254b1f9a00e044a48d1240ab52f4e73a6d5a48499b690715d80c16f3d0af3132efc3007b54e9ae971b6481 SHA512 27e9589443896b2d3043282d57fae5c9bec7780bd10d0928d142af91f72065c9d5c28cd6b8586690c1d06dd7408727a871e355ee1a013a74dbb37cf10a07b6c7
-EBUILD libudfread-9999.ebuild 636 BLAKE2B fc79a0ed1affb19bbcd5c4ad340e30ec13eb1a3789aab06af2160818ea3237164a74e5a2ea18c7ec8fc58e1083b49008852514ee2bd0a1f9ed4b41224c9d8339 SHA512 be7fae4a6bbcf90a72daf49b3a6839d3c3dd1523e533445911de732ad24313211338da259e0943035a2df5ae66d637680a009c9c7c4bf85addb3978c559c376b
+EBUILD libudfread-1.0.0-r1.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837
+EBUILD libudfread-9999.ebuild 799 BLAKE2B 60f4e16c234c661cf757969496ec1bb26977eba3dd008578f6677d1a6f7f5b27f36099f74f2b59fcc1fa253d8b63063a4207b28480fd535e5cc67ab3198b7eca SHA512 aa1a1522ab37223814ea09563ecc22947f049752701372cfa9b93a134a5f195144cd89ee0c56acb1ac88f8f2281956833bebea8bc1854135b7b26f3cfb597837
 MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
diff --git a/dev-libs/libudfread/libudfread-1.0.0.ebuild b/dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
similarity index 79%
rename from dev-libs/libudfread/libudfread-1.0.0.ebuild
rename to dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
index 4902d9e26805..6dd66e41c5cd 100644
--- a/dev-libs/libudfread/libudfread-1.0.0.ebuild
+++ b/dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://code.videolan.org/videolan/libudfread/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
+IUSE="static-libs"
 
 src_prepare() {
 	default
@@ -28,3 +28,10 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libudfread/libudfread-9999.ebuild b/dev-libs/libudfread/libudfread-9999.ebuild
index b3304062e6a9..6dd66e41c5cd 100644
--- a/dev-libs/libudfread/libudfread-9999.ebuild
+++ b/dev-libs/libudfread/libudfread-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Library for reading UDF from raw devices and image files"
@@ -18,7 +18,7 @@ HOMEPAGE="https://code.videolan.org/videolan/libudfread/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
+IUSE="static-libs"
 
 src_prepare() {
 	default
@@ -28,3 +28,10 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 24962167fd37..461983f86418 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,3 +1,5 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
+DIST libyaml-0.2.5.tar.gz 85055 BLAKE2B 71d1a002b8969db96af9e942bf67944acfdf2e740744b1abceacfd1c3bc54d8936d7048760aa81f1cf22518241e9f45ecf95c76d6ac41eefbdf04eb40e16a618 SHA512 a0f01e3fc616b65b18a4aa17692ee8ea1a84dc6387d1cf02ac7ef7ab7f46b9744c2aac0a047ff69d6c2da1d2a2d7b355c877da0db57e34d95cd4f37213ab6e7e
 EBUILD libyaml-0.2.2.ebuild 1029 BLAKE2B f14f2e827272f14ffeb16f7094851a68a0fe794452c759d042a8e0b3b0c6701ac17bc85b0a0a16f9637b57dce2d5748b6d044a8c764880145c749bfb259ed03e SHA512 7d483f399e28f03da3f4681b0a54d42f16a939be4c024caf77dc372e502a0cd3143b0f81f8ba5fcf7e10dd605ebef631f0e9163c1f9de1fe5644e824c492cd56
+EBUILD libyaml-0.2.5.ebuild 1038 BLAKE2B 5b18f8df90cacaa34689a80860981e8b02155aad8f5362838c99cc89fd271c8c5d5dbe4c97b513d36c06fc7e14dd7c4f9fca0a6c8bdcf1273ec4ce15443fcf24 SHA512 aa75bc8199194dfb9aa6ed2044c249650bd9fe2e8ebdcd0ee46b9f573289976e006dd5ccd7953337418e2ef563f1ea6fee736ba90b0266ad723864042bbcfc04
 MISC metadata.xml 396 BLAKE2B f55ccf30afa81617e23963e2bb96cce1db4e06982320b1b53213736a79c15431da54a7ba2312c4b60226b881553d6470c0fa08a1ea88152789254208f302b64f SHA512 a373090c8dc67e0bafec51ee673e9a3c15821c7079061335ab95ec2c87cf629f57fc172fb8e17989a709b4770ab42537f87c22ac065cd24fcc1ca88a2c80bf76
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
new file mode 100644
index 000000000000..91cf1a6a176e
--- /dev/null
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool
+
+DESCRIPTION="YAML 1.1 parser and emitter written in C"
+HOMEPAGE="https://github.com/yaml/libyaml"
+SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	# conditionally remove tests
+	if ! use test; then
+		sed -i -e 's: tests::g' Makefile* || die
+	fi
+
+	elibtoolize  # for FreeMiNT
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 8fd8a63b51f2..38a26db30e14 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 1517 BLAKE2B cc6f48b3358b284d1d65a480ddd75003cb1be0ef48c1c9c6de088d77f60286cf6923e3bf91c472a96be02a2c415e010695266bf4eb45d6250d57cd2e1b48c7b2 SHA512 8d66d390ab020b5779db11e1f31cacea7a7c9da9b280b7b9e7a6f447144bf39c212c15f9a7e78573f20ed27708d9829d09d20f19d73e5870566cfe62ada2784a
+EBUILD log4cxx-0.10.0-r1.ebuild 1515 BLAKE2B a4d352438d0c23cb0f43127728b49c710ee73761f65fc0bf6579fc40e73dcf652d74541cf54b1f5bedf75be64e739b6ce4f9293cb39267a41f4ac136e5c18f82 SHA512 f714219e476744e899641d591e6a0773f0a80a1a6150fed7c6c14b1b80b97d05d8d97e537769fba71168e9b41284b54040cdded352e08893ba4def1e6e72e8b3
 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 a305c20e25e5..f48d07a9ee88 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.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
@@ -6,7 +6,7 @@ EAPI=6
 MY_P=apache-${P}
 
 DESCRIPTION="Library of C++ classes for logging to files, syslog and other destinations"
-HOMEPAGE="http://logging.apache.org/log4cxx/"
+HOMEPAGE="https://logging.apache.org/log4cxx/"
 SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 3ab46a49caec..3329c22c8cc8 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -2,8 +2,10 @@ DIST pegtl-1.3.1.tar.gz 67183 BLAKE2B 1aef425e5777c44e30068d7b0f5bac813ef9af8e61
 DIST pegtl-2.0.0.tar.gz 154718 BLAKE2B 775eccb11a44eca30ebf72cfa4dcb27e0f46c741efc8071d77232104cb7f6841da847b37b8dab19efcc07aac175558eca949d4c2d4d5d66fcf89793ae3cf7db2 SHA512 30d48bd4a02b7d089c09a6265cd52442d5d9812cf24ae992ea3f264ef8ea27b605771675558f5510e96aec425577beebeb150361001bbce58bd06217ee587f58
 DIST pegtl-2.0_pre1.tar.gz 146966 BLAKE2B e6894dce0df7d41126619523aae866b1335afaac70d0cce2852674e691c93d7f16b550fbc7bf626602a46e044a33f41e9d2e2aa24361088ba99111f23c8bf617 SHA512 180bd8b44ccfe406c818af6b3f5f22eb4cfc7bea6043af5141c6c5ed9b2770624326e67d6dfc47a22aaee3697e5cf1d2744d0a3d3d01a4ce47457189f2b19839
 DIST pegtl-2.1.4.tar.gz 157890 BLAKE2B 5d999b2d5471ff115a0ba38b0b874a031f875ae24b54c25d985bd8bdfd815f6b35b825a0ac5a183e3f87f90445fb98a4b8d7dbc4e8a79e2f6332daf57b6f89d9 SHA512 b4c227e795ab29221bce91b520c5965d48fec85ba53bb070b93e966dc20792189682850b106585ad8bd3e4f34ce8bdb72b576f5f329b2f160f9034b412c93768
+DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 EBUILD pegtl-1.3.1-r1.ebuild 675 BLAKE2B 69583b72d391da0b2337331adc1e8d2fa587f988e80cea0dcb86161e179a36ef1d4012c48c710707d2689e3b09969999832c1c4c21ad00adae9aa195f67125fa SHA512 d7d2540f41091a9b46a2aec232219f0ec9520442a16ea6f67ca949793790f70639826006d648e1cd0a362b2da736bba63c7c91da38c11c482f1343d5a6054968
 EBUILD pegtl-2.0.0.ebuild 495 BLAKE2B 9df421fa5a48a7f9d640ede7d566ad490c6c03e3988d3a30789e164359ddc0923efca350a26f1020abdaa48635c0ceccbddc088ad5210cb6bca488d55bbb45c3 SHA512 cce717fe838bec3afaa91beb13b252d1e8b92a261d6c4f77f9c351b1be510fafa873755f2e16c2121cc827357a8f653dff779243fc7ce1fc897c577d5c5de5d1
 EBUILD pegtl-2.0_pre1.ebuild 534 BLAKE2B 2f4e04e2d46212f8b8bbdd454db77ec7c25e74c1be3c4b268ebc78b9cfd15789c54dbf1755ebb60f0347a1c90af8df7198026e1c9aaa12e8c611b2bb21f06821 SHA512 96a77caa6b1379a6d636df5160974c7e687889175cf6a595150a33721c314440f7219e864a93a8750a1e2d69ffa348720d359147c64b982febe10e7047b0879e
 EBUILD pegtl-2.1.4.ebuild 495 BLAKE2B 9df421fa5a48a7f9d640ede7d566ad490c6c03e3988d3a30789e164359ddc0923efca350a26f1020abdaa48635c0ceccbddc088ad5210cb6bca488d55bbb45c3 SHA512 cce717fe838bec3afaa91beb13b252d1e8b92a261d6c4f77f9c351b1be510fafa873755f2e16c2121cc827357a8f653dff779243fc7ce1fc897c577d5c5de5d1
-MISC metadata.xml 444 BLAKE2B 1d99f8967121f36fd6f54ed70c698d28419eac7dc88cc58183bb7ad3248481c404f4b55419eb42492ae81389c694df86e39ec4fcecf3284680f32411ab8f69db SHA512 5a412986a17cc8d2cc16eba8e20c269d60b75d53db2bf04fb87b8a0c2dfffe6d30108c9390af7565d5442bc513b302f26dfe970c9c3149fe999cad90ef4c5410
+EBUILD pegtl-2.8.3.ebuild 495 BLAKE2B 95602860882de0698218b3e5bb49a30bd9d4b9e9fe5d35956d355b0889e94084106dd09fefaf23419f25f112ea2afd93bc15a77758ef7e8400b376ae32562c96 SHA512 dbb57411673d554be4e2b415aac6510cdc878ed8e10e28a13e96414a996b0df69519c002d38556de539058d724047f6f58dcc0c515944958142db74d78bc484e
+MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/metadata.xml b/dev-libs/pegtl/metadata.xml
index eabc3f6db52b..353f1f5078b7 100644
--- a/dev-libs/pegtl/metadata.xml
+++ b/dev-libs/pegtl/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>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/dev-libs/pegtl/pegtl-2.8.3.ebuild b/dev-libs/pegtl/pegtl-2.8.3.ebuild
new file mode 100644
index 000000000000..51b7872a603d
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-2.8.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/PEGTL-${PV}"
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 3e564c0fe853..228efdfd82e2 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,7 +1,6 @@
 AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf9682fbc10dd4513d6c5d7da8b2e1ea9189bc4b28560650b69a857e65c3db00b7af1de30970e23d1bcd988bbba0255 SHA512 096af62d64e61fa6d6394484c58e55dcbe4aa22551c5b3448209e6dcd707688dc3033d219eba954c0e78635d2480b7c7de044aeb18a80d0ac0d701b4d4cc4fa8
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
-AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
 EBUILD pigpio-76.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/files/pigpiod.systemd b/dev-libs/pigpio/files/pigpiod.systemd
deleted file mode 100644
index b1d28a66f826..000000000000
--- a/dev-libs/pigpio/files/pigpiod.systemd
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Pigpio daemon
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/pigpiod
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index 4b12558352ad..a3410a09e36e 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -1,7 +1,4 @@
-DIST qcustomplot-sharedlib-2.0.0.tar.gz 1949 BLAKE2B 6d2d1b7da0dbdb83485ce1a1b69b5d4270fa73af25240decd1764d0872065a7457252aac3b81ccc9d5cbcfe24f8ed67ff843f092b344065b8b0f26aa2c6bef14 SHA512 f4ba719287067c2bb999a6e4ffb3694b32b1d72867c396fee1834ba2916f2931eda07bbe25c4d2ea6f6af18bd78917660dc6eabd98f72c9da987ae288ed4e611
 DIST qcustomplot-sharedlib-2.0.1.tar.gz 1963 BLAKE2B 294877d929564767009a8a4409111408eda1eb4e0cc64b48e644d25f30ef18151c2df1f0c5caa4e95c5b75dd492e795f97077e47bb927ff9637a2da9a2ec757e SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d
-DIST qcustomplot-source-2.0.0.tar.gz 317398 BLAKE2B c2d587e06026789a164f16ffdd00d324172654b6953ace637815b022dc14cc96362cf4022512ec3feea3725a651c1af0f50f09d0ca1c5e86ebcfbe3f50aa3ff2 SHA512 66c648877ed0a14cf527ac8526788065f494119cc61993d20268a0046c8e6c5a1c73a61f50a73e6a39ec55435bc5f74c613ee21254293ddab34ba7c2484c4f5a
 DIST qcustomplot-source-2.0.1.tar.gz 319140 BLAKE2B 868133f5126eea0aa8f80d34272f854de93b60575e3eed1b52211bec5ed96886503ba5c7f15c6f0ff15f3f67e35db6e5333adfc7465cee40768a65ed1b7275da SHA512 b44abbd8fd95970a829bbb6e7becc0765e24bd8f05958c8c1223303b68fb4c0a64f503cf0a2fe4fc53957e6e61a6618500475cff3e81ed0ab387a9eada2c83a3
-EBUILD qcustomplot-2.0.0.ebuild 973 BLAKE2B 27dedecc5719cf8c77e74d5a9f027ef2d5d81f9b49ebe6abb1ccf57d93f7822e3a2b9066d67a8fc6fd613e1a441dd9ac827137d98f9c3660a63f56345eed723c SHA512 407df97d2c3b82b7acbebf705cef7b0d9d8ecc7f445652ddcd94d358d165873bce011823632786501aefa040fe8ed6834e3f8d78a0bee8ff615a93f4114138d9
-EBUILD qcustomplot-2.0.1.ebuild 974 BLAKE2B e4161a42359bd84dcc7b887f8d7f64a5d0f9f7f70d3ca57e7c979e3b38b2897564db7611ea80491e6e7144e7aadfc6626b6bdbeb63c7d3d121756c6af6dc5092 SHA512 eb06c69a58da18c97457401dd2f668cbbd23baddce52c7c57b1e299f48f085501d6e567f0276dbe461b86398fd6823ebf7e0fe47a112d59b4e5f578837797749
+EBUILD qcustomplot-2.0.1.ebuild 973 BLAKE2B a7c95d85fe989832cf797009196ef637471698e008305670eaedeaaf2cc713d71ab435fbf08be76106e2a8a051cd2fb64ceab81710c573e62e9419cd474a621d SHA512 33b7da0425de85d6c49fa5e078976bde46ed0cdfa4d4156bc087b4f39dae28ee72b0647484774514d7bda3ebadfd046ee63caeb7850de8f051cdac5b63e1a40b
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
deleted file mode 100644
index 3d626c3e1188..000000000000
--- a/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt C++ widget for plotting and data visualization"
-HOMEPAGE="https://www.qcustomplot.com/"
-SRC_URI="
-	https://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
-	https://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-source
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:../../::g' \
-		-e '/CONFIG/s:shared.*:shared:g' \
-		"${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dolib.so lib${PN}*
-	doheader ${PN}.h
-	dodoc changelog.txt
-}
diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
index aef8de80ade5..dcd0e02408fe 100644
--- a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 51c956c52df4..f22d10710899 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -4,5 +4,5 @@ DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed
 DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
 EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932
 EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14
-EBUILD re2-0.2020.05.01.ebuild 1411 BLAKE2B 6d6a4909f6ce27caf58923aaa7902bfa523aba47a7a47fbcac89cbe63442cc8767f422ea9dbdd31cc9a0d117a714e2bf55cad249327758c9467caf7e2ccef197 SHA512 f7cab9684154ddf8430864de4236524f3ed117d91759df3e141fe12277241f91655012dfc394e001f209213918b57b26472f88aa30ac29b778f042e5529c924a
+EBUILD re2-0.2020.05.01.ebuild 1410 BLAKE2B 9cb057d1eec6d24a7d7bed94694b6c51c14d5f820007939f8f20a23fc5bf570a550ef63246816e609c4c77fb09fc397ab1160cdd32875533d4c32dd6d02b7274 SHA512 97fc324216c8ec459fb8630449d3033c2ac5ad5dc94107721aa9075d031478fb57941cd4a4d67aab6a0ad9e34a836a4811da79aac64514de518767493a0ac640
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild
index b4218b133025..773def25f17c 100644
--- a/dev-libs/re2/re2-0.2020.05.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.05.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="7"
 SLOT="0/${SONAME}"
-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="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index a76b2d6f87f6..7980b145a1e1 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,4 +1,6 @@
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-EBUILD spdlog-1.5.0.ebuild 939 BLAKE2B 62f0ac8f25a8bd2bf3023c4fe9c463e0e13a1919a88ad8b7ad9824e92083213ed1f4b52802d72abb90a989fc52b89554687dbb593597ad86e57c27c3139ef153 SHA512 ae411712d31da70eb2456cf5e3bfeffcef676ca270e22636499c4bba8b2bc9299b376c4c691c6323577f3b3ea544e8ca0f349cd1c4fdd969052191114c836889
-EBUILD spdlog-9999.ebuild 913 BLAKE2B 1f0b536a67333e5d86ad9434c66323f5571e150b232c862a0768b32aa1da731ca58931cb1d548e86c3c52ac11feda5cbe4bec3a93b6850a4acf0b7a2694dad9d SHA512 3c8870bc75eec1f8e9378cea9ea6f8fbef529d50a5a84e1c52a82312b5d92af97f51d6fce683aba4fffd54620a387483e50e473b2368cad69431427ac556334b
+DIST spdlog-1.6.0.tar.gz 285249 BLAKE2B 2acbc6b3cb9da93842e3a87367af219264347062cf007cf08bbcf512a6595adb9e68b3780b18e273a8a752db591c1b9a55236ee889c6b1b98fab2d7efd815c0d SHA512 5711fd5b1c7a1a2097eecfa386f75315c7a580f08a59e220ded57e7412df037a57ddf5cce60aa2904c1c579a801b727eaf0c6f951728ef731ce469b231da5851
+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-9999.ebuild 914 BLAKE2B a5362a8845f61d921f2d136dd6a55beb3931539e07b4fd8950730c32975e160f5162e27862bae3d6ffddd3ae77c210128dd33cdfa22a509125f628e0869775ea SHA512 15f272868287039f55fbc82018bd5dd49074534d0efc50aeb022abb1442c9a9fdb90496528d2f2d8905cef3df311b1fc428451f605aac572a78e908ccb0f797a
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.5.0.ebuild b/dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
similarity index 97%
rename from dev-libs/spdlog/spdlog-1.5.0.ebuild
rename to dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
index a74feac620cf..0ced6aabc53f 100644
--- a/dev-libs/spdlog/spdlog-1.5.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
@@ -39,7 +39,7 @@ src_configure() {
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=no
+		-DSPDLOG_BUILD_SHARED=yes
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 
diff --git a/dev-libs/spdlog/spdlog-1.6.0.ebuild b/dev-libs/spdlog/spdlog-1.6.0.ebuild
new file mode 100644
index 000000000000..6da33cbbf3c6
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/libfmt-5.3.0:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 060e167a8afd..24491a214dcb 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -39,7 +39,7 @@ src_configure() {
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=no
+		-DSPDLOG_BUILD_SHARED=yes
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index ca19d523d6d6..8e6f6f369a28 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,9 @@
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
+DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
-DIST vala-0.46.9.tar.xz 3413264 BLAKE2B 6bc14f9316b3d5a2c81b0fbaed48ca85ffec37c616746b1bf432c883838097938e13931d06efc1e4abd027441e31fe73b2e76ba9b578ea33948f4dbe38a18bf2 SHA512 64ce902a15de9a477d50e3b0a0f64007c1acea7ad620ad224ed49cecbb029ebf8c9fcd79df6f0c64f46c0fd25cbf34f94be145a937460329dc9c38087073f240
-DIST vala-0.48.5.tar.xz 3445096 BLAKE2B a41fd6b5b06526eb1a743c2e8681b4e3891b19a24213669f28407f9e8e29c3aa1a077458558491e0af05aed5659a7a6d4a0a18d711465d9c936e719245b944b1 SHA512 129097880c0dbe40cb84dc60a0af454b247759131ce29e9b5cbf74ca9dae35917e1ba973eff1d5ee025e54afe5a0881eb37d11ab433346e5e4c9a7625952b2d3
+DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 EBUILD vala-common-0.44.11.ebuild 646 BLAKE2B d84fa9f606e5cba0763ee49202cf16f5cd01520dad44abdc02e089fd9890f3179c4a02fc33782d028b5d3a405135491309f5823004905d394eaa04b4b656dfb0 SHA512 443f71539e0605f9cfceb6b5c76792590dd36e4e51465f1848954f676e69dda63943c8e5ed9be4a7519f1ba9500f05d43ea275209677a9b2eb53434e9c304725
-EBUILD vala-common-0.46.7.ebuild 647 BLAKE2B e06b39bbc1519cd903a087d652be47f2e1e1c055a5d2648743de72ac445bcf8dd5344929df327fca8827824ff414e8a6efb242228a62c777abe4969638eaf4ca SHA512 aaa291f7744f256a8f43a3409cfc8926a44b5e6c8837c986d469dd544368c3668d5560e7e6f6b6aa8c1a345cd1490336578a2daef808c643bd90eb249b0782d2
-EBUILD vala-common-0.46.9.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.5.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.46.7.ebuild 646 BLAKE2B 312b31c68e392a8e5d99b168c749152cbd83b21ab31cba76f50ca1fce1346c857fe866eaf7d42322dd98fa4ba8b669a288564429ab33d83d62c3394f4ac962fd SHA512 df672e19fa5c78f39c2fbed6ad42a09fe5b9dd24a38829d88ff67b55e17f9bf1b8bccc338e450c1493353fd05dc6703aab3ec400e95b5cc25f18eaf489d5b7a0
+EBUILD vala-common-0.48.6.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.46.9.ebuild b/dev-libs/vala-common/vala-common-0.46.10.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.46.9.ebuild
rename to dev-libs/vala-common/vala-common-0.46.10.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.46.7.ebuild b/dev-libs/vala-common/vala-common-0.46.7.ebuild
index 77c76548acf9..992c6da189d0 100644
--- a/dev-libs/vala-common/vala-common-0.46.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.46.7.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/vala-common/vala-common-0.48.5.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.48.5.ebuild
rename to dev-libs/vala-common/vala-common-0.48.6.ebuild
diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest
index 8f22147dbb04..0f51e06fc4fe 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -29,7 +29,7 @@ DIST vc-1.3.3-reference-sincos-dp.dat 3600000 BLAKE2B 2f3a4d208d8b8cccc7c6f84a9f
 DIST vc-1.3.3-reference-sincos-sp.dat 1800000 BLAKE2B c0993d43ec2c88edcbab2ade63f1a960ed64ccfd78fb5355aa0a6940b3860669dfafee75190a67e77f53d6005f9cf7e9e82abdd270e171606ebbb143b7326907 SHA512 0760409ae093c7d897e6ac0b689fea5c1cf9cf58e3c39e2880fcacf56398e9c3ceb897f725ef54730b95847f11ca73a05fd96e108aa153ba6d22c21f7104c009
 DIST vc-1.3.3.tar.gz 781361 BLAKE2B 8e98cd983e7ef132e8d2a74f53d95e1ae7ba52b90da8878512ee4df33751ddce40dca6e70c8384048a86e495c6387d425db6cc5df0b7d15afd14f0fee94eb2b7 SHA512 dbc6f5bc723c52d3116301798b600b08bde510cff9e6777312d1970c61ad1b71fd83335ce65e9993a9f582a20b9de73984d553039452908ef229c4bde3b334f2
 DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
-EBUILD vc-1.3.0.ebuild 976 BLAKE2B 4faa72244db950a63a2efea204ddf28f5b61f1552ae805f6b3c814854b5f19a8f95cdad0390a85c3c2723d35936e941651eb8566a09ae1ef2b741c132013c647 SHA512 091c36a69065c550968a4bfaa4e4ba4f782fd2ad0cda23eaa8072213271deb10137d3ec40cce6605cea2d1cb6a3bdaf628f2b40939eddce4d8b60359ac178d00
-EBUILD vc-1.3.3.ebuild 978 BLAKE2B 8f4825108848d1fabaedb1a295771ec19cae07bcd68118a88c6b3d97dddd1d2ca5951259ec2d60c9c7b2fbfd81a0a71f366a467fb8644142850d8ba796e6b9c9 SHA512 a9bdc27b7ec75a6becad5546c4035c8c58832d658719173f11babc74563038a0e321674d59ea7ab3569a9f690a7b7781588728065d44785d94c52750b326e599
-EBUILD vc-1.4.1.ebuild 445 BLAKE2B 5e039bb3768b6d2f1fbf98e51de939048c84b9a5e6e4c224285dd8652069581258ba32ba37e8c956bb6d19936a7aa0426e6d4958abada2a8f0e7486cf8664614 SHA512 9469167cf55941ea4687938c8ca24cc766f081a90208b97016c8db474a1cf961716c1f38a041e47277115ae047790f206ed05279d97eeac8bb5a4d817ef4ef24
+EBUILD vc-1.3.0.ebuild 973 BLAKE2B ea21273ca341d58589ff2fdd6abf0a752e5fad72b33524945ea33e584953086f3f78d4aca5c1b8a23ca4fea32d5282027436d857e0c3e780792a1447c4a62b3c SHA512 1bab972a3c41cf09c9579727700b69c38dbd55b7f9d67939b392fd08690bd30a56fc336ee71a076d99591142d80e6dc7fe21a1996d5377bd347e54e8a94b351d
+EBUILD vc-1.3.3.ebuild 975 BLAKE2B 8b296d5c8226b3af53bbe6a2c25ec1e29b76830879308b0256f7cf5dd6e787b50ffc5b473779fa873a3d6cf31b7b97b6a9dcdc41b1ad2d9a88a098ca23a09129 SHA512 67dc977de551026c78fa2c9b8f4700f3be33fdaa0a5f72dd3ef95336dd3ee957e0aab9d5f3f3c5c18f06265b18d08cba770c0c83ea7c3a02ed7f2e7694de1529
+EBUILD vc-1.4.1.ebuild 442 BLAKE2B e9897dd8b37261c262285149b7a255a808e13c556188bd848a4594a89a132c8b56b14559672e5d51c1a03adf1a08ff0f118fbe340fa546e2106141dcc3f4d9aa SHA512 d35de731feaf41e969a9feb74c497b4006cfdbdad28763984508e40d953e21abdf9fd73d1f6780ed04daacd2377ddcbf301e8e1e06bc4e07bcba04e3a0d69969
 MISC metadata.xml 292 BLAKE2B 895bf66b71e43684a437957b5ed370cc274a808714f96567956512c561d1fdf18402f5d9340d9c11bf585044e15c081648964df9640c120f74acee9790f532dd SHA512 e30b480889c2fb22f22af6d46f64399012da00bf045a4c9bb2c46b3f3255c4bc50f5970a0b3902ea90024d2ad371d1577ce4dc5a86923eb55634bfd26dafa22a
diff --git a/dev-libs/vc/vc-1.3.0.ebuild b/dev-libs/vc/vc-1.3.0.ebuild
index 9de3bcbd57dd..bd941c1dd2dd 100644
--- a/dev-libs/vc/vc-1.3.0.ebuild
+++ b/dev-libs/vc/vc-1.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
@@ -15,7 +15,7 @@ done
 
 SRC_URI+="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-3"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
diff --git a/dev-libs/vc/vc-1.3.3.ebuild b/dev-libs/vc/vc-1.3.3.ebuild
index 4118e6c931bb..0f715e3f512e 100644
--- a/dev-libs/vc/vc-1.3.3.ebuild
+++ b/dev-libs/vc/vc-1.3.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
@@ -15,7 +15,7 @@ done
 
 SRC_URI+="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-3"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
diff --git a/dev-libs/vc/vc-1.4.1.ebuild b/dev-libs/vc/vc-1.4.1.ebuild
index 007dec1ebb50..b2a09d101a1f 100644
--- a/dev-libs/vc/vc-1.4.1.ebuild
+++ b/dev-libs/vc/vc-1.4.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
@@ -9,7 +9,7 @@ DESCRIPTION="SIMD Vector Class Library for C++"
 HOMEPAGE="https://github.com/VcDevel/Vc"
 SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-3"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index 6ea18758b864..09fdc9d5911d 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,7 +1,7 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
 DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee225058f6c1bfb6baa8983bae49d84ab55a59743f7edf8580be52acc1bfb622c590f43450891af4d17cbd2ac48972 SHA512 03aa89c35fffafa8fc81b249ff4fa0dd3f7985466106815a9f36b00314ce82e3e2586e7abec5b56dd94d9b785768ac9562b03973817390b716cad8cd53e9ebc1
 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
-EBUILD xxhash-0.6.5.ebuild 848 BLAKE2B 6cfe1aebfa2b2f8916cc7e67b6825778a89738085997b8c68192b02c91a626a5335d44c9a9f52e0657a4ea44b565dfb6530be22f2074a4c9e62696445e6795fb SHA512 429f6506a171461eadfb9384e17d85401f39a2509e40ac32e1425883fefd33c7d2a81003057a7ea09c197482503f4d9a7d78f8e8192c83032437e290fa95dbd8
-EBUILD xxhash-0.7.1.ebuild 911 BLAKE2B 85828c2222881127191be553385587e3c9a0aafeabdf5acdd8680afccab1826cb09036fac2f394ec148e7327f9795e228369f0eb7804b28268bbead75a799dd4 SHA512 249e2057876105d54a37e3cc14b69f7d549d2b1e5a4b14e720212c494d2bbed2f87b9f0dcc373a8bfb07d9596e3ef735bef4a9bbd45d7f53563dbed6fc08d7a6
-EBUILD xxhash-0.7.3.ebuild 911 BLAKE2B 85828c2222881127191be553385587e3c9a0aafeabdf5acdd8680afccab1826cb09036fac2f394ec148e7327f9795e228369f0eb7804b28268bbead75a799dd4 SHA512 249e2057876105d54a37e3cc14b69f7d549d2b1e5a4b14e720212c494d2bbed2f87b9f0dcc373a8bfb07d9596e3ef735bef4a9bbd45d7f53563dbed6fc08d7a6
+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
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 61a2042258c1..6151842342bc 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
-HOMEPAGE="https://www.xxhash.com"
+HOMEPAGE="http://www.xxhash.net"
 SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2+"
diff --git a/dev-libs/xxhash/xxhash-0.7.1.ebuild b/dev-libs/xxhash/xxhash-0.7.1.ebuild
index f99938d54c17..8973996851d3 100644
--- a/dev-libs/xxhash/xxhash-0.7.1.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
-HOMEPAGE="https://www.xxhash.com"
+HOMEPAGE="http://www.xxhash.net"
 SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2+"
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index f99938d54c17..8973996851d3 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
-HOMEPAGE="https://www.xxhash.com"
+HOMEPAGE="http://www.xxhash.net"
 SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2+"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 000704e455a2..377a9c2eaff7 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest
index 196928a22bcc..db5b679e0e34 100644
--- a/dev-ml/astring/Manifest
+++ b/dev-ml/astring/Manifest
@@ -1,3 +1,3 @@
 DIST astring-0.8.3.tbz 38710 BLAKE2B 253fe07b51996eb7b5f84e18d171b0f65cbb5abba9b241a02aa679765f3190edc636c1ba989910fde374a20c7615db1887eb73d8607f3bb8311e20ab6e67f670 SHA512 c7230e47b7ef14e6040fb18284a3d5aa8da1428b721cf91a7f17104cfb853be24b9c2aaa0b118bf3e050158aa8748311435417c6cf9014d260fb4379e4ead3e1
-EBUILD astring-0.8.3.ebuild 544 BLAKE2B 92711e64cdd1c9357949d5269ef6f5abafdcbf586a8ad12a6080a304eb75c6cd02aa26796956021165a5c576708213da6914fed03befcab301f2d6a277d0380d SHA512 f82e7914443e9f80fdea42b4d3a2603b2fcb66343648798c79d52965e6107b8a15135248b02feb1fcef967193ce922d86ae2b6b81c20338fffca896b87de52bf
+EBUILD astring-0.8.3.ebuild 543 BLAKE2B aae2012f0f7c9aa12a694e7e7eca117bc61e876e3df5496555182b4168dd36e1507f07361ebc841151402cfa89f398cb799cd64acdede315c0bbcb88ec338991 SHA512 19df26876c674ac092c9ab753ed60a9a15e046729a236e9063899062a0a98fe29fac67a950a28ce7bd7548f25bcdabbfdca91c966671be01773aa57ed2b3e5e4
 MISC metadata.xml 248 BLAKE2B bfc1137bcf2f30d9f53dd227e756d67b626c7f236a7dff277238957f8bec98d7a84f2a291d41cd275ccf27b0a7ac438f19ea3cf75192a889071f77792d754692 SHA512 b526a37ad31e63dd080a1cace2c1e3edc0e4eeffb59a13457ff448372d5842003e188d1dfd99162eff78cb51fa2d6f0830d136cdc8200911cc010c66afe621ed
diff --git a/dev-ml/astring/astring-0.8.3.ebuild b/dev-ml/astring/astring-0.8.3.ebuild
index cd17e8514586..503571633f03 100644
--- a/dev-ml/astring/astring-0.8.3.ebuild
+++ b/dev-ml/astring/astring-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit opam
 
 DESCRIPTION="Alternative String module for OCaml"
-HOMEPAGE="http://erratique.ch/software/astring https://github.com/dbuenzli/astring"
-SRC_URI="http://erratique.ch/software/astring/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/astring https://github.com/dbuenzli/astring"
+SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index e0c2623ac715..a537bed94891 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,3 +1,3 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
-EBUILD bos-0.1.6.ebuild 882 BLAKE2B 38f445b3389104cf1ccd91f4ea69c4f731f4e04a9a3f9ff33bf045c418a9ae0b7a70b6ed7cc447ae79cdbabcc83e7fde0fa731c520c921a02c410fd096eac26e SHA512 a4f01348f33243cfcce8801708f61e8f5cacb6f5a13b5873d56ead7d9cacf0d8ca173ef499818a003bc846f2a402ea499fc1b5fe31e01c637cd9b6a22e732480
+EBUILD bos-0.1.6.ebuild 884 BLAKE2B ad8ffcb05f9018ec63f7aa3c846dc7543b0e3d22a4c50d12ff759ff56fc1ef6ab924841d9e84ed5be3dc41e7ef894ead764f596aa2e289107a565db089527b62 SHA512 e08735f565427dbce020a9d0718a107030d5b331fc2ecd10e1ae2909fb13c70d4866f62b705b2807e09eae3d8753ed7ff34c395353baea4dcf0aef250a90e5f3
 MISC metadata.xml 244 BLAKE2B 9e12f673e76e7b3faa5cd1c5e0c93aefcadb32fe5392de8774fc54061813b6c92b984d318323f6ab16e65c85f97dc4431566b51c6328dee64366180c0e3f29d4 SHA512 0a7454e598ba26bfcabdf5b4284903e17ce33dafd9d8b84603eba1425e37f3deaf8cffdf5656875b6c596b3fb75a2265f25556b5be2042dac71b82e956039b4b
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index 7026a7718c5e..e5a1293769c4 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.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=6
 
 DESCRIPTION="Basic OS interaction for OCaml"
-HOMEPAGE="http://erratique.ch/software/bos https://github.com/dbuenzli/bos"
-SRC_URI="http://erratique.ch/software/bos/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/bos https://github.com/dbuenzli/bos"
+SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index bf36de1ffdfd..a26d187a7936 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,7 +1,7 @@
 DIST cmdliner-1.0.0.tbz 46542 BLAKE2B 7a667e218c298dbe4f5ba8ff034f15596e9b89b1a267fbdf7f6f811e42d61b103b08a2c8b9bd45e83bb249ae5ed078eb646630cd8a174af267354b25dc13ca54 SHA512 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c
 DIST cmdliner-1.0.1.tbz 46614 BLAKE2B 609220b8dbb0aa5ade9f504f420ed7c6ee1ad9aa1f9cd02b1edba60b86791e59a12faca0ebe6ed9cbb5fbeefdfe25b524509bf311f1611022b6c62ae38df01c1 SHA512 b792dab3a7f53f69d74d07acbb013e48235614e29a477b7e9e7d7b58013d47ff842fbaeef50acda305434185325855ef83d839d5acb0ccf460276f0ca880ee7b
 DIST cmdliner-1.0.2.tbz 47350 BLAKE2B 226481c73e66fb45a69b563bef9f95c6a04b782072643fd8e66e4da4907f899a72e2b4e1217b46c3a1f417bf9e4be193c3528da09954808043e4abf47be4d5c2 SHA512 d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
-EBUILD cmdliner-1.0.0.ebuild 1046 BLAKE2B ba98da375fa0ddd3b33cfa28ce1dc38d3a03565ecddb6d5895ab5ff692edea1a614fedbc0fccb9a67dd89356c46a166dc9ff5452a185790a1f9aecc14dab1d30 SHA512 db175cf05c97619662165eaa9e76cea054adf2c9967ab5bac043b786dc2932c6304702cd4504df90f2ed2f3b357ada60ffd360d0f551401f0f7ea8b6a2c0c075
-EBUILD cmdliner-1.0.1.ebuild 1046 BLAKE2B ba98da375fa0ddd3b33cfa28ce1dc38d3a03565ecddb6d5895ab5ff692edea1a614fedbc0fccb9a67dd89356c46a166dc9ff5452a185790a1f9aecc14dab1d30 SHA512 db175cf05c97619662165eaa9e76cea054adf2c9967ab5bac043b786dc2932c6304702cd4504df90f2ed2f3b357ada60ffd360d0f551401f0f7ea8b6a2c0c075
-EBUILD cmdliner-1.0.2.ebuild 1046 BLAKE2B ba98da375fa0ddd3b33cfa28ce1dc38d3a03565ecddb6d5895ab5ff692edea1a614fedbc0fccb9a67dd89356c46a166dc9ff5452a185790a1f9aecc14dab1d30 SHA512 db175cf05c97619662165eaa9e76cea054adf2c9967ab5bac043b786dc2932c6304702cd4504df90f2ed2f3b357ada60ffd360d0f551401f0f7ea8b6a2c0c075
+EBUILD cmdliner-1.0.0.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
+EBUILD cmdliner-1.0.1.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
+EBUILD cmdliner-1.0.2.ebuild 1048 BLAKE2B b3d4508df4714a80f61e3ecabaccce5c7d471a5113afd12e889339b5e4cdd2a3333b893fd8711d11f50c8f576452b826777da005f23e571f7a4172f9eb8ff7c8 SHA512 6561f3513d6d7bcabdd947ad898ebf5aab474ac31617c4a98a3027bda677eac8269fe7aa974249745930cce1a1dc3e669818a3a493cf26cccb91c3e80394efd3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
index 556ff298967c..33b960914162 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit findlib
 
 DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="http://erratique.ch/software/cmdliner"
-SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/cmdliner"
+SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild b/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
index 556ff298967c..33b960914162 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
+++ b/dev-ml/cmdliner/cmdliner-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=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit findlib
 
 DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="http://erratique.ch/software/cmdliner"
-SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/cmdliner"
+SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
index 556ff298967c..33b960914162 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit findlib
 
 DESCRIPTION="Declarative definition of command line interfaces for OCaml"
-HOMEPAGE="http://erratique.ch/software/cmdliner"
-SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/cmdliner"
+SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest
index ff26220519a4..9df585723926 100644
--- a/dev-ml/fmt/Manifest
+++ b/dev-ml/fmt/Manifest
@@ -1,3 +1,3 @@
 DIST fmt-0.8.4.tbz 14079 BLAKE2B c4b6fc35a27734e8d878ef1abfa900b659d4acafc20757b0413aec1404378aed6e57c6a1a0e5c7dbda7e60fdd911d38fa1fecc76d670299ddf6ed14930fbcc28 SHA512 d17407f15447172ad444fa288b9a16962b0e4829cb73f62004b0f8dad2bec60a7911ad11fd05545d61d7fdb88099e53694548c73368399ba183c53383e1dfd31
-EBUILD fmt-0.8.4.ebuild 763 BLAKE2B f19caa35906fb70cac609af22f5d75634a678b80f6cb38bf7377b2294fb65ee8a744997f06113fced0c2252539924278826222aa916cdf79e3aba69764a40abc SHA512 050125eaab5f201320cb42d591ec7a83e3801edec0d2e05fcb57b5c9f050c40680d44e555d9448dbf08c4926ec148934942b70386def80af9767dd777bf1801b
+EBUILD fmt-0.8.4.ebuild 765 BLAKE2B 91222c11a160ef9aae734095245568acf08c7fbcac767b40287b93c914d2643704cd51c0249001c86121db80fd9e7d4579419234f15a475dc614ecd8182944d9 SHA512 5f6635d3f81a913c52b1f708eb86ec2092dce9824d0c95c2b6994963d567430bda8996a87b022bcc05785f963344e4f89e7e443dbd6152e9acbd69c1f8122903
 MISC metadata.xml 244 BLAKE2B 7bad0b6c3b4ef28ccc919f1cbd297434f930aee5575e6135e78409a31f2e8e6406201c3dd81992cf89f808a0f3af6aac46165395ec7cda6b4af91274696a9eb7 SHA512 319d9b69276e64a092b5c35b50894347712a625e6af1773fe2b2e988428f7cfae19fcbeadea0152c3c02969f4dd5b5e2e369a6a2f29579d037d819b314461705
diff --git a/dev-ml/fmt/fmt-0.8.4.ebuild b/dev-ml/fmt/fmt-0.8.4.ebuild
index e8a084aad4f5..e08ee4dfd3c4 100644
--- a/dev-ml/fmt/fmt-0.8.4.ebuild
+++ b/dev-ml/fmt/fmt-0.8.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="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit findlib opam
 
 DESCRIPTION="Combinators to devise OCaml Format pretty-printing functions"
-HOMEPAGE="http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt"
-SRC_URI="http://erratique.ch/software/fmt/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt"
+SRC_URI="https://erratique.ch/software/fmt/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
index eebcaaf729db..06d7dc79af81 100644
--- a/dev-ml/fpath/Manifest
+++ b/dev-ml/fpath/Manifest
@@ -1,3 +1,3 @@
 DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
-EBUILD fpath-0.7.2.ebuild 539 BLAKE2B ac1601dc860e5429d767a550afa853df294d2a6e759653042e30fdd2592b9bdf42ea68251c327508c60beb6588db9f47f59deb8ef1c99f37c939b064a95fccc1 SHA512 aec8e379cc1471788bf7e9e3a61a4717c241d1cb3ed6a83997045c24364de0a5ccc8e3961c4206029c7b565d81c7f97daaa171a8c205097b33f3416e9dfe07c4
+EBUILD fpath-0.7.2.ebuild 538 BLAKE2B 187d01cf632076e93a4c00183df1552b3e801fd780d16d7ab6df1303e6e4efe0f8f9d9abd0074e6d975d764b6ad01a3df9f0de3bc90fae715baa603aa215a73c SHA512 3cde133ad7a6dfe8b416a23277ec80cd20b1d1cfc16b511d59e11f8194d2bd5281a74e29fd6cd49cb4057582967ea10c45f21b520489dd2b7040c1dc706d242e
 MISC metadata.xml 246 BLAKE2B 17b71e35ed0f5d8753cb7f826e2367bb9a9a929f025bf19a294d5e31b813eb935debf8a72f1ff238cef3dcbbaef31acadad3e6ceea7a8e4caf11d865bae696ab SHA512 0edbfb4b267356db598a79479d2019c397d73fb7a976b2f4fc1a0d53f35ee17e4f5976deecef10607c2e50ce7a15677c0d2f61fdacf89be7efdc151922722c6c
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index 8a7ca78a2291..e3f27b5fd02b 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit opam
 
 DESCRIPTION="File system paths for OCaml"
-HOMEPAGE="http://erratique.ch/software/fpath https://github.com/dbuenzli/fpath"
-SRC_URI="http://erratique.ch/software/fpath/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/fpath https://github.com/dbuenzli/fpath"
+SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/jsonm/Manifest b/dev-ml/jsonm/Manifest
index f18819f716da..d926370734c4 100644
--- a/dev-ml/jsonm/Manifest
+++ b/dev-ml/jsonm/Manifest
@@ -1,3 +1,3 @@
 DIST jsonm-1.0.1.tbz 21608 BLAKE2B 4d3ce2a3430176df0876aeb6276a48bf23e51ebee2a1a46e5b25a370b26ba27c9ba09ff01365396123de4851d8f263c4c86c3176b13118910fd458ad3b23d80b SHA512 e86e225073b429f71063af14ad39b87498609db6a122b39e1a739c5b77fcde487bf6b17235b2f9742b7d22aca0f6d475fdba1b0bab2a6329cf7e681fe43d31a6
-EBUILD jsonm-1.0.1.ebuild 956 BLAKE2B 69f855de32d5f768286d00c9aaa4fcfc61d72d50dc18b9f859f31a8852ad7882677f69a12a3c95d3d33ec9f73cd8e4076b47c6f6759981be65c6d074521615a1 SHA512 94979d56db050b8ab3a834de1915f3fe95c679193643b738dc66fa47772a65983d12874fdbe25d39b7ff1e76bbcccd49783852f9ad9fdc975b9203ccad7c3ae7
+EBUILD jsonm-1.0.1.ebuild 955 BLAKE2B 1ab33614f555f822167222430d5944b6a799d69891c9c6414677287d8688c54d4ad19f2529a1538750f52e3c2ce9bd84c11b90e9b4ad3020dd26d717353ff382 SHA512 3e3b2bed9d07f3dbcadbedde6427b325ecf11a406bd0743232105da9fc48019c7bcc98aa3c905c4f4f661b041432f717c6b0c1e4be2bb9e46f377115422de5f2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/jsonm/jsonm-1.0.1.ebuild b/dev-ml/jsonm/jsonm-1.0.1.ebuild
index 301132978611..a51e2c2f0762 100644
--- a/dev-ml/jsonm/jsonm-1.0.1.ebuild
+++ b/dev-ml/jsonm/jsonm-1.0.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 findlib
 
 DESCRIPTION="Non-blocking streaming JSON codec for OCaml"
-HOMEPAGE="http://erratique.ch/software/jsonm"
-SRC_URI="http://erratique.ch/software/jsonm/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/jsonm"
+SRC_URI="https://erratique.ch/software/jsonm/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 4ebeef081812..63ce7ea47a07 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,3 +1,3 @@
 DIST logs-0.6.2.tbz 18558 BLAKE2B 824bad0b568c3cc08343cb99eab3848d6e8f7deca548599caf12a05f5980e5ecf78978480e5fd95e938ca4b06fb94cee8b4ecf241f4a0238c3d3851c4be8c9f5 SHA512 a669e373652bac6789626ad1d58e414c6d156c646bf0706c9d55b04151850113d45a5c28077707514d1a27d46fcc0f90b39b8652ce7a3980f79675e9874db8b4
-EBUILD logs-0.6.2.ebuild 1230 BLAKE2B c2e34ca721ee4f81ac7a24b340fd8c59393175d21aee42209670f09a3d814212e9b3fa0fb701ecd203e804bdeec8d756959996878f1ed5f3019bc8881fbbc932 SHA512 4c565fa245a2260786ebf9a33d827be5b060cb899fae8049f75a4befd4f564ae44376f6c4301b846c76ba7d394fa0ce5bf6f42302ddf531badbf344956df7cc7
+EBUILD logs-0.6.2.ebuild 1232 BLAKE2B be60a04f476ef95983edfce08d4e5223737941e82eb35557bdf3fe86e58e23a082fa60c18152d36cd432c9720a01ad8582d3d7dc42adb493fd99a54072dbd759 SHA512 73bacdc7c8903125d2fad82a462839bff6033a3fe76ea29bf7445d097f0a643d211057d13c6b3754dae70ce81a8d8e7e0d0cb3f4c3d9259a722617d04ad6d74e
 MISC metadata.xml 521 BLAKE2B 273dfb28d5f12a940bfb0bf249b25455aa0acb853fe2bb25009da00e89f94ea63c13dc20730bf1e097b527af734bfb0c6fc3b8bb74721a11f27818393d75ab10 SHA512 d6cb520a578c944506355ded9351d5a81093ad0093b22de41efaada519994addf4040f7b683c0e401bc87fa88b595a5b537ed1de5bde0cd28466f0c205fd97c8
diff --git a/dev-ml/logs/logs-0.6.2.ebuild b/dev-ml/logs/logs-0.6.2.ebuild
index 6cead1cfd73a..707b897d9688 100644
--- a/dev-ml/logs/logs-0.6.2.ebuild
+++ b/dev-ml/logs/logs-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit findlib
 
 DESCRIPTION="Logging infrastructure for OCaml"
-HOMEPAGE="http://erratique.ch/software/logs https://github.com/dbuenzli/logs"
-SRC_URI="http://erratique.ch/software/logs/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/logs https://github.com/dbuenzli/logs"
+SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index da91616ee257..1b0f138f5351 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,3 +1,3 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
-EBUILD mtime-1.1.0.ebuild 775 BLAKE2B 99f5205b56e6c699a946e96a56adc8ee2910078ea5ea55e75d63d0495084dad3367c871997b198296acd02cc795942ce8c1a6fb74d9514f5abef3ec2d7c73eaa SHA512 71e991ae95cd72ccda45ae6e94258fb643ba466afc66de649484096f71cd6990de952b6ad12d4757d95e238698da58eddf8ed0a2a4a60d4ac767955b95056e15
+EBUILD mtime-1.1.0.ebuild 777 BLAKE2B fdde28ff1838a867fbfa5dbb44cc9fa9e4b559ffb32e002f4a149a465f3d2935812327ead2abcfe55997d4111e76d41c440a4f70e40271ef309911493295e3b9 SHA512 004168ccd6cc9b856e9446d492945eb7f8beabc4fb7a35c11b6c9ee8c2a739c8380561850110ebeafaa8b003dd7dff9a019c6c5080c61ebc0060732834f72309
 MISC metadata.xml 246 BLAKE2B c2c9633820f6ffe3c80e4aaf7d6570c358b374a7c6159e20959054da823d1ca3b2b7dd7db7b8ef2dab61d0213b8b68660753b245f5f8ee508fa273af53607e05 SHA512 6cdf4e5e61eb47cac4991d85e541cc65892162527eab415e12b43d5da7c0850ffc97c244426c450cd733d562adbb385a4472925f744662f075a8c941dfdfee8d
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
index a8aa8f99358c..f1369810f22e 100644
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils opam
 
 DESCRIPTION="OCaml module to access monotonic wall-clock time"
-HOMEPAGE="http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
-SRC_URI="http://erratique.ch/software/mtime/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
+SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index 86be2fa55b45..efbaa261bb3b 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,4 +1,4 @@
 AUX ocamlweb-1.37-strip.patch 718 BLAKE2B b393c62c0ae1e276f0feebb0b9fb6d339af5bf57c9fb73864df2a42d51cabe695474b90bd567686af80ecbddad2981508ce8fb98d65a239bde8e7ecc89934edc SHA512 b4741ac5c7c4b3bbb1c1dae7449bb4b57cbf2b8c269b8ae668e5d14bc98ae973a83502c6bb560e06b9bd0536b4ec914713e159e286b41806071bcd160145b712
 DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
-EBUILD ocamlweb-1.39.ebuild 667 BLAKE2B 1bafed7af2028571571bda217298645c3e66e5d7157ea827d1dffb454dc0d3eccabfe2c8c68c31aee878edf2f3a4c194c00eb7f8cab3ddd7d5618ed6e52cfdaa SHA512 0fa22d20e3d100b5d691ca926013409e726f06424246527a731aa5cb728a0e07c0ce968901ce2a823ff29d46bb4d4b5b4c99d6e5549949419d5c43f8df1f6ec0
+EBUILD ocamlweb-1.39.ebuild 669 BLAKE2B 6e16d76acdc5611f0f56dcfa5ec30b753b058200e7dc675da98c3e4b0241368fc5a831a210006f7546a1443331fafc1242455f40885c2903a514e44935b03285 SHA512 643b172a6b98ea4e790f4ea556d49733eaf4d08969046b8d8e88c429972c23f5e91bee3adef320119291510fcf68acdc05d89e07ee79e956748b44418b8b1266
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
index b9f6962912af..f4baea3a4598 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.39.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 latex-package
 
 DESCRIPTION="O'Caml literate programming tool"
-HOMEPAGE="http://www.lri.fr/~filliatr/ocamlweb/"
-SRC_URI="http://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
+HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
+SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 68a45f7d54cc..76655276667b 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,5 +1,5 @@
 DIST parmap-1.0_rc7-ocaml-4.03.tar.gz 98262 BLAKE2B 829553c5a8a16776588b7fc74304e189945367ddc4988e529b08857fe307b8e05db58fb73819554e88afa2405d8818d2c95fc4dc96e0a47ff782bfd78b912e90 SHA512 c8b7678fede76d35b299ef0548ef3819f9ec056cde4d5498e11f2400b96149b17ce58c35d197d10dba5fd4a702b94fe78090e1f330791b0f470891f0bbf7a544
 DIST parmap-1.0_rc8.tar.gz 98699 BLAKE2B 755208d0b380c200c5fb2a38334bcd422ea3e3c86bd8a52db37e256dd45c22c05e8577a5f13ae14d4ad553d16c212ae2a1b299e0870ac71a52e0bf11ddf2ecc4 SHA512 96bbe49f06dc3611577e87d9e6f5ca32e10271d6a14a0970bd4548fcaf268f833b3143258e14328237a60578e2355687e4bff031a021903f3e2280ef1713cc65
-EBUILD parmap-1.0_rc7-r1.ebuild 1097 BLAKE2B 3609529cf6a3544b64adc90816714b3fc4cd38475a639cd2e5521b245f52bd90db8c7098d993ae74d5aa0de4c49ad8dc902ed7f1c619c790f640ebeadb720ef3 SHA512 a547e35c3a9e0eb97925d273d86a30602eae8a6b2f5c60f76c297d0f7267aef450571c283be22f63b66745bfa16275f11224d1c304c4e791a3fa1226b3ca0e7f
-EBUILD parmap-1.0_rc8.ebuild 1084 BLAKE2B bb2565a84f98a80d95aea51c0caa30b7a4f8829ccf54a34c4a2e5a6334a1669a5ad0d977af22dddb4435719a1e7cd909f943a43e8a1ac5831ae40688f0101308 SHA512 8c51f63d2e1d666b108446d1489068f5926959532622483b3d9aaa504b2f31d2858d62ee1b869d66323c17518ded5b9f1c3b755f31a8bdca64248294658d411e
+EBUILD parmap-1.0_rc7-r1.ebuild 1095 BLAKE2B 060fa7b4eb1c3af5b9984125ce945599b5c27cb5463ae884a723a63ac2b39469456c6487b2d117f26306523150100289f9a0b0e226a6ab0be45b26f5fb298a8f SHA512 f8403ed8186993626d39e91d8f0c97b9827654fd6ca3b6c66ca670c95e7bfc604b10f0a029cad4f52013ef8f7d88d3a09100997224c4f9ffe3fd6dfca341c20f
+EBUILD parmap-1.0_rc8.ebuild 1082 BLAKE2B d30c880b75c2f84b73724f351d964bdfcbdec71d8a824f2bd6012e03be0160a0c20221a6810bed877b8d407caf6cb6868c6b0aae58faf67b57dd27da081a0675 SHA512 c0d27175d13c6f6f21b1d46453d1a463b9ac5ab03230aab5a0fe591bb519e6280e73bd8b0af721774a1dfaacd224a65ab3a8e5c7f9bc5942f5feba93a9059711
 MISC metadata.xml 252 BLAKE2B f4ca811a46e4c4d8138a2d55e501d8a11cb06e5a967ace489cfb7f5dc1e995773397b42aac371c88e846f223c2fed3a1fa202250f858610b4939bcb093b7333e SHA512 aa58d5e26ea4359f6e81c4e6292ca3fc91f74326810eee7905179665efc89fe23c72860b2821d8be6f97595f84abbc30dfaa423f5f530c30640105d22b16cb19
diff --git a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild b/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
index 9bc4423786eb..442a609b95ea 100644
--- a/dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
+++ b/dev-ml/parmap/parmap-1.0_rc7-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,7 +7,7 @@ inherit multilib
 
 MY_PV="${PV/_/-}-fix-for4.03+3"
 DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
-HOMEPAGE="http://www.dicosmo.org/code/parmap/"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
 SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}-ocaml-4.03.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
diff --git a/dev-ml/parmap/parmap-1.0_rc8.ebuild b/dev-ml/parmap/parmap-1.0_rc8.ebuild
index c224550f0d6a..594ea9593feb 100644
--- a/dev-ml/parmap/parmap-1.0_rc8.ebuild
+++ b/dev-ml/parmap/parmap-1.0_rc8.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,7 +7,7 @@ inherit multilib
 
 MY_PV="${PV/_/-}"
 DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
-HOMEPAGE="http://www.dicosmo.org/code/parmap/"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
 SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest
index a7f913283655..0fa79cd103da 100644
--- a/dev-ml/react/Manifest
+++ b/dev-ml/react/Manifest
@@ -1,3 +1,3 @@
 DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf34726c078c654fba4a9b7dd0bb6a6579fad04a6cd217b29f4efc15de9b7d9b208c593b481610534d9c8 SHA512 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1
-EBUILD react-1.2.1.ebuild 646 BLAKE2B 16e8316b66c7e8ad2fe1217b7e532a9bd4556298d8841f4e0693cdc01d844de3a90263b6e7f1d4079417fe18ffde94ca37f7c2e287c0358d9abea97383fdfaf3 SHA512 68017e67f3129d1a9a28a4a2f29163123d345fb9d1fedebfc2048c99fd3857cfac6185f0d5a3db25197aa7ca9155164a776f4a9ae1c0ee2c88875376eb8e4002
+EBUILD react-1.2.1.ebuild 648 BLAKE2B b880919996694717b60c3fd703dc0b94bde370170cfae93e65078d9756d088d0f4f2e4c4d68e09643140a9685cd274f4300b0f87fce8c8b2f33c959fd2e6748f SHA512 a6bca798f789abf1d6ee227c1e9e30c1287f598cbd0d7b18d1c64af00225c5ff85f2df048d65754efc86061d81b8363fdd6f06fa8d56c17eee88e27729c7542d
 MISC metadata.xml 803 BLAKE2B 81ae42db1eee6a5ea870a1fb7412bbf7727170dd1e9a42a6bca98ebfccabaeead3423140ebfc7bd04dde30add471de9e950c81a845a1582749302e1218ec1110 SHA512 b23c33ca0645d4c199a6b1d77d857d869d9f63e09ab93238819db8750ff7818d5bca38c6df6baf9c74b8199eca015c0a1bae93c747140d978052ccdc51e5904b
diff --git a/dev-ml/react/react-1.2.1.ebuild b/dev-ml/react/react-1.2.1.ebuild
index 2e75b7cd1f04..6ef6b7a499ee 100644
--- a/dev-ml/react/react-1.2.1.ebuild
+++ b/dev-ml/react/react-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit opam
 
 DESCRIPTION="OCaml module for functional reactive programming"
-HOMEPAGE="http://erratique.ch/software/react https://github.com/dbuenzli/react"
-SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/react https://github.com/dbuenzli/react"
+SRC_URI="https://erratique.ch/software/react/releases/${P}.tbz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index 5e19d144ee63..448508ee9f67 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,3 +1,3 @@
 DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
-EBUILD rresult-0.5.0.ebuild 514 BLAKE2B 661f63b5ba38f9095564e358dfb223e4671f6e8a12983ee021ff332fdf66d1574938f3d5ab0d8a1a920af3d476fc64c65432f90378f7d68b2648707e55a86caf SHA512 d1c5eb9887f41d0f326845050be3042a236770ef68ef67bd6aded9ec8e9e5002794744d7690ee861081e8f4bb6dc96780e3d697850641fe8b0d56070311bd080
+EBUILD rresult-0.5.0.ebuild 513 BLAKE2B 21dd4542989954b35f58c4966d3051a4cef1e947c621b6f9a5f7a5f3269c94c8392b6c4370c3366a3e4c684b5a1fbb02be763594a6c862a940294eada3bce66b SHA512 9335b5a1437f592ddae9d75e30817b351a58884f034d35530f5e57df61a434a233cc362ee44a8cbf1a702b9dab61a60e0c6b1696ea577eb5c905e32a123ddb2d
 MISC metadata.xml 248 BLAKE2B 697636aca44c2ca561954f73b42c842e97b7e42ad63bd4e47bf2980b4adebb7a39da518c65759ef114c0853c20da975b165935e2c8c25fa97783cb251d6bee1b SHA512 7656fbee46b0d966970f89195615419d2aa5d8ba013f46c023b679161b766449b18cfd72e3d932945925054729cd121ea35d3351d469b7a2b2d25d4e85479da3
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index 85613f2d372e..dc85569f5066 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit opam
 
 DESCRIPTION="Result value combinators for OCaml"
-HOMEPAGE="http://erratique.ch/software/rresult https://github.com/dbuenzli/rresult"
-SRC_URI="http://erratique.ch/software/rresult/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult"
+SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
index 18fc412c80d1..2e4b0a9595ff 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -1,5 +1,5 @@
 DIST topkg-0.9.0.tar.gz 120352 BLAKE2B 1122fe8b60e3d104136810a2cec8460c24a26061eff55e80347d2ecf197afee949e8afaca94a6615da31a8c3acaf113b44b16dbf2430fda6724e440597775bb5 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb
 DIST topkg-0.9.1.tar.gz 120943 BLAKE2B 39ac0d1d247183cf9f007c65b09d413ad6a89982d84269e99585ed5f15df4d7683de61548dba6ca5a1299f96206bfd2dc1042486410caa202938dc15e936446b SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f
-EBUILD topkg-0.9.0.ebuild 918 BLAKE2B 7609f6477f8526ac94c4a1993904d2c6ffcd76c8f3af7c13b8c92565c5150819ebf193f8c21ccc49bbc68864743b4675d99115ab25639bec37e7669d65f8eaba SHA512 9f2f36e01b23b079866b641e5c5109fee45fb89f40bdbd05c6a4aeb18cc028972416a1ee3d054494b084700a0233968717a6e1abb81f2fd84223833521feb489
-EBUILD topkg-0.9.1.ebuild 918 BLAKE2B 7609f6477f8526ac94c4a1993904d2c6ffcd76c8f3af7c13b8c92565c5150819ebf193f8c21ccc49bbc68864743b4675d99115ab25639bec37e7669d65f8eaba SHA512 9f2f36e01b23b079866b641e5c5109fee45fb89f40bdbd05c6a4aeb18cc028972416a1ee3d054494b084700a0233968717a6e1abb81f2fd84223833521feb489
+EBUILD topkg-0.9.0.ebuild 916 BLAKE2B 1761376572d2877fefb6457a88c76267457729159192c2b874b46fe53741cdbe43f86799cbc4155be3242a8885556fd3e7f086c5e3ccd9c5e675d211f30b9289 SHA512 b6a9f03fce4061d0fe98fa0fb091a060b3a50a3114836c979062fd64784669256db510500cfa363dd66dbb5c043c994dc6b0dad958b0f977f27ba018061e28f4
+EBUILD topkg-0.9.1.ebuild 916 BLAKE2B 1761376572d2877fefb6457a88c76267457729159192c2b874b46fe53741cdbe43f86799cbc4155be3242a8885556fd3e7f086c5e3ccd9c5e675d211f30b9289 SHA512 b6a9f03fce4061d0fe98fa0fb091a060b3a50a3114836c979062fd64784669256db510500cfa363dd66dbb5c043c994dc6b0dad958b0f977f27ba018061e28f4
 MISC metadata.xml 246 BLAKE2B dff31f4829283c7ca96516cadee0549432d092fe3304b5a66cc8a7ef2b6814a95fa8de556f2cee1a47c0a2d1894b12609da0878be0c117c719e488c3bc76d155 SHA512 e8cbe0461345bd68528b74ea43823f6929e826c3b464d5a42007155a8cdeb2fbc3b9a7c6937c88b6da5e7ba5db813b1711093d27033282df8621a192ed207cda
diff --git a/dev-ml/topkg/topkg-0.9.0.ebuild b/dev-ml/topkg/topkg-0.9.0.ebuild
index 2cfed454c256..773af719a185 100644
--- a/dev-ml/topkg/topkg-0.9.0.ebuild
+++ b/dev-ml/topkg/topkg-0.9.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit findlib
 
 DESCRIPTION="The transitory OCaml software packager"
-HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
+HOMEPAGE="https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
 SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/dev-ml/topkg/topkg-0.9.1.ebuild b/dev-ml/topkg/topkg-0.9.1.ebuild
index 2cfed454c256..773af719a185 100644
--- a/dev-ml/topkg/topkg-0.9.1.ebuild
+++ b/dev-ml/topkg/topkg-0.9.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=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit findlib
 
 DESCRIPTION="The transitory OCaml software packager"
-HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
+HOMEPAGE="https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
 SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 2ae09ec36f75..0dbb5b5e6336 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1,3 +1,3 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
-EBUILD uutf-1.0.1.ebuild 1520 BLAKE2B ee0a7c16316a1573bcac301d7951458d1d89393b511b8955937d661a0f8d1d81b90dc02949f97c21d6a31e93e43bd2e9436d0e22f52297c36c799a662504f88b SHA512 df412988a884685d7ca1176076afa9748ad64c2f23923db701dcadf3fce0b0a62672ff490d7de99aba5f520d76f6e0b48acb4e908f25b7e2f23a7c1f7baf2b0d
+EBUILD uutf-1.0.1.ebuild 1522 BLAKE2B ff1fb374eb3011df8be1bcf33b7fdce2249650ca4a05511e85404eb341d723936d955b57aaa9bd7549453e8499e4cddd756879129c1ee2e252e23e3ea104fb3d SHA512 49f818c483da89dbb94da7588d56f5ace0bf38e63cd0eefb53a3690e6744d30d1c01b0844a9389bb3ec1a6932a0e2b73316f4493a04654dfd7288f2ced815596
 MISC metadata.xml 320 BLAKE2B 798ffb83cbc8cfc4dd7ca1502356a0b7b420388c63959e805ab72df801445d0cab3e8092e4e0b4a8abacb295deaf006be89378b76bdc273b6332161ce98a44f7 SHA512 57f81b4db435eb651643ccb46d6a7530d0f7607a2d68ab2522ec170a55594e298727ba55a6406d8388dea12dfb27496b8054d99beb935bc632d5fd31d39803a3
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index 914e9dfb486c..ae4e6b83565a 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-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="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit findlib
 
 DESCRIPTION="Non-blocking streaming Unicode codec for OCaml"
-HOMEPAGE="http://erratique.ch/software/uutf"
-SRC_URI="http://erratique.ch/software/uutf/releases/${P}.tbz"
+HOMEPAGE="https://erratique.ch/software/uutf"
+SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
diff --git a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
index 905b0dfc2fc8..e2009325bd9e 100644
--- a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
+++ b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An eucJP-open mapping"
 
 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"
+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=""
 
 PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Encode-EUCJPASCII/Manifest b/dev-perl/Encode-EUCJPASCII/Manifest
index dd8ad966c994..37e8d320d133 100644
--- a/dev-perl/Encode-EUCJPASCII/Manifest
+++ b/dev-perl/Encode-EUCJPASCII/Manifest
@@ -1,3 +1,3 @@
 DIST Encode-EUCJPASCII-0.03.tar.gz 131775 BLAKE2B 9bb220eff388fd5d367a051f77b43f82e69e830272b292a85c639806760368378792a82f64bb1e1182c98738082329e9c07a7e6007d20d12487af6e51602abd6 SHA512 0d7a06e1f5eaa20451ef360ef78372cb0ecf0c9a525efed5db0b55b0fc98b47c87eff4f9be069bdd7be50156f8edfc0cb9a257e9efd5a33130cc745dca12b7d8
-EBUILD Encode-EUCJPASCII-0.30.0.ebuild 573 BLAKE2B 4103e566561dfcfb67c89495b4bb657ce796ae82633c4517bd80fe338b8c2f1733bf839b8a3da6fbd2250d99a93c9e5af734b77708b08e23940e73c7d3437a4a SHA512 5d6fde4c24650d29c64b63e9ad0057c3a63e42db481e05ac2266259ec7dc03dfb02cae477ec03a5364d0cafa63ed7712048271741c78acb8b874c7a8121d32e1
+EBUILD Encode-EUCJPASCII-0.30.0.ebuild 572 BLAKE2B f7a378af0d492bf5cbe327d1936b45d36d67f89aeff05cb1957e938113722b11e3e2e9c04aa0178968dec1361c1a0152de672620c75c89dd9ce1d5af346d3332 SHA512 6247d9a565b4a625e06cf954166cd83a38e1aba3dd87eb9d0bbf704965dc6a2d4a69fe8a972153fbf9eb16ac3ea2ada94be8576261b4d6c546cd50694d3112ea
 MISC metadata.xml 407 BLAKE2B 173ae21fafb2dc05bdb5f1b61de44b6669b4c5fed618b0bde8867ac05d25d96d2d0c1734ab2cf9a280688792c13240b06eb5c2acb2cf7d78ed37500b44a00b67 SHA512 3b72dff6f5dc0de72f73eb56b1816b51fc1de9d9fe4381ad27d94b07f9281038f08f43344c0dbf40a7e2e643b0dedb0f540c9188899ed57790f43f3f1271b287
diff --git a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
index 70b29289e3bb..65508e6ef148 100644
--- a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
+++ b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra sets of Chinese encodings"
 
 LICENSE="MIT"
 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"
+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=""
 
 DEPEND="virtual/perl-Encode"
diff --git a/dev-perl/Encode-HanExtra/Manifest b/dev-perl/Encode-HanExtra/Manifest
index a4083f10ce75..a81631333d7f 100644
--- a/dev-perl/Encode-HanExtra/Manifest
+++ b/dev-perl/Encode-HanExtra/Manifest
@@ -1,3 +1,3 @@
 DIST Encode-HanExtra-0.23.tar.gz 1566682 BLAKE2B f3005f007e424977dd41c62a3ae4d3c4a5c2fffbae5c0040fed4df59cf7af7af47c8903fa240bcfc0d2749aa7eaa01d4cf7bdcc37e7b670aebd6973d961428db SHA512 218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462
-EBUILD Encode-HanExtra-0.230.0-r2.ebuild 719 BLAKE2B 6a24e28796e346487d46e38b63347209ef1b4089d33ba206601a8df75f63067c053f9d144fd6415f4430dd5fdd6e439434e813eedeed1e39c5556c704002488b SHA512 845b8bab06013281f972727b71fe1dc38276fc6f48669462d6ac99a31b78d91f355f7983a9f66f615880cf81057fd460be5bfe6ffa81275b93af2c265db83db7
+EBUILD Encode-HanExtra-0.230.0-r2.ebuild 718 BLAKE2B 98e5d8f3708b27e31093170b75b79b3cc348ebe6b0af0c378d1b52703c0fd99d64b0264e00bd8ce88b8df971508fb60357a4caf473657679cb4b3df57aa4adbf SHA512 17f4d0b0a644cfc4cd441e2d1030f6edc43de93aa2129faf8f3cbab085fd99861b39e08ddc806cffb84df00b06bb5cf8b4f6b620c9b29d37bca703db70adb86c
 MISC metadata.xml 546 BLAKE2B 24a6b274fe0308bb0b86e5d67e5468ef110f6e5f87d684fcd6a85bfcddf930d6098e5846a6175e2fbf3d823f79ed15a14251a9aedfbbb9893198905acec3281c SHA512 21b7df344d8b930cd9b8d0c602c11c709b75ef85b55218e1809857b7b56dccdd54b0bfb487d896792deebf982a2af8806f5e1e4ad2e2f38be6bd45512524a203
diff --git a/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild b/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
index dde3ba3bacf2..87d578e3b62e 100644
--- a/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
+++ b/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Charset Informations for MIME"
 
 SLOT="0"
-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"
 IUSE="l10n_ja l10n_zh"
 PATCHES=(
 	"${FILESDIR}/1.012-makefilepl.patch"
diff --git a/dev-perl/MIME-Charset/Manifest b/dev-perl/MIME-Charset/Manifest
index 97410fbd35cb..09e66129e1f5 100644
--- a/dev-perl/MIME-Charset/Manifest
+++ b/dev-perl/MIME-Charset/Manifest
@@ -1,4 +1,4 @@
 AUX 1.012-makefilepl.patch 560 BLAKE2B d642b7464d4046b03a7f05c26b68b2262265c45f1caa11e64775941be36dbb83aa6b5a740598d4c2b73b598cf298e9e53a2ba7b6d193ceef7143606df4cbbd90 SHA512 3a3072d7acd500bbd0b3f903acf28f9dd4a8025ff4b58d4e439a46451d8b174c45a47c615b2b7da83f05aea01e8d23e6860a6422df53c192de02eabe787ec262
 DIST MIME-Charset-1.012.2.tar.gz 55609 BLAKE2B b73af8eb5ee2e4cec2266c73b7104837c6207d2744f927185d7867b027319b3a22f7658d2cac7bd1e092784a09bd41b63a62c6c8851d6ec89aed74f40b764d19 SHA512 2273bf0b86eb042e5aa8bcf958eefefde7dce6701eea5ae8c0fe9997e7d3e90d837a7791ade30f84536a15116175c796daee60da6625f409d214844dfedfde4d
-EBUILD MIME-Charset-1.12.2.ebuild 677 BLAKE2B c6e8197305a97c8bd49e751e7dfd412b8b039e4cf068c1c5656f108c1cbdaaf8e919d2fac66767cb450222c40a898b79e8064824a8102cbbc9500157aebae615 SHA512 dffd14864f2d1d8967ce028faef969fbdbd5a3914ee87ca637a9148352e06194b553f6934b5ca8bc9456eae50322163b7a5e1ef8779ad7cbab8ea056d96f4a29
+EBUILD MIME-Charset-1.12.2.ebuild 676 BLAKE2B b70f4ed6fd19e01d27544056a116ef63d5eec9f9c6b11278bcc869322010a1b2d1773a0b457b025cfc3028eea13018513f4772265bd47212ec89996de28bf022 SHA512 7d616339048e64d98aa6bb8d2a14a71166bd11ec9e9d40dc29f0712b1c66e972a0187a97f50a627c7a2a12dde80243a16b121d4dad61c241e61be265583778b2
 MISC metadata.xml 396 BLAKE2B 7c754d69dce13f9b2ca3b369ddde24962853e9cc9eac62bbf9a0bb7631c8bbad348dbbbeff927da3addaf86de02d04a72ec49e2f26ebf90a5a5900eaf962c8af SHA512 8f7972e5b01709f22a41be05610079ab1a7af9d2461d1f764feb3134ebc7394ac10241a756f6c4eafa3377036394fced0761e20329f4c2e4bc7266937520bb2f
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 38296b312bee..f1b6298b59ee 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Unicode-LineBreak/Manifest b/dev-perl/Unicode-LineBreak/Manifest
index 5e390f2ac7d4..dab13ae238dc 100644
--- a/dev-perl/Unicode-LineBreak/Manifest
+++ b/dev-perl/Unicode-LineBreak/Manifest
@@ -1,6 +1,6 @@
 AUX Unicode-LineBreak-2017.004-dotinc.patch 4512 BLAKE2B e86fb471d296e642aedb25472c8ed7921293bc8beb5d560132ce5dfd7abfd5db2f5c17948f3384e328f760f318cf2f9ec2d2274d18fc371ad2a4b3ca3e88cd8b SHA512 e31fc9648c637d3ece712d71f8e3e1a35b949f554aeceb52b33bbf09831acd9541b044cedcc3fbb098701f542e9df60d567d49c4d2c4ef4bebe8c6e1a646c289
 DIST Unicode-LineBreak-2017.004.tar.gz 311366 BLAKE2B 7f4ff93365c0542ae1a8f9d17e0e9e20224b95949c4965e69f241ff949f625793a19bde4a81830f9f0214abe3d18fa6c52f43f9a04860ec4d13db55169d120f7 SHA512 f372174a761f87663761dc8b0f9bf387ffe289ba267fc0fb58353ac06dfa9418d4b0ac6e4e0d7833d842feacae4f8e90e521cd677ab22db1bf32e75f10f2e727
 DIST Unicode-LineBreak-2019.001.tar.gz 312225 BLAKE2B e7bf274fcba3603acf93f520493d67b2ff113b4e098da39c8f5f5a180bcc75f403f04ede5248b8598f8b991498de9c19766c29e3ee25eea12e82aeac1241194b SHA512 2d285f928db2ed32aefa741629ce9f9bee82e69c247eaa2c9145fdb4e9bae4441bf822e108cbffc3955369539474c3299f0a8f69026a5f9686aa8458a1d87f27
-EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 514 BLAKE2B b4514245b06e0bfb1da5a42c50c88858b78439630f536a1e53a5d473bdc9f037134b284a5c0ead894096857c60262b535eda640fa736481da6638eaef0121d1e SHA512 d413489df9dfda6b78d615be29c1eb6a245abfba6399d8927137b7c6aa5864ebd594f53147d9503994c924fcfc1e9c482450254eacecd9009f4488149a7d933d
+EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 513 BLAKE2B 2291e26ba5cf3d2989e20941e2ea905310218d8cdf1759d3bd501f0c82a1f3b754f2c72e90d74d0abbe266df2c6286f7e6e30785236c9968ff11b3c8252c43fd SHA512 c847490977afe134fe4a19429dfe63716f08bffee94859885b80130905d55aa6e48ac35513e2fd8978271c2dff22e52dee0b9648e79b7d457662f2c53a15f1f7
 EBUILD Unicode-LineBreak-2019.1.0.ebuild 470 BLAKE2B e8d6453362eb2952f09bdf79f2bcd0444e84b45ce9280ea772e0672bda310c848524b024c74044479ab079aa1dbffb46f35ef2e8228490b908d5e1621d3fa4de SHA512 4805fbc3dc52cfcb2628c9aca03392d5f6552eb476dc1e71a312f75601a60222ef3e0c281e0541478fc3cc4348230d7017c03865a20ca32f4f0e027b1f0458d2
 MISC metadata.xml 531 BLAKE2B 222c5b7ac9a391d440e8d2d74525ffe988ebfaaafeacbeb725b944bb688977ac2a44f5934ccdcf719ccf516d3580308f0cddb6b1f4c7d2b3ae2e2ceadd5cb1db SHA512 831c5152759f2a9b2c549295aec94a7a9a00f261fedeca2744aa5161ba4cc9c68efd59da63b80e3b70ea83fe16491f7438580fc614bfcf57fd813654307710ed
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
index c3af01346d9a..8720374070ac 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
 
 SLOT="0"
-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"
 IUSE=""
 
 RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-perl/YAML-Tiny/Manifest b/dev-perl/YAML-Tiny/Manifest
index 4e6e96794b2f..8789a0ca1fe1 100644
--- a/dev-perl/YAML-Tiny/Manifest
+++ b/dev-perl/YAML-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST YAML-Tiny-1.69.tar.gz 71513 BLAKE2B e765df404b786a3cc22927ca47b1706ceb5e6d2518aaf313342987839c4ab5158b7d4bf4d553f91803b9ed5072efbd580ffffe2e92fd1c6ae0958b851530da0f SHA512 64c3428691f78d94bedf7f3b3276f7868d7280ca6d3c9a7a2e8137568d0da2fc94c766f9873f2796898386d6e7d3d1010c790fcc119f3d4d743becfa39d56a2c
 DIST YAML-Tiny-1.73.tar.gz 73708 BLAKE2B 42e9c5cffa2b9babb0dd1453af69866405fd7273c2b340ceb010d78d8fe28db61268b6bb5ad1840b1aa72819ae048150bf5c416bed1b2e518b28f77b2ba978be SHA512 5999e220025aa8076e5e0e9e73e80c2da21660e77f6744d73e8e29962221d02d33a36e9829c44abf7d4f45abae069d8e121c8019bd1600b7e64db5e54efd9987
 EBUILD YAML-Tiny-1.690.0.ebuild 843 BLAKE2B 5ec0fe95ff4cefc74d5f093c610f1f151b73fd81b618036b0cefddf069f89bbd1c792ef5c7cba916dccf2f900f6def59c666ef9d8f60754847d96e83c76fd0bb SHA512 5fbfcdf2415bfdc3b6398c937a1bb7df0d8765afdb74218fa5407d594b2f8c4692d590b626613f04d0dcd01dd32e0c57a1f597bc818e9876427c8e207d2e5d08
-EBUILD YAML-Tiny-1.730.0.ebuild 937 BLAKE2B 5759541feabe13c24a1965797ef2036ad467e8d80009f5dcece1eae8f2d765677b42982f7c6473e63f65d56f2dd21d525891af90434ee919efc24ab4da0a309f SHA512 5c84e6bfe165f5ff43db9c15ff46a7520a77be90b17d2c515be06143eaece7fbc8807c5bdb5dd3b0a0f02fcbca456b87fd53fc3af71647b930e26ef2473e47b9
+EBUILD YAML-Tiny-1.730.0.ebuild 935 BLAKE2B 3c5e0dddfcb52b69714822b7a6445adb3bf1059f0c75db4f527dd6f4a900320d85761f836c286598652456e9ae882d6bc00ee0341159734a072c3c7d31206f17 SHA512 33a34b100ed2a583d8a771e542d86dd1108b7a5f6b965c38343f2f6eb552ffd5fbb75008a0eef3e67924c6de79e1e8c4b52c0f98588f52f381edb6b98d3d1a4e
 MISC metadata.xml 390 BLAKE2B 43f06ee024367997900aeccd745e3477442ef332475b5f80330487525939f91f40a799539806dd249d6ff4028e2ce2e046cb26511ce464d0389c4410d326924a SHA512 52c36ed90d2421c9bbdca2eaf494b8e46cf61ef567ed52ebd8f28ad20eb5ff8b9217ee20b4865621d79b9df0694ac848311a7c7ad62b267c7ed95467ef1112d4
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
index 48ef604f526d..233eb5879669 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read/Write YAML files with as little code as possible"
 
 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"
+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 minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 16dacfd1f213..52329021fb5c 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index a88552f1f4f3..0e0b7a9e7015 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,5 +1,7 @@
+DIST DB-1.10.0.tgz 132485 BLAKE2B 10ddf37984f33effb913c9e307b8543af56e344863fea8fde01cfd4684b829353f0799dff6413cffff711418bf7e8cb7f5855bf6f312d41d92db55d363784796 SHA512 01855d0e26b4463fac1f3f9c84c7f3fed62c9087cdd95843340f6250fbd63f4d33f7e958d3f3895f9c2fa568015e86e660393a578c764fa0d39b36a6394dc48a
 DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
 DIST DB-1.9.3.tgz 132290 BLAKE2B 8970697ac66bc9fe7f8c374431c59627133401e5b591fb3fc95ffc3a6ebb8cfe7e93982178e092eefc79d91657992eb539fc7211a237e3fe7407c75c7013831f SHA512 3fe98f97307818f65c0eaf291169fd13533a4d484d34d7fa7aa82580f6ec3d89b984292f173da2cf896f5f15531db9bde2be981e5a7679cc00c48aa2f9cc1142
+EBUILD PEAR-DB-1.10.0.ebuild 763 BLAKE2B bd693bb7f0f00cdb4c9baece3cca0b72970ed186e82122a19e3b727c01b1c351e1cc478b776c7de1ab098eda175eba0398ca198e6f18655cb0fb888e0f373c38 SHA512 54473078315418ff95db1f9758f599231cc7cb276822cde992fa82ac8fcba4f275484072e7b0607faae95b6bccd94d02b2bd213e8e514b94cfb163995cd47665
 EBUILD PEAR-DB-1.9.2-r1.ebuild 756 BLAKE2B 61a2c45bf60e45b83cdabe857f995e302c7392bbd899bb6d17f1c219ba01ca817a704fdd1095eae1f216c436b380a4d81da025f5b1d83cee91cdd01b2d67c31e SHA512 9e5211a5002b38a3d9744da28dbcab240d6560cad1a20a03823e7e5f940fb4b83e2e936b753f8557c827125fded29e21ac6e4f988ae7d27d12e783eb2f6c6010
 EBUILD PEAR-DB-1.9.3.ebuild 763 BLAKE2B a1b994ccbc19b5b13732585235cbf814f6b5e37f12fbd09c6b7f8a1c6812eff583cc5eadb3f3dd78609fa77ad74f67381e9d6b3685b120c9b05ee5f5a041c59c SHA512 eb4d31372c536a2377af8522f853744d1228c5a8927c74086c2bf94e34b7df9aa4d8755d6a0f7ed5cff084af59085368d31bc2e615751926e9b557efaacaf517
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.10.0.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.10.0.ebuild
new file mode 100644
index 000000000000..f30eacc52464
--- /dev/null
+++ b/dev-php/PEAR-DB/PEAR-DB-1.10.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 php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="Database abstraction layer for PHP"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR, and also
+	# a working version of the cli SAPI eselected.
+	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-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 648a41ca8f8e..6fb8ec38c961 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,8 +1,10 @@
 AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc48e4950560f2f4d08add530d078787519b1c33dd511e92914208342011bd727e0fca12974b92a46b6a6bc9a66cbca061c9495 SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4
 AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
+DIST PEAR-1.10.12.tgz 293220 BLAKE2B fb25123852a60e4bd2c041d1fb58174b3053b24ff8ec19b44efe02aee041bbed102b14b270dc1c9764150eea7c85862ad78adefdc1d789540da18ec0f3aeae68 SHA512 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971
 DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
 DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
 DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60
+EBUILD PEAR-PEAR-1.10.12.ebuild 5903 BLAKE2B 24f94b9ff80e5abf6b8a05c026acf0ddf03398bc0666dd55d869c719f596622197f802d7acbc9e452b6132e2580ad781e97033bf406716f797148501784a8c72 SHA512 cc01f6a19308f3b956a8fade169aad5e5f9c688648aa361521ee6781da0385680dfa9dd1d33e0579720022eea0ef54211e74af3809bec9827c7e965e3c382840
 EBUILD PEAR-PEAR-1.10.6.ebuild 5883 BLAKE2B 782f4f038a12b19a056f1a7343103c1f497fef413fb007bbf8a2f41b67d2c7abd8dc92019759874f5e2715b00139a6212cee2f3e135be3cd7e1532f521e09118 SHA512 edbe76956baca5f011e9b5fe47ef9b4138252bf59912ffc742c45abe9196b9c1cad0a83fdfce899e855f25e5102cc8cb1ad3a1504f8f26220de56bf3ec0f1b19
 EBUILD PEAR-PEAR-1.10.7.ebuild 5894 BLAKE2B 4da9142dd31318085b21a46fc4df5d44c63a7abbbf2383b4cbf886bcf5395c0c00d81d1f432597106a3411b972d38dfae70be16046aa09a9c3b2528500b4b87e SHA512 8cf842e92854497a1f565813d713cc03e0a62a3a8f01fb41ccf140e82736cd8d2ab8ed50c915095b4dedb13c88c2bb4c1bcbb22366cd37828c0923ed8dc85998
 EBUILD PEAR-PEAR-1.10.9.ebuild 5894 BLAKE2B 4da9142dd31318085b21a46fc4df5d44c63a7abbbf2383b4cbf886bcf5395c0c00d81d1f432597106a3411b972d38dfae70be16046aa09a9c3b2528500b4b87e SHA512 8cf842e92854497a1f565813d713cc03e0a62a3a8f01fb41ccf140e82736cd8d2ab8ed50c915095b4dedb13c88c2bb4c1bcbb22366cd37828c0923ed8dc85998
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild
new file mode 100644
index 000000000000..eda65ff33c79
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="https://pear.php.net/package/PEAR"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli(-),xml(-),zlib(-)]
+	>=dev-php/PEAR-Archive_Tar-1.4.9
+	>=dev-php/PEAR-Console_Getopt-1.4.1
+	dev-php/PEAR-Exception
+	>=dev-php/PEAR-Structures_Graph-1.1.0
+	>=dev-php/PEAR-XML_Util-1.4.0"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
+
+pkg_setup() {
+	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
+	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
+	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
+
+	elog
+	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
+	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
+	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
+	elog
+	elog "If you want to change the above values, you need to set"
+	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
+	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
+	elog
+}
+
+src_prepare() {
+	default
+	# Exception.php is part of dev-php/PEAR-Exception.
+	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
+}
+
+src_install() {
+	insinto /usr/share/php
+	doins -r PEAR/
+	doins -r OS/
+	doins PEAR.php System.php
+	doins scripts/pearcmd.php
+	doins scripts/peclcmd.php
+
+	newbin scripts/pear.sh pear
+	newbin scripts/peardev.sh peardev
+	newbin scripts/pecl.sh pecl
+
+	# adjust some scripts for current version
+	[[ -z "${PEAR}" ]] && PEAR="${PV}"
+	for i in pearcmd.php peclcmd.php ; do
+		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
+			|| die "failed to sed pear_version"
+	done
+
+	for i in pear peardev pecl ; do
+		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @bin_dir@ in ${i}"
+		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @php_dir@ in ${i}"
+	done
+
+	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
+		-i "${D}/usr/bin/pear" \
+		|| die "failed to set PHP ini values in pear executable"
+
+	sed "s:@package_version@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
+		|| die "failed to sed @package_version@"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
+		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
+		|| die "failed to sed @PEAR-VER@ in v1.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
+		|| die "failed to sed @PEAR-VER@ in v2.php"
+
+	# finalize install
+	insinto /etc
+	newins "${FILESDIR}"/pear.conf-r2 pear.conf
+
+	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed PHPCLILEN in pear.conf"
+
+	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed CACHEDIRLEN in pear.conf"
+
+	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
+
+	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed TEMPDIRLEN in pear.conf"
+
+	# Change the paths for eprefix!
+	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the docs path (prefix) in pear.conf"
+
+	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the data path (prefix) in pear.conf"
+
+	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the tests path (prefix) in pear.conf"
+
+	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the PHP include path (prefix) in pear.conf"
+
+	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the bin path (prefix) in pear.conf"
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_config() {
+	# Update PEAR/PECL channels as needed, add new ones to the list if needed
+	elog "Updating PEAR/PECL channels"
+	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
+
+	for chan in ${pearchans} ; do
+		# The first command may fail if, for example, the channels have
+		# already been initialized.
+		pear channel-discover ${chan}
+		pear channel-update ${chan} || die "failed to update channels: ${chan}"
+	done
+}
+
+pkg_postinst() {
+	pear clear-cache || die "failed to clear PEAR cache"
+
+	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
+
+	# Register the package from the package.xml file
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_prerm() {
+	# Uninstall known dependency
+	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
+}
diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest
index 466af37e5f9d..56dfeac04a47 100644
--- a/dev-php/PEAR-XML_Util/Manifest
+++ b/dev-php/PEAR-XML_Util/Manifest
@@ -1,7 +1,9 @@
 DIST XML_Util-1.4.2.tgz 18993 BLAKE2B b2667aed3b3ec75dd8fca1625c6fa3d03a7662c24ce0fce69cb983f42fc3f45bc0bf27bdee7353c1d29fe0eabc181f2cbd415883575f5d6cf7163097c10f6d9c SHA512 e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe
 DIST XML_Util-1.4.3.tgz 18842 BLAKE2B 1cd0065b84e07a8cbc7f4d44c10362d40e71254b4964b3aa3d4d11cad5cb7e5bce780f926c69cc4fc871ac3c28d8239a428c145389950b4d6f6e626b6215dfc9 SHA512 c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310
 DIST XML_Util-1.4.4.tgz 19069 BLAKE2B bd809d8a3250e5d08793f6d6ae50ebdbd0e95e46b667edf7176ac125b902cee8334bc6abe85704a945a508cba6a2146e5bbcb6039a40316ea8d2b1b30590d139 SHA512 3c2ae4492e76729da561398a43416cd540284297b497d2c1526515c00ba2918b9d520b580e21111cf9f9e133d473289cc9c896bc28ddd0c64a849ee66f897e42
+DIST XML_Util-1.4.5.tgz 19191 BLAKE2B 2097e91bc6ed46e4af5713fe6e3f764b401f14ff1e06c0f96af68476db5e8cf2b463c0a9bed3eecd5e22c24108394fe1f622e4986888af131ee9a3c260f8c652 SHA512 dd373c15ea8057e1a31953a10d75a4821bb9ad63d55ec5ccdbe17c114895ac9b9a57871d50f9f83bca7e3920b461417aa09063cb06051834996d4a8aebfa84c9
 EBUILD PEAR-XML_Util-1.4.2.ebuild 644 BLAKE2B 717f57dc48c6e2c6bd16d2e904127d2c4e8342799adae57280dbdc92b4cad69d05ef6af7733ba42560aa362b0dc9ba75e57879d473cc6bfc84d33367ae8a084e SHA512 7b598dce906169b7028b2d21b01b2086433648e4648d8b9ea67ed85c7e1a4b42e7cce18dc3918fbdf0007de5a8088b405f40420701efdcff917df9ce636ee4c2
 EBUILD PEAR-XML_Util-1.4.3.ebuild 653 BLAKE2B 3c6d1e9fa538c15bb9e0759c8deafed0b3d089bcccd36f92480984792c2147c4b9b9bc260e1d396f9d61af07e246fb6fa294f20c05b5d6f918a40279bd6e7f5e SHA512 2c3498f89487c86f1a4d95c30a7fcbf8a6ffee8d749faf7fe63dae599935fe667c8c69c3f777c4948ed3680a4a3169bc883e41aa3b54f33d8ac9c411c211750c
 EBUILD PEAR-XML_Util-1.4.4.ebuild 653 BLAKE2B 3c6d1e9fa538c15bb9e0759c8deafed0b3d089bcccd36f92480984792c2147c4b9b9bc260e1d396f9d61af07e246fb6fa294f20c05b5d6f918a40279bd6e7f5e SHA512 2c3498f89487c86f1a4d95c30a7fcbf8a6ffee8d749faf7fe63dae599935fe667c8c69c3f777c4948ed3680a4a3169bc883e41aa3b54f33d8ac9c411c211750c
+EBUILD PEAR-XML_Util-1.4.5.ebuild 1421 BLAKE2B 2ce6898138b09d2c6878364ea5bef969f050ad2aa45500f7b90484c6cb3ef554e9100d4e675d4c4b76a6d054b0f609ccfc9c6be2b9d85b0051dc7c756c0f5fbe SHA512 eb12bec09bb0471d0638d375a3b6bfabe647b384f6868ada93e0b212d3e90850b8bcc7ed158338e669f1a8d76c242576a4f0058f2b875a8c82fd9cd9af6a2b6d
 MISC metadata.xml 310 BLAKE2B d264a3ec20fb493c77b95f1225895c3a77d0abbe96f7c5240b804b785211d9aa0b2b26e1efd39e2592d96fd6f2ba42568e97428f944ee6952e101d577bb3e99b SHA512 a0726d245546336d0efa22151520fc51461ec1bdb31f2a4012ffcd5fd94858168f621aa903e489e44c43023c8d1a2b3f8aa05d995975b1abf7332e7cf3eed5e8
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild
new file mode 100644
index 000000000000..90d887a6d2d0
--- /dev/null
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XML utility class"
+HOMEPAGE="https://pear.php.net/package/XML_Util"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+# PCRE is needed for a few calls to preg_replace and preg_match.
+RDEPEND="dev-lang/php:*[pcre(+)]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r XML
+
+	use examples && dodoc -r examples
+	insinto /usr/share/php/.packagexml
+	if [[ -f "${WORKDIR}/package.xml" ]] ; then
+		newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+	fi
+}
+
+pkg_postinst() {
+	# Register the package from the package{,2}.xml file
+	# It is not critical to complete so only warn on failure
+	# Can only be done on reinstall/upgrade as this is a PEAR dep
+	if [[ -n "${REPLACING_VERSIONS}" && -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_postrm() {
+	# Uninstall known dependency
+	[[ -n "${REPLACING_VERSIONS}" ]] && \
+	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/XML_Util"
+}
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index eba6c0ab02e6..1e3e135d9a4e 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -2,6 +2,6 @@ AUX autoload-7.0.10.php 646 BLAKE2B 71515ed7d8eb3339e2756e8f1af7bba2e0f1cf1b0fc3
 AUX autoload.php 3859 BLAKE2B 65cc25809352182d5c852743a25e2e297fe0819d2feac0fb47cd9f80e9ea36a16f7f2dbc2657bd73d1e484c1b851b5603eaec8c6d0f7fa5e6582876661587fbe SHA512 c33ce039a84f0f6d260bf46e8308df806968328c80dd89b778c76a0620d514c5e101ac3c741a3b68aba07cb59ccfae4a0dfb6157fb056e03ce65c1478300655a
 DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
 DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1
-EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1229 BLAKE2B 5ced7e458099c4b413c07866278b5eca7c222cbcfc6c9fd8e6e51ad6fb7dec7ee41864092ee7d7351237dcff4e02b77861d9f6ad96545320c7b1b9f89471390c SHA512 facfdc792174d39f30d0426d112760e50ce377854add38f72974cb3ac870a1d561744a6258a341790548e419b92478f8994886e0b62ffe47588398d70012e08f
-EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1950 BLAKE2B f4d7c6741c7ce8633759ff2746725e54a2c59b9a2fd9b89ae9d2d8d91615a003f17021b032239d3bcf6ca0f515cd350a3d3a855dd84335ce094f7a93651e5d82 SHA512 bbfaf0bb0d726343a8125cadea2ae56a4f42285c2169fc8661ef02b9d357b0d3fc57a22dbbf25fc35d55e2883b3dacde20aa52ba30500279c01d5fd394b20edc
+EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1230 BLAKE2B 188d5861e36f6ea2e84ed51ffd4978a7fec8220ea39cf2c73db6ddecf213f51f51630ed9bf03cd8c8887bc5194ea8591035666db6142a2fc2871ac573066c174 SHA512 d1abcbf404a985cca1f774e914919f715009349faa21e5c49c97ff99fb6eeb0a1c2ac1c18cc641af9418952cb0c6e65a3c17e75885f9e9d653d6c9adce08f01a
+EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1951 BLAKE2B 3869286b1e8b8decac2ba671dfec87f6ddaeaef477dd71df4c2b8ac33a6b99681d347f8a6179f732b4a27d83e3ff29e9139b95e8ad91042eee0d2a0f05ac87c6 SHA512 b4aa6e448363d1a9a46a55e0b4e5c17ab542e0395ae8ff7236ef2dfc615912050f0b23a113fc7a02acbf691328ee4d6592f625a6bcc6575da7072c4e68910fbd
 MISC metadata.xml 339 BLAKE2B a9f68f1bacb42eb4e4a6463dc03080c343501c0f6525ed08556f9d04606b42c2744f458ba35fff8cd4f5c8e68f81f226193dc79bf7808da8c4229588f34dc3dc SHA512 5057d1d80d43e4e8f8a6f2bbddabda7c7f639eb26a7be8f534ac2c470341834c7d99e78a20f18062ef1c7252b75428af122f2858dac78f88f8ab6d50a6f66f4a
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
index d6400d0c181a..9dacbd149a26 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="php-code-coverage"
 
 DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
index 8d9aa8f32d3a..ea217df911c2 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
@@ -7,7 +7,7 @@ USE_PHP="php7-2 php7-3 php7-4"
 MY_PN="php-code-coverage"
 
 DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
index 1eb824d230f0..98ae050bbc95 100644
--- a/dev-php/PHP_TokenStream/Manifest
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.1.1.php 2833 BLAKE2B 594aafd23673466891934600e0620437390703a3a3e4
 AUX autoload.php 407 BLAKE2B 8f8afa7524cd277d498acbbc468ad6a7a2b57223111fa459c63a545251430f18be06e7f8079a3ae4f959338530e211d6d7a770bc0739668b9b612b4fbabc1719 SHA512 f80a008f1f443c90814c034822211e94e76d8af31b7da6fb39bbb5aace6473bab8befcd177fd3c2b5b2891bdb62bac66fb03ae6e0fe9429335950b134fccdeab
 DIST PHP_TokenStream-1.4.11.tar.gz 13388 BLAKE2B 20ef9907ce660e2958ffd50f588ead563efa04c9fc4adda4a823830000f73ee7a4c988adc79d14e549c4f02836b7128aa42b01b26996a090595d34a191282b67 SHA512 4e8d8d1eb16169d46b64a43d91f3066d49fe8e3f184d90c5c7cf4234ebfe4eac271a811744b201f05dc86976b3c5b8ad4ae9f2532165a3849980663f1ac5852e
 DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02
-EBUILD PHP_TokenStream-1.4.11-r1.ebuild 780 BLAKE2B 0597f73cd5b89cde44414a54370e47e39d55b8bfb2310464bfa0c2fbb8364a50fc280d6d9222285d24adeaa7480aaebda76c1bb7fd76f55e308240fe3e61d87d SHA512 ba550b9327dd713b750c7938441a434b1628692efee4155dc5f7bfa537410854aac97035b29c937fe23440a9af0f8015fb564f7c2d8312423709bf12eff13222
-EBUILD PHP_TokenStream-3.1.1.ebuild 1374 BLAKE2B 01c501a49dd3e3769c5035a16b407712c4f5606b2c88aab58d09013fbe1f5ee2a131b4666e918698155862f9858f0b8c3ecb0e865d8ab0a448a1feade1fc7d5d SHA512 e31f779346bd409c3e89b9c86740084c97f559024b06193404b392f6b3b7b35cf233a3d6cee5834b0620acaa741d1e611067dfc312ea627d8f55c9ad23926d3b
+EBUILD PHP_TokenStream-1.4.11-r1.ebuild 781 BLAKE2B 9e7ffc85e38b4ba772e19d129fe8e4e4824ae10dace7d4eef6bb8ec76459816b516e4530ffbcb6934f142b1fa58a550d8708b757a6005eec144d95ee96ba7676 SHA512 7af19322b885a06742ee6b16f98cb5e4b61bc29d8107fe3e39555b6a597b7fe3c48e4b48b1d0088846f2a4951b75b13d10592244c9c9b49db683f669e469f2d7
+EBUILD PHP_TokenStream-3.1.1.ebuild 1375 BLAKE2B 00140e2cc2590e12dfde76f50d96a5fdfa00be2fff29623e7ab824db9807c7ddaf51dfb1f5359fb655fc38c8016d36726cece177ccd57b43f3753cef0ab814e4 SHA512 d3031be006974d66208ca0af00c736f72940895e6678436f42a73438f268dd995764c6592ef064557574b7f3f3782ae5a05ee7e20356b1ec04884423dbe22eaf
 MISC metadata.xml 338 BLAKE2B d6fc1656deef3d826ef47d31a4c02b873a71c287f2d349f96dffa1fcc0b3006a3549a80872efd23b09288d144d18776aefe6e7e6c52045eedc53beeb1331c794 SHA512 1f758ba782eba886cefecaacc81c4c1e77c6e00f6a1e265f5fdf789f757b3c2e3ca742f9c3c1f6427920b6ab42388b34cf2c7d50b11247c4a94a3fee69993e47
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
index 9aa26e094500..ca56bfba3fb1 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="php-token-stream"
 
 DESCRIPTION="Wrapper around PHP's tokenizer extension"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
index dd4a45a86757..79236ade4a27 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
@@ -7,7 +7,7 @@ USE_PHP="php7-2 php7-3 php7-4"
 MY_PN="php-token-stream"
 
 DESCRIPTION="Wrapper around PHP's tokenizer extension"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/Text_Template/Manifest b/dev-php/Text_Template/Manifest
index 958a582c79e2..8a572130d148 100644
--- a/dev-php/Text_Template/Manifest
+++ b/dev-php/Text_Template/Manifest
@@ -3,5 +3,5 @@ AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1
 DIST Text_Template-1.1.1.tgz 3444 BLAKE2B 7b063aefa5d1cd8b8faf4f68c12552a50eac8d2bb0007ccde632c88325974c32734cbd76d922e0132acdf9e6cb157eb229bf7edcf2697d7f1cfc789b3f33529e SHA512 0eaf43ab8c0810f63d81ddaf62a5e81b2e244161fe79fe09bec05ef732ee07012a1c6c3711885a118cf38334131c57ac1d326e0a711eb3e6d3099c5475f80e7f
 DIST Text_Template-1.2.1.tar.gz 2561 BLAKE2B 24871781f622fbd35cc0f524a092eaed2de0988137a52f05a559e89bcdc9248807a677b164f5ef9a246848709d3bd3ae0c4cd5e738fe6cd42ff0a2ea8aba577c SHA512 d8277f24782d0897b26d2e4922c2658047c484cb86f477916d6ad6dad3e5150bfa0a1ad38c79463a3fde97702bc65edb207a481b6f6cd8346c5fcc33b4cff8ca
 EBUILD Text_Template-1.1.1.ebuild 503 BLAKE2B 6abf128379c8f4e72e427bbee57501381abb0aa414de5bd5fcf1fa7b036bace681730475cc634a33d01f7f9731d1c7bd923656bf0f0e0bbc50088a39f777f769 SHA512 5c578722c7752f36b87f2557db82bc0b3a71c9e1c9cff729fb81b35b5eb592ecfc9be4581f0a81df7571a7c2ff519d50cdd065de81c12748957681a72b21e7c4
-EBUILD Text_Template-1.2.1.ebuild 753 BLAKE2B e06cf884de7a2ce3c5bd71cc56b6ffb0ee7ec895e7e41ba6fdfa1187a0ed69c74ec15935c22c35a1c3eba57e586a69917c54bc01e76ee1b54c16eea483e391eb SHA512 c55a729a73c787508f61630b47bed5394cce2a348a6ee54984fd2239ed233477789cb238239ba9509cee7d96abc58e7dc446aaceb1b6a4c699af51e3eed42636
+EBUILD Text_Template-1.2.1.ebuild 754 BLAKE2B 7b9b240f2218a6efc3b89304aa11dc0533bc864b3a201cb895728ceb42aaf8bb5c35374f9dc53765f13e80ac695f1e8d556a61266ae36ae164d56d0cdc04fa51 SHA512 d068b0b948a2a4d30312b26c200445c74aad8a8acf1655d3a30a643df81cd4b0272ff7db3c3074be334884ff0c59e38973c3be21504632f765de02adfd260c61
 MISC metadata.xml 339 BLAKE2B c5e702f4976f584f0e7e9818f8c1c12a3ac5cd693faa20afb9f60444306f8be4820efef2cb1786508efb51f80241998abeb1c5b7cfe530d4ab86f4e8617be9ea SHA512 5a723a5167a669b4fe417f81d895d9de2b3ab6767b54f68cd246e8f3e446c841ddba918cb83575cb3c21b1051a1973e4eecd8f5c9f7c708b5911fe4473fb4ce6
diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
index 6b48de388a3f..cceed4874600 100644
--- a/dev-php/Text_Template/Text_Template-1.2.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="php-text-template"
 
 DESCRIPTION="A simple template engine"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/libchart/Manifest b/dev-php/libchart/Manifest
index d13ce27c6568..39d7def71588 100644
--- a/dev-php/libchart/Manifest
+++ b/dev-php/libchart/Manifest
@@ -1,3 +1,3 @@
 DIST libchart-1.3.tar.gz 106204 BLAKE2B 55e133ad55b54377211cf165ac77a545ba770942f383c3839ce1eacf82afaf831ec80711375a4ff4a7be55f1e4270fb886dafae2a21b1a041c5da5384e4aee93 SHA512 5d2a0b014546487029f552f225fa83de856210a997e69bb5b129e99790f5acfdcfff904077126c42f82974d10f81e7e0342991221af5f108902b2792df24d586
-EBUILD libchart-1.3.ebuild 741 BLAKE2B 818ee39f90376eb42a209b413ff8a677d2d043a9897c833bda15a77027ecdf5454447bd86aff3603708a1ed1b79a122b6408eea6a604f1cf85e2a5181396eec6 SHA512 e336b809c310da8df4b56c4e55cd7abf60c62a632a4e25d73946f3bf797809fa99d4bd28434bfd664468f8b0d6f4f6245821eb37cdff23a362d60357dc7c5a2b
+EBUILD libchart-1.3.ebuild 739 BLAKE2B 2f3a0704342954f8d4ef6ef54bc9e6a16d35880b10432692846b2d5adc60091b0568dac1667de3a2d358495682facc00cade694098f1405fb18552bad10dfb79 SHA512 6c1edf775a5e503777d944b756721333a12736b2186c93c884747121d2adf538b5633dda3b36c68f672e360123614cdfcfa7c415c6cb442b4494db9fecfaa44e
 MISC metadata.xml 317 BLAKE2B a489b4ad4a1a967c43a0f5f4e346fe8279a75e1a53928fe2fcd568b6a76cb08aec16e32ab7005b68baefd3ad5a59cb46ceaa1375b7aa44d7fe329074518fab87 SHA512 3da0c7f5f082f41cd79f76699a5273859ac72b98b82d39ee2790ac5a316d79aed14f68ee579dbc28fc9ef74c47b9a76920e52848a50b6765cca4493bbcd97602
diff --git a/dev-php/libchart/libchart-1.3.ebuild b/dev-php/libchart/libchart-1.3.ebuild
index 4e9e63418aab..b2e443283bed 100644
--- a/dev-php/libchart/libchart-1.3.ebuild
+++ b/dev-php/libchart/libchart-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Easy-to-use chart creation library for PHP"
-HOMEPAGE="http://naku.dohcrew.com/libchart https://github.com/naku/libchart"
+HOMEPAGE="https://naku.dohcrew.com/libchart https://github.com/naku/libchart"
 SRC_URI="https://github.com/naku/${PN}/releases/download/release/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3 BitstreamVera"
diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest
index ab44f941320f..e4ad94c4cab4 100644
--- a/dev-php/phpunit-mock-objects/Manifest
+++ b/dev-php/phpunit-mock-objects/Manifest
@@ -1,5 +1,5 @@
 AUX autoload.php 3973 BLAKE2B 0d76a132dd080b8f8fe839b1c3cb750372440ff903e464232bdcbaf2fc499c96a7579c63735631885b7e7422b3f6646179a0c4748d3885b81b53fc6652d1c164 SHA512 aee22419472bbca6c5b6a951a41c0a4098071679e5ddd40282a2d717a854189546ac8d2a8d2a9aad43e28b6ff831cedd6541c3b5e19d5599d62ffe2815204ea0
 DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de
-EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 746 BLAKE2B 4e2424463a960a778c5a3b87ffcb285da3d3c62441c1d0ade2a592b86c01038b680af6eed4c92db3c58a9d9cdd4488a7f032b03db954bd60088bcfe41bde2d9c SHA512 baed2c07c589d8898804171f3fa179ab4b3739521a177fd0847f74f31a24a27b33e84329cc12867d8603d0cef4e6fd8dcadefd2cda64b5dafcf0089607c2a2a1
-EBUILD phpunit-mock-objects-3.4.3.ebuild 741 BLAKE2B 96c2aa9959da8d77e675aef0e6cfd4dce0319d8c7125f8b486ae76a16b5391854652ba2b67a15a45d78e0023937c2889e3f0dfb7261de735159bf8fe84c39963 SHA512 c5019c5da6a6edb6cbff39b061f06579fdd1a4a2c43e8e7b53e45d544d8be2675b391dae331105c0390f298274d5c38b68a60be00e7307b301004f1b1ec9677c
+EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 747 BLAKE2B 07af8c9782243a1a0f569396da62f995776b988509edb6d671ff090f4e933d8aa986bcdb3b47ae47fafc158292ed4319b5771df1910df8f65ed296005ba771a4 SHA512 edee3af146a8e5ddf58b1ba1b24191b6bc4c20993fc3f46b0b8b6180a857d9b213bdbce050734630d7af734500843a1e3745c0636ac7e092a0e105c7d9c2517b
+EBUILD phpunit-mock-objects-3.4.3.ebuild 742 BLAKE2B df780fe08af7d93be370f3d89a6544fa5271ab162aebfbeda8941bf5000a827192c40cae840c7e3d241c9215bd690d9b2164f0f3266f2c12439637186c5bcec4 SHA512 3ff1cf9229f989734d246071a038d55ee5339d2c6517d0a8c55e6f800e4ba5dbb8d2f99b6cfc4567899bf473295a676c79d320b2f4e4128275ef4534f51ecf33
 MISC metadata.xml 342 BLAKE2B 1dd45edd9b24f97ff402f3b3821e9019873024d52cf1dad8541fbb165393ef9b6f38834744c9093ea033eec4b901c91e59713d3c879a6f93c8ae5f3863980b42 SHA512 81c56c098a010d97eada1ff754710726c9ede41eec3605bd7dc0e69e5066b58afcab886d4a55fa2977482cee82f7c203ae6f9e794b4c190359e66b5a756ece51
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
index 686be65e1e3e..9b0a499ebf29 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Mock Object library for PHPUnit"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
index 0ec23481430d..e409f8167f00 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Mock Object library for PHPUnit"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index bcc8c1f8d6f4..c046fa232ad7 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -5,9 +5,9 @@ DIST phpunit-8.5.0.tar.gz 311500 BLAKE2B 1b21b898f8a933a228bb6f0197e1a884fe1ab67
 DIST phpunit-8.5.1.tar.gz 311607 BLAKE2B be746b70df855dd53a7faf61801258e2a3ec4f1ea008575328505e174193990d60d35533a220e03c93a4a013bcf177de71c3f8c1b856767a7cc52ab6aaaef0d6 SHA512 ab2d01d924ed34fc843f33f917e8aab6987ec547e02cdc662ce1f6d6ee383b064bb63a6f71420daee49ef87499471aa4e98b99ab6fc585229738efcbfb87fd46
 DIST phpunit-8.5.2.tar.gz 311677 BLAKE2B 7cc42db3618a9e6ffcc35a7a38a6691193814a036869c78af6ef4d020f43fe00633eeebc81cf5c4cb2db04b06706206d78885a1a2e39deea4d20e55a0f8189b2 SHA512 2b8c82381b3a4712c8cae453924b5b0ec25e6c4ef2de6d36ab31f6414a32806abfaa0de5068e585f203dcdd0f228b7ddffb930f394ca5af325c1f222e0523642
 DIST phpunit-8.5.4.tar.gz 312261 BLAKE2B cd130c5699abce3614e616525f58448283ac77f285dda421d33596a82a815d85a663204a661089373a5f6e9ef0d55ba8f327df759bfda6d6503c25663b6ad197 SHA512 307e441582399b2fbd77b30306702b0de0550e9f7e13a41cb39d665291d19e11d5952940fc198247688b95da7774786e86676053f5c64bd4405a1252f617f259
-EBUILD phpunit-5.7.15-r3.ebuild 1533 BLAKE2B 418617cc755f9fbb4844f52f39df977874f8b8d8fbe5456bcbc7d85697531e18657b20e1bfb035b85d519580926b5ead4cd2dd422ea75c35aa2c35ac70a9a63b SHA512 a4cd3eb30b0712a7c26e15435663290661cbaecbcb5ecfb687112b5f17cd569f74d4335c076bf6e096c86ecdcf7d18454f9703bfc2c9b72dc0fafe83e1af0f59
-EBUILD phpunit-8.5.0.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
-EBUILD phpunit-8.5.1.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
-EBUILD phpunit-8.5.2.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
-EBUILD phpunit-8.5.4.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
+EBUILD phpunit-5.7.15-r3.ebuild 1534 BLAKE2B 749d8ce5f0a947edf9e886e4ae6bfef4fe6d3b98ac9b71602a745db6b5cccfe666094d47d7a54ca15c3ab1b2c6fd521ec1cf64a0452329dcb9289d60415caccd SHA512 03daf408cecf3dd04bd9b43f81c2c551c5b59cb7b62a256966fff308e4dc69c8381dce2ecbdc2c7860717609daae3879b95a7fd7a30f2c1e6173003d2aab1e81
+EBUILD phpunit-8.5.0.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
+EBUILD phpunit-8.5.1.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
+EBUILD phpunit-8.5.2.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
+EBUILD phpunit-8.5.4.ebuild 2154 BLAKE2B b36413b07a97bba3261f173123bd2c1aeae9e084125141b108aae3c54511109191d4f33341b7b470f335804c2b60ae9c7619de810229751ae8cc722304942f9b SHA512 7c822966dd5193b1bc29f6460b5a0e71924f5ed431ede68c940b4f8b62c71af146112950a4ca08b4d876adefbcd56a9e2b8b634e801ccc7c953317f1f0a95717
 MISC metadata.xml 329 BLAKE2B 45eb57929680d3c3d1c60a22dd1b760db42b1ce2a157c9b87209c391a08022c01a103972267b2f36cea142681d3cc3691a27c726b9a132974d7bb418e5316928 SHA512 007a4fea4de75a468e377398bb1539e25eedc8009ad6dcb6c170be653821b73d8eaaaeb236e207a2e33a509d2966f6a9571d8f0219d90b1662d4da1cdc7de896
diff --git a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
index c52d43b51830..b5d7ddf00b8f 100644
--- a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
+++ b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/phpunit/phpunit-8.5.0.ebuild b/dev-php/phpunit/phpunit-8.5.0.ebuild
index 8cef7953bc08..3632144aa1dd 100644
--- a/dev-php/phpunit/phpunit-8.5.0.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/phpunit/phpunit-8.5.1.ebuild b/dev-php/phpunit/phpunit-8.5.1.ebuild
index 8cef7953bc08..3632144aa1dd 100644
--- a/dev-php/phpunit/phpunit-8.5.1.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/phpunit/phpunit-8.5.2.ebuild b/dev-php/phpunit/phpunit-8.5.2.ebuild
index 8cef7953bc08..3632144aa1dd 100644
--- a/dev-php/phpunit/phpunit-8.5.2.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/phpunit/phpunit-8.5.4.ebuild b/dev-php/phpunit/phpunit-8.5.4.ebuild
index 8cef7953bc08..3632144aa1dd 100644
--- a/dev-php/phpunit/phpunit-8.5.4.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/Manifest b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
index e8de6d341a51..9c7a0f0fcb53 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/Manifest
+++ b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 312 BLAKE2B 9552693fde0e523fb2d9e5b23e9a9463ef365a3804648a1c416d201d6a3dc2ed9f1b8893c05cfb93a91a70005fb95d26cb1949cf5758cde12b6a8effa602fe92 SHA512 ff06926ebe557373a0e0b5b19b2c10c6104693ba1dcc4f1c0fdfeccb9ca499d43fcbb476816f6e861f48f8636534892851f2ac4831ed153da108e6f0b24d1dd0
 DIST sebastian-code-unit-reverse-lookup-1.0.1.tar.gz 4326 BLAKE2B 1c1f65d70a90b9f6d665cb80f3272d95f003bb61e7f682b7c2d7d0010ddd2b26a90ce0cb2a217445df6fff6aa0c7d414e8951d7ad5a0763fc715504e8f649c5d SHA512 bb6419a13b645a4f35d688d3dd47b0d10de8c996721e95805c08119925fa66ef89cca38f94d3818c62c2eb9a978ee231e91fdeb47bf3b640eeefceaaca135469
-EBUILD sebastian-code-unit-reverse-lookup-1.0.1.ebuild 655 BLAKE2B a8dac3a84936cb75db618570393181c30c98ca088f6fad0c8916314bd2dc75790db6f6677600d947e099a148ae9512c8e172b6263c3939cbe624ebd57f8f56d7 SHA512 ea7792e2a69246d8876ed433fc081d002d9a6ee8310ad45995383dcca91c51dc4ea9de8f1855b550f1976fbe3233ac70b972063bd683914079882fc6c240e1c9
+EBUILD sebastian-code-unit-reverse-lookup-1.0.1.ebuild 656 BLAKE2B 7b75c215f7873489aadc79021973f7b1ec68c21254375b4ac6f9715afd7393ec68c55ea481a5abcc077ba2b70b0b998d42e995114b7476d8c14b096587105d34 SHA512 bb745d6307851d72f79f3a00e8936454aeb21b3d6c93ab6075900f79b1959c37446909255a2d41b0cfb2df8462be5487546667a091a880808d63bd75f94fd9c3
 MISC metadata.xml 346 BLAKE2B 9379848a8118427efc3ec84f4896f1ce436658dfb852aaf94bda1b2057d47647dad6486664ebeb4eb0498462ba0c58b5d902ff5df748f7555e91ce652d60ee68 SHA512 61330d4e03be274063d0bae2f4259a6c4a0f14d97d68dcf6dafd7fed090e7c76bac945d67d925f4d512735c2d5145c50f14f7b1ca17c31ce843113c2c7f6d723
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
index 0512947115d5..fe3fe4c57312 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
+++ b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-/}"
 
 DESCRIPTION="Looks up which function or method a line of code belongs to"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-comparator/Manifest b/dev-php/sebastian-comparator/Manifest
index 6dc861e67071..6ce788ee80aa 100644
--- a/dev-php/sebastian-comparator/Manifest
+++ b/dev-php/sebastian-comparator/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 1601 BLAKE2B f3f668b40b4d8a3259e11fc0fbe3a810157c2bcf40c3d8372dcebf2bdcec7fa999654d88db19fd50169563d34e3b4754101010bb80cef39ed71c0747d3d3c9b6 SHA512 477a0610c65ad7f6fa07532c97f62ec6968fe88810782fd37024767d89dc1e8e59de1e1cbfbf8fdf8d6a363d0e202ae659c6fffda8cd8cf7916b2ed089aa3457
 DIST sebastian-comparator-1.2.4.tar.gz 13402 BLAKE2B 5fc664e42408a188ed8601f2413f0b6517e5fd9b26f85be3177f09d6aaf4fda8eaa2e9e643e08914fb18aca0c795989d1e341d28476e3857c7d991bd2c06d51c SHA512 b7ca4bbdd91c9d59f83c4ccbd63d7755205f6686de7d7e41808faba404df8f58173a0699a0e4d1fbc09914c2fcf841ddc4df41a86aa5cd0fdffa3be4d438a8aa
 DIST sebastian-comparator-3.0.2.tar.gz 16305 BLAKE2B 3cc8551fad28542823fba182abf6e9f33bafa0fea004ceee7d2b192f250678ec7f2014b7e9ae16eee1ec84ff37e656f5612a0d45d3bc10c5959831d39d851fee SHA512 05d5cdb5ce6346325c3f7c6f7b6669de7d599e0b65a95505a85aca887df5498d5baa22f22e9065bf185ac50df1abc969bf86263d31a3923034607938a5eace58
-EBUILD sebastian-comparator-1.2.4.ebuild 679 BLAKE2B 8281654cb0e9a405f5478a759b04e04a5d7808dd565e939d205fd312e0f77ad827d05db378bc106e826ba67bf092e018f7b7a6b786675acfbb9d9cd87f95239e SHA512 d0ea4b063e8e0222a8e9d85d7b02b0a00a8d5394a797ff7b35c8a2db4e1f2b7ddda8cfd230fa08d912ca7343d0f6fa2364be339d9d603d87f3b77c5c505169b7
-EBUILD sebastian-comparator-3.0.2.ebuild 750 BLAKE2B ebbb47bec0e2549030be7ddd67f24cede796c8b607bd886ee92a608fd16e0de015514cf3670ca0ea5b2afa5ddef869c2d06067dcf095929a5f40954cb9063a50 SHA512 e17bf76f5e0a229e168533c4fff33fc52838fa87c5f03f16d2cd8876b1ae9bb9a620eafe4fc328ac5cc1afb3019237d8f79def9e20bae997ed07c183b8e0d39d
+EBUILD sebastian-comparator-1.2.4.ebuild 680 BLAKE2B 3d576046061add5a4667e4369a1dbc8b535e9341fcdce3428ba27e837267b29f6d329ca26fe6c7116df70e41df16de4d22bc11e1a458fca1935265175fb090aa SHA512 8eb318a4093e77393b97e46cd78e18b91a5f33b493ad9113674bdcdfb2e91677321515fdf36f74ab30cf8265f05beaa773b39c7ea8e84be1ac5ff89913577dae
+EBUILD sebastian-comparator-3.0.2.ebuild 751 BLAKE2B 26db2009c2f6870028e8b0dd676aff6ec5a4e058229e40298394bd204509f62fb76c5651d3424f1dd8f16c518280f767910a16f29153cdc9ca24242859d8e3c3 SHA512 cacb49733d6bed355a1e4f6263887871b3c239b7566cda905aa2ef313f966291f70a3740e60885f005b4a69423f1fe0b50a251583d97811f735a554c9d532f21
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
index d2f76ac1f2ac..b7d54c4f9eb3 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Compare PHP values for equality"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
index 9223bafe9002..6a72c10c4c37 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Compare PHP values for equality"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-diff/Manifest b/dev-php/sebastian-diff/Manifest
index 054348630dcb..6d4e7f317ef1 100644
--- a/dev-php/sebastian-diff/Manifest
+++ b/dev-php/sebastian-diff/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.0.2.php 1685 BLAKE2B d99042706fb97d9d1fe500a82a09e16230b62c0aa1b5
 AUX autoload.php 859 BLAKE2B 00158f99e34866d4cb452af6a27a7b02678c09217d9e0b4f88bb6283b5268a91af56ae948639defdd48cdf35dc97642b11e3dd26685422df565cac57b70a2780 SHA512 0d1a073f461947956fb61d8eaae06765b0f24fba3e01bddd9a75f6a9e8abd0edecaf0266c457df39d2dc02eecfc1947cdc6da589ce38a6db8ad1716ba62a0e30
 DIST sebastian-diff-1.4.1.tar.gz 10310 BLAKE2B facb81bb6ec7a60714493b531eecd0cea6fc8fde0811de982f3a149b2446cfe71f32bfca62bb830dee734966ac6161990e14b666426f5b34c4068922c544f36f SHA512 b355f1407619ea6f1e9153a7946c339e790530c1c86369005998dc0c1078b96ef1ca369fec32f134b056dd8833770fcdb30443334275c8cb17b69e95ef8325a9
 DIST sebastian-diff-3.0.2.tar.gz 30918 BLAKE2B 33c307c97d30573c913e4a696710c7b0091b3d0a612661b900dfdb749e4fa5c8970d993c0ee8828c4b0342336c39db4c74702114a5a6ae0daf650fc625baade7 SHA512 c06176de492970f3e55a5fdf1901eb56299b3e49cb838b8cdcbb93bc9cfe9fe9c1b693acb0c598c618760c4de0e49deb2f7bad15a929bd13ef08d30fab41b677
-EBUILD sebastian-diff-1.4.1-r1.ebuild 589 BLAKE2B cdf5195e5568e780c6a5d2539436d3501a3647516908a241a4987371587f30cc62cd69b8889ddb695691c882adbe152b70fdc38267554f3c2355220103dea95e SHA512 801b034f821f4886d2b041c3c966b7751ace568c36ea6f9ce9d1459831ba624b68cf330a977a19c42199c3a28edfaf63c76aa6ec17ce834e4b08cd128aee117d
-EBUILD sebastian-diff-3.0.2.ebuild 616 BLAKE2B 04d3cab3e0165bdf8a79815a749dcfc698c99cd14f38b18a8e1d76a15f7b2e2a321ce2df9c23c7828735e69a509dca4e6fa3a9c017ecfa422af04e5f41d31de3 SHA512 b386f947721d1d9c2439661a617c6b04b744854531551fcfc0be4ccb19f2e0725666c4821aef3ea837da306761e1dc0ec7ce775515d9bd997c96bb02d9b3fe0b
+EBUILD sebastian-diff-1.4.1-r1.ebuild 590 BLAKE2B b9fcf52faeedd7253f34ee589d14828ddfaa8e44eb98eef8457b5cf8db0ff48cd9f7f023ef18ffd2a1071ff5732b861440fa10918d6548c6f9d0e551c33ec4db SHA512 42c6073d4f7ee96fbb441f3ec6095639601488eeca8a181f48f84413b481fe386e5997da2a8c7890244a83721606308b03ce0301e0753c1e85f04c4002cb3cbe
+EBUILD sebastian-diff-3.0.2.ebuild 617 BLAKE2B 5e6da8eb1bd751d93d0e84941bf4c9a3dc42679fe0a7892017a5d783d9bb193301a727b12ecb5dab046469646e12671714bb774569d8f2366fd31a3f5c62020f SHA512 a250881dacef6e83e033c70c678d531735f44371e26e5004b8f48423d560d63ef2538839c74a0f62eb1f78576beaba71f415cf782081210d7997984c23f1f115
 MISC metadata.xml 326 BLAKE2B f5c8c04139228c5dc8b69de1a7503814e75e363a79563dd816763301e5e56a617fa7f24aa58b81f82acd1b2bb304d89873dd32df3d645752b1fe90db655d7bae SHA512 b209d3b3b9d215d0f5549baedc6ecd6a03b0ce461dd276f20f794f4e17c500b02a53885fc2926675ccb1669e5335f4bd5ce75552470abef1b73bf9cb3e3e6e74
diff --git a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
index 1d8a42e7f893..af5f88ca992b 100644
--- a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="diff"
 
 DESCRIPTION="PHP Diff implementation"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
index 1376982558e7..50d48dc717ed 100644
--- a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="diff"
 
 DESCRIPTION="PHP Diff implementation"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-environment/Manifest b/dev-php/sebastian-environment/Manifest
index 6bf5db77720c..ad3660bd4ebf 100644
--- a/dev-php/sebastian-environment/Manifest
+++ b/dev-php/sebastian-environment/Manifest
@@ -2,6 +2,6 @@ AUX autoload-4.2.3.php 444 BLAKE2B 607f48a38674187ea4c2e57e4877630df0268bca00574
 AUX autoload.php 372 BLAKE2B 3d2843946daf17f3c367b04f1b5295ac67bdff8e1a409537f895eb7ed06a946ca3bc52647e8454d398b574ca948588951b29156d553b0a5f4b741b9dc828c708 SHA512 7fc348367571b5c7409635ec61c2b06f7fea3b640998f93eca87423529ecc4c933cfb5b033152081dd42817e9861d2fdfddcfb5f0d08d51ccf60d5c12f56a76d
 DIST sebastian-environment-2.0.0.tar.gz 5607 BLAKE2B 3c34c6e61d9a0bdc5df8083331390935bd513d735a1509890a9af05be8b5a718bbb1d5826ab0cb80da2ee5c4cd436b22ef4ccb50c7b4e1c11d361a78b51621c3 SHA512 cf91f0a5f057007f318c5d6b11f8a1345b8df35d513c6291c5b725f0874ed301a64d1097c3fac1e6b32533caa96b3f78ac415d99b9b6ef63dc4a303b90d49c88
 DIST sebastian-environment-4.2.3.tar.gz 9622 BLAKE2B d90b181c3aae7c4ea8e172e5b7f897f8a93bf1edbeca19cc8a7a6f10963730ece1f267fed325a6734b1677b75cc8f5b84a5aa55be383a40b1ec2aa7a603bc668 SHA512 871a15297196b21364000d72afa73c2319e741a284c5446443ae3cacd8ce1a07b1ea3b1d8b6b1a88356fb261d093b889508cea63706341413b15f23348f77e80
-EBUILD sebastian-environment-2.0.0.ebuild 651 BLAKE2B f5ce75a5f37cfdc8141880a5562ddd56f2cd2a57e02ce1a79c1ac881055a58dea23a7de86494d06649ab2d0be974160f7711435eef959b047c454123a09cbb53 SHA512 ac64e7e72b7241e2326db65c51ffaee4ec8705e0e569fb327ae566019b843363870c7289c47e104b4006a282ddd610728e1ab4394e46874cb1d93f3952aec77a
-EBUILD sebastian-environment-4.2.3.ebuild 678 BLAKE2B 27f33d378d04630e404de2dfd1309835dcd792ab46a6fe7a2e21189c0ce4b3280a6fd5a570ecd4a3505da7b73f77391b82b9fefbec1ff85d4ca19d36415e1ccc SHA512 791e19f4c90619735163e700ab9dcec252e280504cc4d9aad8b1f360b202c454d46f9e04c9cf084fb42c44a48816b6cb57d769b92327263a8bd7d9e3904916ae
+EBUILD sebastian-environment-2.0.0.ebuild 652 BLAKE2B 46f9884447bd721b713cc3e28c037a2b128b8bc846b09222b0e2ca3179271b888582f2d3a339effd2a5b0029150260400322c844a47d5166267dfecf9cf61f47 SHA512 153ddb36f62e98adcaffdca640862254116b0636700e7d02243c53dc0df0242d4b3872264161cc1474f01b2341d691fde9e887ced9fc87d3f9ae210e7fbd005f
+EBUILD sebastian-environment-4.2.3.ebuild 679 BLAKE2B fb025061bc27636a6848738ee193aa32f05665d9e4baf12d85a3437665f016dae4c046a3614d808c41aa1cc459cef44976db8261a2c0ebc95c3e9b4f23a85113 SHA512 609cb15ea46937f3fab0891b5ebff7c4be62fae2e3c30899af330dadbeb4df0e375b6c167529910fe1bc00e147ca4aadba2039b5beec1fa9b4f295383d643089
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
index baf3982dcd3a..a3609d1ece99 100644
--- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Helps writing PHP code that has runtime-specific execution paths"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
index 96358f0ee240..e9350c665068 100644
--- a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Helps writing PHP code that has runtime-specific execution paths"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-exporter/Manifest b/dev-php/sebastian-exporter/Manifest
index 028d258c016f..62417b10989d 100644
--- a/dev-php/sebastian-exporter/Manifest
+++ b/dev-php/sebastian-exporter/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 429 BLAKE2B 7fb7aabe5cee47b74491d50a2a01f60ee45f5d0698f5bd5c908ec1796bbd31cb003de188c61dd4492a5e1556b47e3ab8ef77019ce4dc9cfb90a2e3af96527694 SHA512 06f8a87461a518009d2dd4298637ede677d6304b36d25d94c75472420cf2e4a8fa6aef23b5e21f98ee4ad03b2886fc946c5b0213944947290a3dd9c5308f8509
 DIST sebastian-exporter-2.0.0.tar.gz 7473 BLAKE2B c8f39c9fb19d146959e184ca1356a2f802bb29d31792575fe624072fcc7fc44f5d5d619dbc9dafc9114c46e91ba64338af6902abc2fecc96cfbd0b28294a97cc SHA512 0d418973a6e272e327c16f2393bde09424f8dea6991a804259ac57261efddeb99e33a904bbf2ede99b07def897c0baa12ad9fc04c8c33af684f1fd19d976948a
 DIST sebastian-exporter-3.1.2.tar.gz 9996 BLAKE2B 214acefe5679a45d5e67ce635790a12002aca0e380a087e96358200001400458ce907bb4f424ee3683b2fe17fb4bfbb674ebe0afbdcd51b24c654de2b4075736 SHA512 bc6cb070c8c7cd5262262337950ffc70081137c4513c427cc94ac491e2ebe0e91ca4caf7858eb7957f9abe5b4b2b2d6237020a0a6df556439191724f3cda1db8
-EBUILD sebastian-exporter-2.0.0.ebuild 663 BLAKE2B 79d755e9fe438a2f24dde0a48a4ab0126df5b68bec0ae3f024dc0291721e767285b026119f9c13cefc5cdd4906a8af498a99d434b00649eedab589449a65f290 SHA512 71214f97c4d0b25f38416ba02e3944e9f0b10242ee28fa8de408a81ef4ba3488f46f29be96e6e9589cf4c1c8b9bbbdbcdbc0741d21a2d280608e944cc85f406c
-EBUILD sebastian-exporter-3.1.2.ebuild 668 BLAKE2B ea2f6b468ed4658c133473cf961d913ed2317f257de793d07d3c331511c59ba70cef0c6c367a718b5475b84b04478a828bcdf1623bae24a7ab1aaed90e006caf SHA512 4cc0d5d924c0a62e5df9ee94479d254e4d99995c1a0b126baee3357200f9fb7205e34a56fd44b2bce1803cb4ec5fb007ab1875fd3bc0b8c685d260c16dcb4d7e
+EBUILD sebastian-exporter-2.0.0.ebuild 664 BLAKE2B c21e3189219a05bd4c938481c7cc282a6f728823432a098bfc3a967b1b1702945d0feea65bbab798c3426a8d1bf0baa789d5c3e3fa97779cc47425a058153145 SHA512 9cbfa9fe33e51d9be0df6abf6d735c76938bbae6c1c32d7d4d94b7f601fe318376d2b9a55e407b19d23b0c1a19e1430b7d8c3c136b10a959acd1f1fbb618f131
+EBUILD sebastian-exporter-3.1.2.ebuild 669 BLAKE2B 293ac42d9f8965e94fd498f511e55f16eddafde89a801464ae3c62d01594e4e2ad5d00a7fef6de3a338a20e215f59bb70491099d0f0e597dad36f57e4497325b SHA512 6f4b3c7b0f9ad5c8f4aaba161eacc930b160cb34d4442410d0770b8ba7b87c21a0268d9817431d168c180d9a7d0318a8b99dab9f34995bc754c6e4f38631c05d
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
index a7f3fc57c5af..fed44830adf0 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Export PHP variables for visualization"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
index cf83726503b1..05fd48dc1ca7 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Export PHP variables for visualization"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-global-state/Manifest b/dev-php/sebastian-global-state/Manifest
index 94c0617b902d..24f97c1b5f8d 100644
--- a/dev-php/sebastian-global-state/Manifest
+++ b/dev-php/sebastian-global-state/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.0.0.php 843 BLAKE2B 0a040782b66fb717f3de580e455ce2d186dd30ffa9b57
 AUX autoload.php 657 BLAKE2B 239a7bcc4ac117a513f807d8c3266c4951e4b3bf86a6c2625c2ab480905a99b5e9175238b8d8bec080228f7f7c734eefe5325fc147dfadb73a988aaa7ac3fcf1 SHA512 26f6a18f580a3080c80ef6abe8598fa589ade4343152fffcf3e967a208ec1e28b3231f241402cb6f8e22b8f6c1d248f0d999186846d5ced069a624571133f7f5
 DIST sebastian-global-state-1.1.1.tar.gz 7659 BLAKE2B 9793e68f226901cb2d67e3d4ac03cc41323485a1b7d819dfe0a4cd9c00b19eb79ebf539a8705545a4c132ef8a2a286edc804016cb76400256008ecd298f2f3c5 SHA512 dec6387183ea6cf869b1302e641a9d85b6dd69ebf299354825ab2f8a06a82609f8e3a2bdeea6924b5520f813af7493fc8e957c3f9876dcaa302066770997186c
 DIST sebastian-global-state-3.0.0.tar.gz 10550 BLAKE2B 58ad62cce7f94805add12105b3000c54e73624c780fa12970e779538f3ff06f145001c6d19e98e817982b092be992b4e1e55638f727fb3e7bad9d12c242546a5 SHA512 2a081fbf7b26afab0eeaf1933887dea12973c6cde1fe7115fe560d56e81ab69dceb7b3431818c51641778f6526abb0055e2a27420e53b2fe90e3f95ee57b01d0
-EBUILD sebastian-global-state-1.1.1.ebuild 615 BLAKE2B 0718cb9c8e04f043cf647a581970505f7d4eea535ae8cb89a73ef9965f9c226f6f0e01244743b445f263a18038ce19e9828d70b0a51eb0068dc5d9c779492de7 SHA512 9924e4401add065703151a70d8b519a94399de4c24aaf074911e7d48dfc4b07330cbc11bc611459521d94f3e68434a911d20b7431aa8ffeec3f5c3621c751c9f
-EBUILD sebastian-global-state-3.0.0.ebuild 769 BLAKE2B f9dceb4f1fb20fc53d9921f082b08296ee573d5feaa5424b63b7b11607df35aa79ac1ad43955af9331fe551c92beb706ce69894d2553906e987aec7a0f2f8d5f SHA512 3ebc939fc8fbac9adf0fec8ae41037c070ed8f0761b533b9e6c45ce593381b5d69c2bd3ba44e922e3a34de09b6c604a2bf470bd8c8f8af79d75e93046261ddea
+EBUILD sebastian-global-state-1.1.1.ebuild 616 BLAKE2B 9abd0976a36baadaf70afbed3d394b4f4b2c56b4f3192192bcee6938e9de72d74e7f092fa6b0fbd1d463934708e671377400b92b15ffeb85762e22fc4dbf8326 SHA512 6d68a858a473081ef6518efe10c548c0350089f27b26391fa3a94522ef05d158adf2d088623d87d7a7a5aadc64c8d7d2948b03b17ed94657d2a25a4d27ec52bc
+EBUILD sebastian-global-state-3.0.0.ebuild 770 BLAKE2B d4ec6536c5373954512f587a220dacf4062b7175e1dbfe2ab85c1277ccc44d072d554d55f2a944dd7510a94d335d6de7ee85ba35c53aaefc301ca1397c4b3922 SHA512 298521ed4675e33fe2618b250254ae5aa692aa0a99410da80bb0edcfd82dcd95cdafa6c9c5664eae92acccf6d6463b109bb1684cc75d9a4018a4b219ef86dce9
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
index fcf144c6e5ae..100d9e83a7c2 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Snapshotting of global state"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
index 9dad483f6a64..f2aaba7905c9 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Snapshotting of global state"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-object-enumerator/Manifest b/dev-php/sebastian-object-enumerator/Manifest
index aedf38ebe91f..69424f1f0b6e 100644
--- a/dev-php/sebastian-object-enumerator/Manifest
+++ b/dev-php/sebastian-object-enumerator/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.0.3.php 635 BLAKE2B 089dea0d15cef507d15d966e64eceba547bf8825c1d72
 AUX autoload.php 620 BLAKE2B 0f78748010526a3f72d61ef23121a573fba13b7c945e66056888e833673dba8dbe691087910a8d6e72c9a3a4febe6c3f6897bcdb1b8cb846dd832bc30dc864a5 SHA512 6b7ea509b19366d7de9a5e7c45e5f11f56824d19b6af08af8523d1a02bdb690b6f5639b0a324966bf14a9ef06c0ed5c224c52e9d5bc529095f1125507bd94aa9
 DIST sebastian-object-enumerator-2.0.1.tar.gz 4861 BLAKE2B cc68da9e38e756e478eedab588c023ebbf15d28d6f9e5399f178c581765aa02324ffe6f0bdf5e561f61791f449d8763e6cfdb572c779adaa9c7dedcc8b0f15a8 SHA512 087ef23c079be2ef56948c734cbdefbf4d8cad36c6c26aae5e38401ec3f306d91067aea28a2226811d1ed90611c7c8070a4f5c3733a24eb56f6a177eb332a9b3
 DIST sebastian-object-enumerator-3.0.3.tar.gz 4989 BLAKE2B 8d2314daf82280dc746cdc91c3c927d012440ef162a59918e038a15775f0113cf7bc0ae0eafb83d6d6992cdb2680bdd92935789584305906747fd71f13fcad5a SHA512 9bbff5081e1627d7ab98e01830cf6245f15b3ca96a56f6074e090f10862d19d0849251d69bf1117d3634b7e0ef86e266b2e9d4062e75eff9c9bc5f994dfe9a2d
-EBUILD sebastian-object-enumerator-2.0.1.ebuild 714 BLAKE2B f8d9024ab15329d956843ed370a5e0958fadca3ed95250770408ceff3e858eef9a853817d444000326d15882912b6e2fd205e4680ae7156a3f3a791030b70afa SHA512 800f5896e53a2a89b9143f9606927be3e2362ea5e438a8cbfc7481f028a40f3c9d711ee3de43402e92b3b996c034e993deaad0b7bf0698f02b433759f85ba340
-EBUILD sebastian-object-enumerator-3.0.3.ebuild 823 BLAKE2B 2a73f578a83d38c9bf6eb8e2055e38162ddde4a8e7e7197c9f3b493424532de6b5588d36c5cec7e3f12f36eccf6ffa11334fa0be2d360aeeb31a8235b35f14ad SHA512 69746c117b75284b0e03b8be8bae981c9833d9725e64dccf4f864409c4b8448f183ad932b4c2415aea82b66afda83255d2fb703c13e2d39fca0b5cee6ee963fa
+EBUILD sebastian-object-enumerator-2.0.1.ebuild 715 BLAKE2B c1100c9aa402167beb05c3a0ae27e6a2d6b24d6768ccb9f0dbeae873dfad081de05f28b920db536af6a1204e1f55388316906cba74bf9bd32c05e7eca4b86ff9 SHA512 d8b874461570ea2abb95f322be15f3ba6669101203f1202e8cc8d2353d234c6d5eceb3632d1049424b766d6b786b5e1efa59ecfe1a74da5ff8330ee4ef83c944
+EBUILD sebastian-object-enumerator-3.0.3.ebuild 824 BLAKE2B 092da88110638fdea91d1039c5a96f242f29b120218fd84cfe1958607f859df9e0e340d9b689b686bdfb1900f4d7c204b10e8d1e85fa894c163ba3921880a7ca SHA512 9259134c2f154fe82cec42edd4b61626549869f0351fb0a5c1ff72bf2c7a6979603508001d6f4118e2730f0b74fd258ea951521f8d0a9fc18037adec46f74dfd
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
index c3dd088b8045..3a50601608a6 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
index 18dce0809092..c0b63b0beb3e 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-object-reflector/Manifest b/dev-php/sebastian-object-reflector/Manifest
index 3ae10376a2b0..9b33df190fc8 100644
--- a/dev-php/sebastian-object-reflector/Manifest
+++ b/dev-php/sebastian-object-reflector/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 495 BLAKE2B 1ddad60e63bd386b4c0c50592134ee2f06622ae13e99d97d79009f42431078481a3732c7bbfc4385a75d25f4172553aebf0c6bb5c09b6e4134c62cf3c2960da0 SHA512 727da79b8fba9c3a8d2b781ac7e0185b6d219732c28fe942ebaec79251c2e40580841a559d4aaefcf5b8692e09308284a95670ea0e4fb99e167d3263e2b2b429
 DIST sebastian-object-reflector-1.1.1.tar.gz 4755 BLAKE2B c549186722bde6625d44478dc90023511cd4e2fb9fe206b08881746e4443275b20eaad86a13bc202b3f464cad7239aac28da9962db7a97b9c789534424cb3ead SHA512 42dc43d1a606b1aedf2cc40443139d115fc38a50a2e51d2b4d72ecededf39bf5cecbed6d1bb002dbb6f7bd3c7da50d9436f7489f9078d52d61af7777f31f5e57
-EBUILD sebastian-object-reflector-1.1.1.ebuild 722 BLAKE2B e9a5f4ee03d2d7371e41a883095168d03793a35379eadc671d2a596f01131f697a5a1f48134669f0b5330733e2c3077b4117abb731590938544d7de129019545 SHA512 7c059795273262a206168c989b97780f62d7df3d85df2125586b92be28ebcd8054cb9500726680ccd9cd5db2c8815c859c857535f2bca0ed160e1765b57f2cd1
+EBUILD sebastian-object-reflector-1.1.1.ebuild 723 BLAKE2B b3d12230bd1a31966efbc7091563cc9e7694bde76dcca378f150093d08ed45127ad0c3d90df86ad861d69f69be21d78090289c4734d716ddbdd23c039fe8b302 SHA512 33ec186efff41d727523e8428ef99f5298335f5bafc18e60f3d899ea8b3a717f89e0bac3030197b528b82d9e00bdaae98073b12c9f809e7e11f20a2ae425c903
 MISC metadata.xml 329 BLAKE2B 9d69f662322b740a5b9f215d24bde8b76d01bf1de4fe251c9c0a5e3ca3a6254e20b5fc64e06b8f29a060e9336573121e0f63bc1b276f397c0c455af5f376533c SHA512 1c8237de0ca8ba4b3bf588e100df2b966a496ba96dd29ab2cc78cdacec00836e017bc7a32be5f31471eefbe50a144d583d1220a91523dca329d0369920ee15ad
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
index 34f338d41120..56dd2650e473 100644
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+++ b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="object-reflector"
 
 DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-recursion-context/Manifest b/dev-php/sebastian-recursion-context/Manifest
index 194b119d4671..2d22b4558661 100644
--- a/dev-php/sebastian-recursion-context/Manifest
+++ b/dev-php/sebastian-recursion-context/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 492 BLAKE2B 141d4ab79acd2614a81a85411eb7514489e0e34256c50d9bae5b82106e24d84d03b465dce5a29e254ec2b7989d24f5fb3adb457e71e5026cf7445801a36f1d92 SHA512 6850fe9b76c5055d42cb8fd21496082b626c113fccbaa9048c7fc07c4853c610f91f83665df441964175265ab2df7244e7ae67c7ed5664ed2850886b973fcf97
 DIST sebastian-recursion-context-2.0.0.tar.gz 4526 BLAKE2B 54ecdfc255c3bdbedc2a909f5b569c62b19e2e66fc5ea4ae7be8401516c142b43e611d5e8f1c056be329983f21e1a8b85e7fb2ff1ddb92a2f6aad4d4191418a6 SHA512 9d25d148decc81f5a21d7a4e1f966563bf6ec765fcc1b1ce779668b74dfa39959db07cf296e9cffcbcb3943c8911709bb73f22c5bfcc81c5d2fcbb51967cf75e
 DIST sebastian-recursion-context-3.0.0.tar.gz 4414 BLAKE2B 04a0aca4b6012013306c813109c0ed6f60d2f4f1381ba6506398388b5065d69375191290d33cdc4b82359dc30b1fd98ef61005a657fa8db302472597950255b5 SHA512 0fce5709cb22818de6bbfda1ba2a99fea511d5b36bcbe7955661d756a6f82ba84cbf8fb4eb421d6b51ae9e36a8edac56c5bafbccf8b665a0296883ea0dbb3b91
-EBUILD sebastian-recursion-context-2.0.0.ebuild 625 BLAKE2B e66bc5e4c1b98137ee1dc8b9a84fc3274d23c04ce336638b0a448f663f96e9a35ce11ac20e4869f6aa3186574cd86810a18ce8cde30d8b368cd7ab797ca0d64e SHA512 553f5885f9a9488337bea5b9e920da45316fa8fa63c83180414671a159a6155b276045f9d146b2ea9da195d7f8472007858c7cd376c86dd3fb337c97c56169c1
-EBUILD sebastian-recursion-context-3.0.0.ebuild 630 BLAKE2B 63b28d2cabd5bf1624c675b8c7f0461a206108e65a359db5d808983f90b1eb45cc8bf4bc59defaba6adfc3abfb4bea419144b0366fde311eca63bf5561ae3901 SHA512 cc7717cf2704340dd8fbd6115c6992e99c436aa61661b8bb9ffcae1d971e8f2df099b30e42e897bdf96791202f3c9591f55c0769ef1a5e74c6f6a788935101c4
+EBUILD sebastian-recursion-context-2.0.0.ebuild 626 BLAKE2B 0be260a62e8630ad7f72db1228f1b79e0aee5620ccfdc486bb5ab8e619f11cd0fdce8a827641e7f2d5f96dae4c4be4cf04936708c0e2b9763ca7934665d98737 SHA512 8c1e1fc2e761c40ceebe863a568e3a69fc64ccce20fe40a9746b8ad3396c9677657d7dbb7538b56846633eb5bec859a5fd1aa1ac01d1fcfa71b719c68cba9199
+EBUILD sebastian-recursion-context-3.0.0.ebuild 631 BLAKE2B 2d5c742bf9479fd98607eaa04ef9315cfe373420aebb013992b7ccd89dfa82aed1979743f988b55b0be6ce9586d026fa86e28e17ce0808611859d850fc94b48e SHA512 794aa478cfebc6dd52b73c82711f21da58b6fe4c4988b01bfc2c3b1f6df24054c9e6aea076c243f28ead69c2fce9d36a1fe8e79380b9e8d7ab5af8a03be74040
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
index 72896d8f8348..940e38fd87db 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Recursively process PHP variables"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
index e90e11f60111..830d78275012 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Recursively process PHP variables"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-resource-operations/Manifest b/dev-php/sebastian-resource-operations/Manifest
index 323278824fd3..a44d6543327b 100644
--- a/dev-php/sebastian-resource-operations/Manifest
+++ b/dev-php/sebastian-resource-operations/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 348 BLAKE2B 541a6d82f57c1b48b0087ac070058c1f5e575d35e7a69bec64ac18971a64f609beb65bbbaf58a9c1aed6293f863ed9c866024ad2c1531f8f8ec91893d2dfcce2 SHA512 8a6c7dbddc55527db9bdc1973682b09a3e615c3fbb0b473cb3b93b88acba62a7ac46e297582ab4a6611d99325d557425f40f83ed9afe6d82d6073f56e66fd0a4
 DIST sebastian-resource-operations-1.0.0.tar.gz 6449 BLAKE2B 0f748d4792a3d4705560c79047fbdb9c6371435600dbd8373e4c60c8edc436f3487264107b7f3d76125bde3ec7b30062587c96dad7612fdc4e4132d3912813ef SHA512 d11d06c9b8b4a1507238443588f34a85836fcd65d2afdb9bcf3cecfe352cba46c9349988550e901c301db8a21f19cc960a8164653ac66e57661cebddf52ad906
 DIST sebastian-resource-operations-2.0.1.tar.gz 17772 BLAKE2B 8a98c2735973f063fefba9079bf10e1b4a1317eab2e9326bf338d50b2c278673ade93bc20fb415d4d33046575045d0e2d147b5b1ba38812c84031c7a691d1946 SHA512 991716a948f3492b2f3c886f07485fec26ad7e31f8588a2cbf6deff8ef4791e403962578590b117ed43def7753a5f44f0f8c8f92994bc58295d58db3f7d71021
-EBUILD sebastian-resource-operations-1.0.0.ebuild 663 BLAKE2B 5f1c2284fc1a21644e034fefc0747f1d1c30c7f2474a75887c2d0b66b92f984e4fd26d8fc3b6b5611d88bdbecd9ea9c358979ad95543ca3994f6760879b8f8dd SHA512 81589551f6effcd8967c4d23dd9206f55b762e0508f1810ff8daf79ef4a0859b58820de2db5a525ac908240981f9c4399d8449945d76c81fabda9a1356590d8e
-EBUILD sebastian-resource-operations-2.0.1.ebuild 670 BLAKE2B 42aedc738623a0f3f18bc8c02b1c091d2fc00951e93d54373846d71164cc8e8ad923b11bf2153e91b629e6443532a5d8aa02c5d4c0f44fda9f4db51c1433fa9a SHA512 07595f7fb777ea8838890da62dcc657b91d665d863d9ecbf633b682aa289ec0685bd62d8fca1f13afd03c871dc4e925f9a9a8d29c4af19e70f395799cad5321a
+EBUILD sebastian-resource-operations-1.0.0.ebuild 664 BLAKE2B 5196c8dda543bec20ba6ae0b03e5efd65d5ae43681c6be75f3f3619c560bfdfb9d1192621d3b8e7d33ba76bfdfe87df4076683860c68532a2f05c7d45818416d SHA512 d1f63a1853d6f1f0aafb9e83b7fc884275bc2f49d25a45203cf8799548e8f05edf0e9b73842c3e26e2f6a4a1d53a17c9749af89ff516b878045de813eed3409e
+EBUILD sebastian-resource-operations-2.0.1.ebuild 671 BLAKE2B d48d08c4a6e42279b6dd0e4da6a8f6111bcfa6bb21a39aecc99010abfda0044cf059aec628c62c1aaa26d0e97073a44dbb5cca43c5e9a3568cb209aae330d9fb SHA512 402a20273e7247200bd2581a31439795d2556df295e0770d9c5729e262f99ce1b9b25ed5a1711a8190c976667dc8fb2e42414c38f5eb398c1ae391c36e4856a6
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
index eb3623b447e1..f0216f9ebff8 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Provides a list of PHP built-in functions that operate on resources"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
index 36986e772e73..678588caefb6 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/sebastian-//}"
 
 DESCRIPTION="Provides a list of PHP built-in functions that operate on resources"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-type/Manifest b/dev-php/sebastian-type/Manifest
index 834a4472d190..b8100075a77a 100644
--- a/dev-php/sebastian-type/Manifest
+++ b/dev-php/sebastian-type/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 987 BLAKE2B 0df6eddcfe9551d42430d60c490def57e0b8426412f20964716b595345513bbbce293d8f6fb9157e1e7aaf1e1d08beeeac5cd4826e063542f05fdf66447bfe9e SHA512 104c4841f8c6994bd4b7b8b57253ec41adf823b14fb0545b1d5c8c31066a1dbc8ad79de6b2140eb395a4ad24093231cdc5a72f27f254b3cf7fa3299890871386
 DIST sebastian-type-1.1.3.tar.gz 19031 BLAKE2B 5e0d191cbc9315661f226aca14849ac4afa6d9e1dc59ca6033c60e425c94ee8b9ad49ab1c2b94c7814654bbadbaadd0164fadb1494f88c9521b2583985ba0281 SHA512 27b455c7a5f1125c916ea56fd933ef9ffa659b3fa6addf8d2c5956e4efef5bd8ffadc686e5dddfc50ba09a300c8148af7dded4249f404e15923e77102ab777fc
-EBUILD sebastian-type-1.1.3.ebuild 648 BLAKE2B 06eced764929b78deb32938e9e3ee6721792246eb35c234cecbcde7721c71b262013a50147626d3b1094cb378dbdcb40fa0373c477b012c6a6dd26fe6c05db36 SHA512 4934e3091a01f3812a5a27912e85569479a6a5a96c45a406f5fc72de5997f40fa84f6d07362c887b275309b57185c0119fe269dc341f825b145705a3f56fe427
+EBUILD sebastian-type-1.1.3.ebuild 649 BLAKE2B cb7a0491953d7bd1c94b92514dc912eef86abb4bd00aa4603c3c8041e17951a5015a95d2c3d5d9b39631ca4a84c44c1d36ab956b4556cf591e80fc0460e1046b SHA512 783c3b6926c773d608ec896164dfbcf53daa910c48ff1a4eaf55fe84be9d2c3e732b6f3299054e35b705a52140968cc8bb8542d4b1a5381df8a654edf3a89de7
 MISC metadata.xml 326 BLAKE2B f8c5ba19312b005175c9631474a3ce08f75bd91d278e25e413e1c5b38862518993ca241ebcc4b15db5458e5a012937996bf3087bf2cecfd759a0d06b504bbd4f SHA512 8587dcecc21296546628406891914d9962adcaedeef9d3248e6e4f0d48992cffa90a2bb4c71a00fd78eedc2d02f16a1b3e49a089e84e1fca116118b52fa1841a
diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
index fba05ed59db3..f3e2397ed3a3 100644
--- a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
+++ b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="type"
 
 DESCRIPTION="Collection of value objects that represent the types of the PHP type system"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/sebastian-version/Manifest b/dev-php/sebastian-version/Manifest
index 5606543a7e02..e1d37d547a74 100644
--- a/dev-php/sebastian-version/Manifest
+++ b/dev-php/sebastian-version/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 305 BLAKE2B fd6d3f90f1a7b421f68876765e7a5646c291bd7a72b06a6827c1472f5a772cfd4afb23a597ba63dbce0cb2dd999d2ea43b61c9d8e559ffa5ae4a7c3669f9dc9a SHA512 8a3e0a151a2d6b33e168907a3e30778104d2f33ece499b9f6836be807a16bad4f234fddeaae61f56a69f085b3e7e5e4434297e2557b36b62c8e124ba041cb5e1
 DIST sebastian-version-2.0.1.tar.gz 3581 BLAKE2B c6da754aa5ef6f46309d52f7d36a30a1d1b9b847aa90d62481633e0c290fe58554772d4016aa90f79b153b0e3df377269f7dbf007dc7049226899ef9bc2aa868 SHA512 12a813ff08996f8a6e53069ea297fb00f5fc9b58ce463b4008791cadc19575539bdb17acbf1f2fa67b18ce5a9207c9acd47183d520b60d6a188569f513d8a661
-EBUILD sebastian-version-2.0.1.ebuild 686 BLAKE2B 7ab3cf314ff45dd74892a5f7450f19d85768b5cef4e4267b748c535bcb8f5ded8f7628bf7310e341f4554bc878e3f49e7c72692ea3534dbc18e3ef877e9868de SHA512 afac89b38f18bca9c71d57261829ae5583021cfbfadde80985795f1e3bc06f97f9340230581ebb39ab3299b701c5395f0f1d560c921d6afd02825e373cd7e161
+EBUILD sebastian-version-2.0.1.ebuild 687 BLAKE2B 7a8b69943e5f112b358cbb53316ba860ad1639fe2bd3ae4b332159b5026a83fc5e093bd670d942d9572c7ad16b5272c57cba7740c5003ad852bf492b096c1fd2 SHA512 0e3064fbc14460bb7ba572b2dd11741b6d7b086aa728ba58cf574d600fd7ac3fa7c428af2685a495432c03e1f2564a952e93ebb487ed5dcb84ee6ae22790ba3c
 MISC metadata.xml 329 BLAKE2B 9d69f662322b740a5b9f215d24bde8b76d01bf1de4fe251c9c0a5e3ca3a6254e20b5fc64e06b8f29a060e9336573121e0f63bc1b276f397c0c455af5f376533c SHA512 1c8237de0ca8ba4b3bf588e100df2b966a496ba96dd29ab2cc78cdacec00836e017bc7a32be5f31471eefbe50a144d583d1220a91523dca329d0369920ee15ad
diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
index a0b3a653c00c..81d4571947e0 100644
--- a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
+++ b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="version"
 
 DESCRIPTION="Helps with managing the version number of Git-hosted PHP projects"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6ded7d3f9fd8..cdcb918ee5a5 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
index 26c5f45787d6..19e9923aacf3 100644
--- a/dev-python/Rx/Manifest
+++ b/dev-python/Rx/Manifest
@@ -1,3 +1,5 @@
 DIST Rx-1.6.1.tar.gz 89543 BLAKE2B ee0b6c30c794febdd045231ff61a330a512c86a9dd3c56a6afa900c31ca774725d7bf5b589d46b60f79cd1f0bc967b5ab5bc87a58f6d3dbebbdb1b6618db875d SHA512 8602b5175c058e855ac4b67d8feed435f93632da2f4033fe0db54fcbb012a702786b29f97fe3fd641f054c3a61478dccac21c614b5708f7bfb0b986c9951e6a9
+DIST Rx-3.1.0.tar.gz 890293 BLAKE2B 268f6df5450d1235d50f9aee5cd43fe6e229acf7b2ddab5f1f97e80594aeff7beaa280fe272ac9cc8b80dc6874f4bb76e438e94c09712f2c37e72d8d40f9f283 SHA512 1d9f6639ef08dc991326b95fcbf0978adea55b35acab653fc16bd94ccf2ad3a1515e8cb4e8d2ff38d7a506306e310394339a8651a2a02fa22bfb7f17d86297f1
 EBUILD Rx-1.6.1.ebuild 347 BLAKE2B 8e84f4c7daa13436e5c9ecb3deb22f41e37ba448f1c830836f931d08c0e7852c8a70e19ea56ae0baefe9188d0541eb3f69f072843e8956310c1639fac6d1cbbf SHA512 9355868035c59f3c253f3c580a357dcb08fab50778b17defa0aff712879be908eac6d2c2d50f801586aa2429ba23ee7cfbba95fbf920b89c491e1522b019f368
+EBUILD Rx-3.1.0.ebuild 605 BLAKE2B bfebdb964ca3a47f98a54bd5a4d9190c58e89631a423da327f974b5eea94450fab0e0c8bf87ee0ef05a9dfaa86496e9ebc60baabe0e2f1d27d3c68e120e75fe0 SHA512 34ae9fcdc055fa742ebe7157523bceb38a76ea155337639166da2fab4d5e49d52deca5acf85f3361d23e2a3457e4342b50d24423d1d8dc05ca359809749a77bb
 MISC metadata.xml 327 BLAKE2B c9349fc7bf783920d0f8469ea19b8cf475c4705d3499364ab79a6960e19c3458b7d2a18aa90a470b033003fe461f06d34d25206b702c835e5a311d698d4c2e95 SHA512 382a7e9dd6cf734155229b3acc48060b4d11f2e68b2fe906ad8508ea5de95b1adcd5d23d58b6ff4881f7d5c9f103e64b60787eaebbeff2db8f9b24188dab6395
diff --git a/dev-python/Rx/Rx-3.1.0.ebuild b/dev-python/Rx/Rx-3.1.0.ebuild
new file mode 100644
index 000000000000..dca57f5969d9
--- /dev/null
+++ b/dev-python/Rx/Rx-3.1.0.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 python3_7 python3_8 python3_9 )
+
+inherit distutils-r1 virtualx
+
+MY_P="RxPY"
+DESCRIPTION="Reactive Extensions for Python"
+HOMEPAGE="http://reactivex.io/"
+SRC_URI="https://github.com/ReactiveX/${MY_P}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index c94bc21586f6..04202bc7dcc5 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 896 BLAKE2B f3f8ce90329cc3d1db0393f139f7e211d8348aa2d18f041e6dd6f46a1d0b52436e3a92af2598cdc8f8bd97c26b041d8698d39c2fee680862d21d671436f07b57 SHA512 3ca5bc8afed7ffc1737caf6ee9e9ec5e6d4b3d5f2a7f45b31292d323126554a6d1e309adc80545199e069a4630c1aae81303a8baa4eca6e2ef74c7d1e6e2a24b
+EBUILD argcomplete-1.11.1-r1.ebuild 902 BLAKE2B c1ecabc8fa7fbca9cf59cb06bf913a314571e3c8eb94cac97f71bba31e98eb8c81b5d9f7873b66ff296d3966969b4628a89fad4d0278e1d378c21821fadb32dc SHA512 af4701ce5d4dd8d5898bc9cf4f72205633ffca1ea7ae33cd49e8186b7b63e419ac7bb872223b8f31f41d505d1c0e339680e1beb3c011c139c0f37d15b7b183b9
 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 82157a59f668..fce733275ff1 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 ~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/argh/Manifest b/dev-python/argh/Manifest
index 53462077bd33..a2404ff646ed 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r2.ebuild 678 BLAKE2B 6509b3206db11bf7761cd6bbc37d276b6f567d41c7238260487fece087a9c0ebb16ff457a597013e6c1b3a349a7599657a52bb400fd90526d7ec68d94785dd05 SHA512 390fd4e57d0bba14dd6cf411561e4d9f169340c172c61f415066c7199e2ad8420127e0f0c7c63d8e8f2671a54499180b44e4411d826ce01a717316bc06d21256
+EBUILD argh-0.26.2-r2.ebuild 498 BLAKE2B f6b191cd839b97b72e7d454bd25ef1125e917759c9795b8c8cc6f74682731bb6ad857e729f074e63a34f445d29563ea7b2cdae8058e586479dc9e0252c30ec47 SHA512 ad005475bbc3810ed54c79a8bd3dae0502b7b2ab5d2251638e76c64616948594cd3cbcbb0dd743be5e279d89d6fd21fd8360ae16b5a5e03946235e45306d9bf2
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index e4fc72244a2f..7275fa021aaa 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,18 +14,11 @@ SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 LICENSE="LGPL-3"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/iocapture[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 6ec9aa0af74a..d71fdd79508f 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 704 BLAKE2B 9e16c47c5a9b815479ac39b5db78e174a3a95b313b4c185807776fa3b75b7d2cbf39496a2cf2ef8af49c5047b6f3a060fdfd43027caf78b6f96540c7b6c8689b SHA512 59056c6f4a074a595f512668078eb689e19e3819d74376302052357cd3d88be05dd4dc51a5a370ae252de772fc7bdf7d6904e5c3fb77fca60e0ce4e880202f05
+EBUILD async_generator-1.10.ebuild 528 BLAKE2B 235da3565cdee54b50a54072bd10297db9f2b30d6b968d6b8610e8fbd0652f086ca5c91c7d4b39ea4b0175d46af3518b8aa21665d6aa33785b06f9e562019ce9 SHA512 aca4682a1f657c18007a85f7350d042170e17dc9f48a01c8da8a70ce6636f101492c3581586f0cd2b702664c26be7086df8c44dd9dcd21c52454bb764570a2ad
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 87b3ff8f0460..51b8ddbb5188 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,14 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 DOCS=( README.rst )
 
-python_test() {
-	pytest -vv || die "tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 19e5a7eabfef..c8eab74e0d6a 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -4,5 +4,5 @@ DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339d
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
 EBUILD autobahn-17.5.1-r2.ebuild 1746 BLAKE2B 58518e8cd04b6c01710a01d8b269496ce0c08b7fa9513e3f7f767e6012b3bf8d65dda993ce68e65f0c1ea17ba75bda36b11770a35e8d84241c7b0f80c5c0336d SHA512 6b5d81c6a25161d515acb187d1cc319399e81886af2806074d40e3c626ed4f51681d16b4ed9478ae941ebc4e028bb3fafe3fb9974398fb0ae81553307302ef82
 EBUILD autobahn-18.3.1.ebuild 2112 BLAKE2B 35fb84e5a25f80ea08dc8994d940b19ae9758bf1120b2b70d2bc2280e1b29efa6a1f3a8d01917c27d593a7e602ebbc64af236f05b9e279d5820e3d965c414fd2 SHA512 2ce04471413d1252d58cf43e80d65be5c2d0b3049426b0863387d624762b5a9fc1060d8d9a7d657d1d4e9b54dd6a16174ab5e40c4e7962158958e57270152bf3
-EBUILD autobahn-20.4.3.ebuild 2425 BLAKE2B 75f41cd47cf8c44148ae1f5adea4a18a9c40d45b8281758cf284dca29823ab5bd47ee0e484f3e3595623155aab6416dc0e7f546ba908b09d40bdada1c4695a3f SHA512 ff667f92a78e4921e4b2de982d9d4902f582d65666d23b56e9a9339c468508c31236c3dd379fc70ff4ec64f783b8f89efef4d35fb0dec89ee5d102326a99957a
+EBUILD autobahn-20.4.3.ebuild 2432 BLAKE2B 93414f64ccf9744162c99495e930cd2a8b596ebb5edde874c7871fa14a30d5c29fd6ec69109937405c878253f9b081632ba714609c06b2af214ca93b2f8e3a6a SHA512 5c355af32bf9fef0b3b06f9f38a55b48998ed4855a6b56c0e74b4569c52d5718a4756c6f96e6ac45c47d67933319272e2d952dea40a3a793fd80b3d51165281b
 MISC metadata.xml 397 BLAKE2B 2953764a2489f28c0ac996cc8ddb805720cd037ab685d342421b9f735eca7a794c830d551159c4a58e8c22c2101dd7180b298d3b28dd936f651834b9bf3a1838 SHA512 730d7bf2c742cba64c8d64117c928d4712efb46b87b71dfc9195f0a014c26c778c653ddf1386b3e274ed556c30c28347ce4502b0fc2447fc8c51b0a65941bc00
diff --git a/dev-python/autobahn/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
index 396e8da241b2..0b82b3acf266 100644
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ b/dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="crypt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index b6b93c3c59eb..1a54520b8c27 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,5 +1,5 @@
 DIST awscli-1.18.62.tar.gz 1739551 BLAKE2B 029119e6c4d9078f46507c1837c2122f86ab3bc83e8e34bdf6ddb969426769845ea6ae49d8f1cff3e4c9d2951ce562e6bf395b67082efd3eeade0e2c36638ab4 SHA512 08e996d4cdcb941553969310b998a033a4a4dfeec1de44167e8cd3c4a46e751858285a8d33ddc348c1133c90d25bb73da6ee33f6e2c94c3dd8dd79f56b85014b
-DIST awscli-1.18.69.tar.gz 1758256 BLAKE2B eb691b1a8e1f7caad9c286b71fd73ecffa09978a08b37defd95e5d439137acd1338db31947d238c5f2c39e2d2786a8b0368ac790a33e26d49e464f24101f46d8 SHA512 c27a2908887988ae87a97cffa496727113f51515a07eead356733f550cc54079d5ce2f71c59c3f54718673103a207c703f69452451dc91d3c00319217a92ef20
+DIST awscli-1.18.70.tar.gz 1758807 BLAKE2B 493bb9193ebf3f01e8088c4928036ef806d2a2802b3de6bfc7ca7c2f17d655a367601876be939e89fa7c28b4a7f5a5b6c9286707d3ddd1f7339cfcc35e2f85de SHA512 f81f7077299291a80a2965da91f2f09ca40918bc12faa3312030f5783df73503d61da9765bef4b17b71b318a71f8808dda9ede0aa276c4f055b2d5a69e299c1a
 EBUILD awscli-1.18.62.ebuild 1300 BLAKE2B 9469c174230b8029cea1cb1f441132bc151a833f48304413969394afa5025c083b6184286f19b5b85df428df861c3e81282b0ff1e86362964a3d0ccbe33bd3d6 SHA512 c035056da8db246c8196c4ae57654a01bf553e2e784ca014f57a3aeba22e813d6d73c7f983be0811123a1e5779a281a3a743af20b945b52414833bc0c0b51569
-EBUILD awscli-1.18.69.ebuild 1300 BLAKE2B 9469c174230b8029cea1cb1f441132bc151a833f48304413969394afa5025c083b6184286f19b5b85df428df861c3e81282b0ff1e86362964a3d0ccbe33bd3d6 SHA512 c035056da8db246c8196c4ae57654a01bf553e2e784ca014f57a3aeba22e813d6d73c7f983be0811123a1e5779a281a3a743af20b945b52414833bc0c0b51569
+EBUILD awscli-1.18.70.ebuild 1300 BLAKE2B 1251b30a7529c3d1ce816070e45e5cf70cb5456862752c20d7d11bd821ec4c142550e5ba74b294f7bf03fd1791ceaf89a78fb58650623cb32ac19bdcd22864b8 SHA512 ebc439a2ca2f296ba77510419a98ec428f5e9fce6a85273ddc7e6f9b6a0f91a6f3ae4f467182a3ec1031c5bde8986630f2e61835dce3f3c145ecbfb0ff50cb85
 MISC metadata.xml 429 BLAKE2B 6bf226a38913939d1184f9026bb30d07ffdeef758f8a3e953676fcd89bd6fcc1c780b9afe38b209b3c6bd16de44de86551b71c48f8ec40a4772d915ff6c3a21e SHA512 b189f9d0078a3abdb9115365df9cb5ea0b1f8ec3ca10a1b05658d5fe4fb4fb4bab5ad9ac91b095938bed18f875e1336777ac89f23813d0e54ffcaab0fb52054d
diff --git a/dev-python/awscli/awscli-1.18.69.ebuild b/dev-python/awscli/awscli-1.18.70.ebuild
similarity index 96%
rename from dev-python/awscli/awscli-1.18.69.ebuild
rename to dev-python/awscli/awscli-1.18.70.ebuild
index e1bc7ef907d5..b46fe39b26d5 100644
--- a/dev-python/awscli/awscli-1.18.69.ebuild
+++ b/dev-python/awscli/awscli-1.18.70.ebuild
@@ -21,7 +21,7 @@ IUSE="test"
 RESTRICT="test"
 
 RDEPEND="
-	>=dev-python/botocore-1.16.12[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.16.20[${PYTHON_USEDEP}]
 	<dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
new file mode 100644
index 000000000000..ff88072e40b8
--- /dev/null
+++ b/dev-python/black/Manifest
@@ -0,0 +1,4 @@
+AUX black-19.10_beta0-setuptools_scm.patch 706 BLAKE2B da031160089a1bf505656b301c0d8b43736a4dab641d4f1ea9cd5c98286e9ed10415cfadbd2197499d8b91553ff8f664a0e782593fe7ae10322b149001a2133b SHA512 ee8356ddf6208a20fc93e16142a5ccc37d471dfddf60e0b40fb4d03045ab2fc7e5f3c547a0cb1dcef032d8a24074d60e8ec413be36e981d2d9dfc39d7f93e5c2
+DIST black-19.10b0.tar.gz 1008099 BLAKE2B e8a6e286e7a60f880f8b5d37a2b07278faeb4efffd15feb511764e449c36b4e54d5ac5b910f583a15948a2f92eb5e61ae210073be7a57251b2b01e69d2e5b373 SHA512 778909c26afa65548a77524451b50a2692a7b4e297fa52fc80567f7fea94dd5aae9e61cf0f1de718c28a733f1813c8e2c6974ab58e6b0e891de331bb4f245968
+EBUILD black-19.10_beta0.ebuild 1644 BLAKE2B a72819980197fcbf34f7831b015fade2096a6d684a3ff1d098dec333d048dce26523d616140a37e901b377a3a448370306cb536975ae74fdfd1fd23bbbd70b2e SHA512 a8e7382b20dc4dc381d2a15047ef967d398f66afea1a3f0891b79734afc382b3e8352113d38fab0dde37bfe11a099db8a4a7259a14e75eaf25eb384eeb5cfdba
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild
new file mode 100644
index 000000000000..5db71277f7f9
--- /dev/null
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 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 eutils distutils-r1
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/typed-ast[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/black-19.10_beta0-setuptools_scm.patch"
+)
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	local version_path
+	version_path="$(grep '"write_to"' setup.py | \
+		sed -r 's|[[:space:]]+"write_to": "([[:graph:]]+)",|\1|' \
+		|| die "could not find path to write version to")"
+
+	[[ -e ${version_path} ]] && die "could not find path to write version to"
+	printf 'version = "%s"\n' "${MY_PV}" > "${version_path}" || die "error writing version"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_black.py -v || die "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch b/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch
new file mode 100644
index 000000000000..21f996480386
--- /dev/null
+++ b/dev-python/black/files/black-19.10_beta0-setuptools_scm.patch
@@ -0,0 +1,24 @@
+diff --git a/setup.py b/setup.py
+index 614a8d6..66946b2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,6 +1,7 @@
+ # Copyright (C) 2018 Łukasz Langa
+ from setuptools import setup
+ import sys
++import os
+ 
+ assert sys.version_info >= (3, 6, 0), "black requires Python 3.6+"
+ from pathlib import Path  # noqa E402
+@@ -17,10 +18,7 @@ def get_long_description() -> str:
+ 
+ setup(
+     name="black",
+-    use_scm_version={
+-        "write_to": "_black_version.py",
+-        "write_to_template": 'version = "{version}"\n',
+-    },
++    version=os.getenv("MY_PV"),
+     description="The uncompromising code formatter.",
+     long_description=get_long_description(),
+     long_description_content_type="text/markdown",
diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml
new file mode 100644
index 000000000000..56cae167d372
--- /dev/null
+++ b/dev-python/black/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>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 88b7c7ffa46b..569c7cff6874 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,3 +1,3 @@
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.7-r1.ebuild 1097 BLAKE2B 02ed46c2f5f98fe340d2249adfff4a1604c4e28fbbbeae4e44d81781a658d4ad564589ecfd97b93e44646e0e26dfac3b99158957500aeece6099840ac2b59d13 SHA512 41902da4ee7f57499cb328cb0a54895c8d3cc60019d8cd3aa6372f19bb6876323dfc1012c61d3f36148ecc5ffdf39d06fa8f9fc13d99ac718393c7f48b2cd284
+EBUILD blessings-1.7-r1.ebuild 864 BLAKE2B da135ce3689762094251a43a3bc3abc547cf91731604414be409418175041a7c56f2d894a416ffe777bdc0bf7aec2d395b735e6b4f4db10d8985b71da379656b SHA512 67303e0791e6bfcaff0de39fc0a910b4287e3a89677f287053fb26296992de2b7772d2800ed771e3e551f515567b79a654d4ce3ac1138e444a599d39d08e34bd
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index d9b166b70bc5..5685726fc785 100644
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,24 +15,11 @@ SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs/ docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
 
 python_test() {
 	# The tests need an interactive terminal
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index 1ae12a5b840e..5a557cc4f323 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,5 +1,5 @@
 DIST booleanOperations-0.8.2.tar.gz 165059 BLAKE2B 978b992e84181e8ec437e236e6502a6c135ea011395f3b082881e6b9f5c849632077737064d1102164cf083edc8a7e47c6f4f43d858948d9046ed231c5ac8911 SHA512 3c369ce53bc7b1b53f4441ba79959d4853c9ab767fef17fc41f44812427dcb5ad905fcfac4cee0d616447cccd059fce6a1d168b0766054659fb29b33867d1fb9
 DIST booleanOperations-0.9.0.tar.gz 165127 BLAKE2B 9f72246afa46c414e3ff9ad23b86da9665a90180fc058ca278b82c1281e798d9d913e496995ca8d45ff948aff5da8a6de26706afdb5e538dee64d7ffe96c7324 SHA512 a63dec9c3a8008825538498b162130624b4d2b9ca64980a23d631601928c5fc6eebdc8f03f19094b7923b008bde6a87b5f21518cb33c8df3fcd41fd84a8ddde9
 EBUILD booleanOperations-0.8.2.ebuild 670 BLAKE2B 47c5e24af6a28088c1d66d5ba4910e0f28202f42141b3f9bfcfab87242251a182daccf4bcfbf39516c7bb25b9944dd333626953a7f1d2da4a1c636c541c818ac SHA512 872c101a401c06a049c4859ec44e211cba67cf3f37dd57348a2d2d0974d2a010685668bc3985a04afc10f05ff28a401ffc5049faa9085ceae954a2a7f6c2dd40
-EBUILD booleanOperations-0.9.0-r1.ebuild 783 BLAKE2B 90ce0ff40fa933e6f10b50eb9e81a326002bf80c9b5132b88ab3c16f3e82e1dc9a3ea0a1141efcbe2f03a7172b123c8b12f9575cda0232f59867058803aff97d SHA512 f9497ed99f5d1782bf1fd6bd4016998768e256a64b70e3bef08c451fcd781bda4adfdf20f6139a138b783e0395016b99a12909d3dabfeb72d0071ce249370836
+EBUILD booleanOperations-0.9.0-r1.ebuild 790 BLAKE2B 595c898de73d27ba1101b35917db9e6b806605a668b2470def779fc8348816ba77cc607d6e33d123c592c6cb73e3b8425dfcbab1a3236c7e096fed1d957f5bee SHA512 1236dfc4154f118435a7c79a8e68e7f44fb97637806b022f5418834154f49dbafea7f5339ed06e17e4f5d7931137d45287e22b21f10e496d1ed962fcf9fc32da
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
index c3e09037a85a..ee4e3dc368f9 100644
--- a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f963c479ad18..68152e189c53 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,4 +5,4 @@ EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662
 EBUILD boto3-1.12.48.ebuild 1293 BLAKE2B 92aad28866a299a2a734ff0d36a31a8bfd25e9ecef8e055415c99efee0cd5e23b0d1ab29830d70ca15531b830472b9e07f3cffff2e3c5085800a64a6cc138a1c SHA512 3d0310fccc683e421bce7b4eefca8c469bcaea84f191e6758b2aff6cd267910b7bb96bf0045c81eac26d5ffc11709a8cc0ae2ba6969f3d8b0d3b3e581d359805
 EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
 EBUILD boto3-9999.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
-MISC metadata.xml 430 BLAKE2B e951810929d6c9a3b183f46f69241b39991b959b34ad803b5507715383b0baa6c25832e93517ba5605539c887e43334aec9ecf98c47ff8d1d976f7a7a52bb551 SHA512 2ddde38dcbdf4b70f8a52443c5e34d31fd893d5ee4ce3cc323bb9b7940b0ccc3fe557cf06b880705624f248924807356646b13815fb49d26a3247bd3c571f2c7
+MISC metadata.xml 543 BLAKE2B 0f298a16683bc03b490a10bf9416315aed7e18e0e515b06f248517fa4fc7528c796649c2aa501414da56ce8778b86bff0a16d4a286674d136cd857b41a3ca026 SHA512 77685230c462bc7947fccb8ca29aa70904496be81fa12f37329ed0726efef277cc1d9a585f77c4577259367cc46d17599bccb7bcc94fb152d60e2275baf1ecd3
diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index 4b3b128c1eb4..1e1436030f14 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -9,6 +9,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/boto3</remote-id>
 	</upstream>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2a7e90dcc6c0..572c1a8ab2c9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,7 @@ DIST botocore-1.15.16.tar.gz 6173930 BLAKE2B 70e185faa9fa3f8537e38e4db8c263f5bfb
 DIST botocore-1.15.32.tar.gz 6261957 BLAKE2B 7825e7d6315cae3578155825e0b5cb3961e5548021d63dad1747903c8f55bede03c4fdb0a07b724e2816ef294a890e85a648bae313620ab4156fd2a28d4e517b SHA512 865612fa52aae3bf08ee74b52a3fe685d7308d0d86bd438851e0b9db639ba3f6430211a7863c1b0737c0af0afc6ba760b2ccfd0103d303e87758317f773cef6d
 DIST botocore-1.15.48.tar.gz 6336322 BLAKE2B 0d25424e82fcbf1376bb1eb9cac9eeb7a45d08698f39563f635a34b1b24bc6823c5f2b08b6a40a0fc9b54b0404b8f5dd7d07fc21e0c7e0c489fe172e7f29a936 SHA512 91d86731909be5828e38a69e32e5189fbd0357378c51a04f60efbcfbb1b6c0c01151c982fc32619e3be240f5df881e5342bbba6b290b3092d9fe11ce9e3b28d0
 DIST botocore-1.16.12.tar.gz 6422375 BLAKE2B 333cc3d42b42b93f952c6344f5196b248291d6114f3bf7e73550bfb712a8a618908acb0b08379c9caae1c8a855bd738cd5f7efeda808799510c740d604459346 SHA512 891c8c2b3b6208d3d8543c055fa48887c58c67845d46a9607ae140d3a17d5b12665cc50afa304647895c891112e35ecc1cacaf36e75d0491109bcc5150be0ec6
+DIST botocore-1.16.20.tar.gz 6442160 BLAKE2B 23ad33e53ebf810087958f003d21fe5874974e15948d26ab8c4f56ff48e7121d09d9f35dd31055bc6ceb3a2c6327a1e9fafbd6909d2d2a7222e81d9ae9a5b36c SHA512 f92cb05b7b14f3036373f5aeafc956ad776ac486343d16275075c2b29d8212859ba7f84f83865027340f7544231d4920af627e1efe194393e5aca028fddfa4c1
 DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e11224addefac31b87b8ce9983350aeaaf862feaf040490fad8eb87d7dde800bd8a77156410e6a734f567e2cc1055 SHA512 1f265a0a8adb7f0172f02448d3be5aeacf11e3fb7023da8d81e6d19c39d97cac99cfe3a70997e682deb44a4fd78304e4a0c1df43787f3139bbccbe852c682a82
 DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
 EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
@@ -12,7 +13,8 @@ EBUILD botocore-1.15.16.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031
 EBUILD botocore-1.15.32.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.15.48.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 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.6.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.16.7.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
 EBUILD botocore-9999.ebuild 1614 BLAKE2B 8a4ee3e4ae8733ab493bbf390bada866cedeaa3139b501566abc3dc8b56b6816328d885c84b2d4b2effe951d178c91641934129832260f07cd0d60024cd88635 SHA512 2a1c6901db5dee864b97e92ff15ae267f58814ade23fdf13e351dbcd7e6e3ed2faa3a189bd69872f0cc1623baf0c9b975ec616f95b4ed624d0389edef98b2437
-MISC metadata.xml 591 BLAKE2B 6a056dc56e9856342e4ab55de897f825a55c6cd00b3fe478c1dc215aee97b46fce8411ad5aef24c0e226fc30ae48dfebdb32be37d412b0ea1ba6c0c955dc5e34 SHA512 5a5539b7ae374116b0b0bca5a5546be49ffbbefe95e76eb70ddbe80542dd693f599e14c46a496074c3ca675aa2b4e587fb1f1480f9c1c0cfc28c7208ebc3a897
+MISC metadata.xml 592 BLAKE2B 2d94b61229bae249eec342b3498d2f4c47d4264ca15e36d3910aa4cfa3bffb147c6abed0fe9be723dc7495076669f6f88c60361cc70a666823ed79ca455d4a7d SHA512 f4b5fa681e115957357e40f683da0dfaf9d6eb92bc6ca85e3095a08da593e6e79fb1e4b79596e98435c9d36aa7be2f3f8c099f75a5306cc514d50cb9ed3dfedb
diff --git a/dev-python/botocore/botocore-1.16.20.ebuild b/dev-python/botocore/botocore-1.16.20.ebuild
new file mode 100644
index 000000000000..be9914c2cdab
--- /dev/null
+++ b/dev-python/botocore/botocore-1.16.20.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 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+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? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${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'
+
+python_compile_all() {
+	# remove version locked deps
+	sed -r -e 's:([a-zA-Z0-9_-]+)[><|=].*:\1:' \
+		-i requirements.txt || die
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index 2f4def8262fb..31ca529a6667 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Patrick McLean</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 5c45624e3857..87d431b66920 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,3 @@
 DIST bpython-0.19.tar.gz 216564 BLAKE2B a0b469ae28965e7926838b2d520aed0199a39ad5d9d5650e34446601e6e5f023a6c09cbdd85a30b2873dc72b5ef5774c483d5f627accaf29dce7e6f8628cc1df SHA512 7c746848671d5de0b63f0284d2af87c12480fa1ae3e89eb10093ab5dfd42f926171f29bd8bcc19fe173fc58f7eff7276da4639d580836f0d112dc5e85000dc55
-EBUILD bpython-0.19.ebuild 1487 BLAKE2B c78099c542f93af4606f439e5c12e1969ec7ccee20a197e40b6c2c6c437873700a65cbdb316f8f47b25ee7adbe98cdac0ebbc7f84e30feae9824e36b4e0f3493 SHA512 c605c91478e64c3c1bf9362d9faafda703211bfe71e37a1d0b5ad79a3f8117e3194f08bf6fb4dcfd7c2310b3f63ea8a3bb96a4e46eeb4042767962fab6409351
+EBUILD bpython-0.19.ebuild 1293 BLAKE2B 78f1b53f228bd067c3c9c8c2af79a6df96d9623f3e531a7334295f2ac54038e4ee2072d3db971bd943b325130e524c949fd116812903a47bdd781a4b4e4bfd66 SHA512 82c75f49d3b0d3edc3f46c0454a1941f13f5690faec16fc9cc76b76fd7afe8f381f7e0aed9ba746ec12dce417b0d4d24658c512aba0e40eec7c9c008f22b80ef
 MISC metadata.xml 527 BLAKE2B 2691755a7de852d518e3646b965483a12169e56dbfed6fd43961d6833d9ef673f8c0ab146a2677dcef6cfc173f3a9f2200fbb39ed870570b8f28ca641c617e60 SHA512 0710368b088d3c9bcd52c93df885a730a4a3e189781dcd1a10d63fe6dfaabb486e972150ebb693ed1859a4461aa1343bb5ccc80772406abed4e0f0f9776329be
diff --git a/dev-python/bpython/bpython-0.19.ebuild b/dev-python/bpython/bpython-0.19.ebuild
index 178c7afd56d5..9e264fef8f6c 100644
--- a/dev-python/bpython/bpython-0.19.ebuild
+++ b/dev-python/bpython/bpython-0.19.ebuild
@@ -27,31 +27,19 @@ RDEPEND="
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/watchdog[${PYTHON_USEDEP}]
 	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+# sphinx is used implicitly to build manpages
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
 
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
+distutils_enable_sphinx doc/sphinx/source --no-autodoc
+distutils_enable_tests unittest
 
-RESTRICT="test" #659110
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
+src_prepare() {
+	sed -e 's:test_exec_dunder_file:_&:' \
+		-e 's:test_exec_nonascii_file_linenums:_&:' \
+		-i bpython/test/test_args.py || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4261e2c16fd5..33589fbb0fc7 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
 EBUILD bsddb3-6.2.4.ebuild 1967 BLAKE2B e503da80c3ddb7e91c6e6628281a7099423773722e93bd8bd953d482635734048f17e9c4987d3fbea31ca42738b1b2188b71ad98c66a6e5bf5019e80cbd3e491 SHA512 57734e1c684ff30730c5b0d996e21d66d8283df43b03dc12b515c6aee203b133116986ec7045766a6e33e9d72287c7d1b8e7792642b7c652002beeb7fe54ac64
-EBUILD bsddb3-6.2.7.ebuild 1977 BLAKE2B 59c5457e5b50c93780b6e6711190950ef8b9b8ed5f147a44eb3879753a2746f2804e8e08af96e350b9185b4210a170b7e23c4f21ce596da6f0677817baeb6782 SHA512 abc4ad9f671fcdb3d7d915ed76c8c26f13c7c48b0c64eb75547cdc5966bd1fdb4688742476b3947cffdd9c9c0a1845c93efcb134074139b252d857cded4d21e9
+EBUILD bsddb3-6.2.7.ebuild 1971 BLAKE2B 55e6bb35310702e11ce16285a5ec888fd26cce7c90aa272535903a317977e038334e98c97957dfed631588e51ffa7bcccc608016bd57ba8ff761440d34b44e1c SHA512 589a573c5ed8fa1a40864e7e98d1bf2619ecbc971a5d1934d543501679584d2c2bfbfc2a2b2fe3105812c154dc6ffac20a0102416f3f7dbe9d22b6c98c6f35ae
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index d4b982c8a5e1..5d2debae7f3f 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index a024c14f473e..cf45feca817c 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -2,5 +2,5 @@ AUX cangjie-1.2-cython-0.22.patch 1056 BLAKE2B d528edfc39765ce5bf89ef5778dbc600c
 DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
 EBUILD cangjie-1.2-r1.ebuild 1028 BLAKE2B d5dc641c6637456b638ede69a88308de34e672b7306911b04a2228f82653fa92cc3e70612ff455792eb02bf55351bd530af271d17ca24202e5ece3ac57960fbf SHA512 376074f3131591a3ce7b5c2cc39b33c50db20dfdb8286e598626db7352923ee0d6b7b49726db34413435695ccb352dbcbd232f01d0dfada60bf745b69e305773
-EBUILD cangjie-1.3.ebuild 986 BLAKE2B a70ad91146c40ebc9e427b3bc002aba40e2114fcfcb30654dd2087a17d17abbdc1f78e4cb0d59f110e2882feb786bfca60ec8637dbf2b384a4311f8760e2e81a SHA512 fad4fe9d0ffd4fdf7a0e4c6c5897a6accb34cb842bb4f679f28195d23a888cf5d72c5b60615e13619ee2daa60f8724322ced2067412d8f5fee56443c9153eb44
+EBUILD cangjie-1.3.ebuild 984 BLAKE2B b8ba71fb202c2dff403be8ceb934aa24e67ed380b9a7b9e272cda5d833ede9778800fd02ea264af824ecb20a7f59b245ccca747f824938205a4b187b1fd97413 SHA512 be0d41d7ff9c5fe75ade77ef9462e6187cc39e8411fc8f40963d0d628677175eae92aace8b06769fbbaca035bbc659518344bb35aca189070f98b12819ec7fd1
 MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3.ebuild
index 96769343a7e8..61b243fd4fdf 100644
--- a/dev-python/cangjie/cangjie-1.3.ebuild
+++ b/dev-python/cangjie/cangjie-1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.t
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index a728fa771c5f..5e9c05ecd7af 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -2,5 +2,5 @@ AUX chai-1.1.2-drop-Python2.patch 915 BLAKE2B df25014f5b067205d3506d420c0dc4925e
 DIST chai-1.1.1.tar.gz 81684 BLAKE2B 0aa285d3545e445f26f0b088c1b721f2dd14094a8f499cf7b2dde378a20ee15e376e43a91a664be9d6bd11b45d9c2f4606ce5de73743c27b6bb76e9bea409194 SHA512 f51406258327d9a49e820f0489d60e87f576c72232c701e99f96945932ed300582e6dd81608e5b262e2645c4e9c5216ec8f52e98d454c994beac8d1d8137dc87
 DIST chai-1.1.2.tar.gz 107807 BLAKE2B 6cedd108f7275c3dd03167c7ad49695d95c27e1b0c752247e170996f001c7690cede7c7ac8de8e374077ea9802534b8386b0bd2da7197f0a47085ad9f9e470fc SHA512 81191b11a8c5c6bd1fbb0c43fe7855d6e6d9be54b4d0ddc42582a23b9df03249a91ba8ca50b5b74e76aab73a101377624e041b6c47ea6cba5267d4b58eaf77e5
 EBUILD chai-1.1.1.ebuild 523 BLAKE2B 7e5b3051c6e808129a34533835b61a2afa045a6aac3702354762a2fb4cda00f39963d193e5e13a5e295185c360dbbecb0fec771cb738238968ae5457d0bd1d87 SHA512 e0bf2c4ecd8eeaa00e2c1614a12e5c2767d2d2b5876e3747b05e443e3c676b50c68645e1c6847a19816380afb761df5e8a37ac01c3923f772e468fb92fb4ab2b
-EBUILD chai-1.1.2.ebuild 466 BLAKE2B b39b9dd2a30f2b5688cbe5e7050d7bd1bbb261e3c0bc8fa27df00152455bdfccb85330eeecf206afb2a4c6627e9b6cf06518cb3fbd51634129fa5d7e39649ead SHA512 d550d0d6868a39cdfda0c19a3b8069387be270fbd407f1d62fe85631701fe53518025d0523e396bdb8ada1535c5c01d08a89eaf085eeb3c72dee28ecd8bf268e
+EBUILD chai-1.1.2.ebuild 464 BLAKE2B 2bfa9f004c62fecb64c53032bf4dfb72ad1ce49eec2dae9cd52888690a3264c959078c4059ad988279d22d2feeed0903616e2f4d0a3312761b6eca1a11cff53a SHA512 c2b7ce169f265a1aee7ba99c5e3993cc4a6cad8abab82223645fb6ef1f3a3743304957321d5bf7a6f5bb482db2edc54a6e3b0cd8fad0c7eef71417b606cb2131
 MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
diff --git a/dev-python/chai/chai-1.1.2.ebuild b/dev-python/chai/chai-1.1.2.ebuild
index f031b5fb0dd8..ff8160b56f25 100644
--- a/dev-python/chai/chai-1.1.2.ebuild
+++ b/dev-python/chai/chai-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=( "${FILESDIR}"/${P}-drop-Python2.patch )
 
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index b54861db3105..9c1385334520 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 630 BLAKE2B 57b38f5036f411d4f0b24940cf5de8543f0edfb7e754df33ba007350dcf2bb574fc25d3119dd24085a0d60f06515e1f94134904d726ee2f6df4409aa200857b8 SHA512 e6d903ab68e043a9ba1fb6657cef8764eee37b195bc5cd15e4e3449b91af99e78fe628bf36b6887d89be0aa6e9ea479a79eb2733e3c503f926f767dfffd51a8a
+EBUILD click-default-group-1.2.2.ebuild 635 BLAKE2B 5aec16896106ba8504b1cf63758dffbc4b112443c62d2250acccaed1e6d6d5e69261733a66d032266f76f93882ac6a653db4a03110ceda9492775445a18ba618 SHA512 032c0a29d680bea4cb25d03e8bea65226d5e13ba5bc97959df5f668cbf6395fb24e2ba46a7cc38a9b69bc820c52d1aa8f4178c72c42fa527a92facc6eae06ff3
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index c43e06fbc852..53e65996a52e 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index eb74746dd2d8..bd81c9151330 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
-EBUILD click-plugins-1.0.3.ebuild 505 BLAKE2B a16018c8b8cf0385accbd10b2505579f59f4e7b3cbbd379be583a328cbabccef95c78f1fc8f51503c1ca52734103382eb893a1bf77d3e62b06ac135e308dbce2 SHA512 e9d429a1937814a46b3a398c539e3ac5994f5821789c5507080da386d8518dc95d2a955ee6cc3ba5cb23405b163ba90aadd9ebd7191e38a1355528a52f0907ff
+EBUILD click-plugins-1.0.3.ebuild 512 BLAKE2B 712326c229d3d0aace82ca6f131be36830d3bf577eabdbfe6f9d519b0d31380766df54459d148ae8fb8d18a9bd160cc82e4dfe246170dc11cf050aaee6c10a95 SHA512 8e7c94c94ded1e7be78b49fe606b04c72137b4cbfc28f12a0a2f974f0df31d70dc7d0f1d58be45427b102ad61ade55bc29ca94f9156c9315807f07c1e81e893c
 MISC metadata.xml 248 BLAKE2B db670c3ae382b7098d9d12959aadf4e3adc1e8d9ca4960e6966b63b88a179376cc32540952c9ad5835e5c41f0c8937c383da2ba2d079d78a868b3274bca00330 SHA512 a16675a6c8b0afce6dfc3591b8c30b89454b6a8aece3431d396a0cf0b32d5e19f529e3e514130881657bbd079347cdc1fc9e8ac5fadc07c3dae3cfaec1ad0bbe
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 0e9e0640deef..118d84f95fe3 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.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} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/click-plugins/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index 316cfff99cfd..63748581306f 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,5 +1,4 @@
 AUX coloredlogs-10.0-skip-sandbox-violation-tests.patch 5312 BLAKE2B bb7ac55706ca89a16d7727d796e586a665730d25f1cb69aa833b24082e42f0f5aed3a5d4f627e2015bb189ea3422ab1bcc2982933a7a123990adf821a7a2fdc2 SHA512 071ac2255ce9e6e4e379065ce377e86c3ebc9e910951d647cd19e15431983cb966eba7e1bb2a2431ecb91aa09f3802a5e365683a2e545e0e5fb2d58432748bfc
-AUX coloredlogs-2.0-skip-cli-test.patch 842 BLAKE2B b6e17539f22349bcd20ba4ec64f03dd2e8e291e7f8e892765cc675d88b338d64f5df12b28b1909d0554eb42bfc70cc564f603d026f05e2ca4fe0952b6021af91 SHA512 98e5e8d207de67abf22d0de5729cf6926802329e1a32977dc95155490cf32c6b94b69f8e78a410a718bae073e4d6d618c515dcd7318b057671bb91fcf84c4424
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
 EBUILD coloredlogs-10.0.ebuild 968 BLAKE2B e13edd601efe9c4d301706fd74a703476181f2d90f66225cb3dbc84de425f36f1a845ea9401a02e821a96ebd803ea3680e00af011faacbb8496b237ac99bfebf SHA512 cfbcbf80a0c0534e97cd30b99ba728d5c3e05847f2a8588fc8c2f4177bedfb54b1808922d32a600654ba2b9151f1c12ae64c5c5d5e9d08edd660f2e57399d442
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
deleted file mode 100644
index cacd016159e9..000000000000
--- a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- coloredlogs/tests.py | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
-index 2010b12..7ab18a8 100644
---- a/coloredlogs/tests.py
-+++ b/coloredlogs/tests.py
-@@ -160,12 +160,6 @@ class ColoredLogsTestCase(unittest.TestCase):
-         for name in 'debug', 'info', 'warning', 'error', 'critical':
-             assert name.upper() in output
- 
--    def test_cli_conversion(self):
--        """Test the command line HTML conversion."""
--        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
--        # Make sure the output is encoded as HTML.
--        assert '<span' in output
--
-     def test_implicit_usage_message(self):
-         """Test that the usage message is shown when no actions are given."""
-         assert 'Usage:' in main('coloredlogs', capture=True)
diff --git a/dev-python/contextvars/Manifest b/dev-python/contextvars/Manifest
index 14cc5eaeb674..a227fcbb7e19 100644
--- a/dev-python/contextvars/Manifest
+++ b/dev-python/contextvars/Manifest
@@ -1,3 +1,3 @@
 DIST contextvars-2.4.tar.gz 9253 BLAKE2B b46466e44f836561024b69bd648613654336a41f964ced77ab29e2fa20b43b19f0c6b5b72d31ccf208c8b74ad54fa1898ac1c09b24b124ec53a5970019910553 SHA512 391c12f163854a21d6422afd9464e8896c02b5cb5e2c567550907a16b7970d4e2d02cd360851bba103efd64062669596eacadc7421432198c61054837b57b223
-EBUILD contextvars-2.4.ebuild 524 BLAKE2B 3233c744a77b29b140efef6c7b0545dedac53a4d9bfc4a5ef6eb2edb4839369f657acdde2ed04fffb21544c51ed6d9caf8293762b275ff498e3721bc4f36df83 SHA512 f348f76f45e4af67032eae5ae03c5b82b742bf425c06c136673c227d83ba923fd6254deeb901430a9c152eed88c6ffd7dda21822009c0f0cbabc76dadc39e4f6
+EBUILD contextvars-2.4.ebuild 522 BLAKE2B b501b04c29d1f82198310ac6065b4d5c159e3e27e9ae028b2ccb1c8e6c29fc8edc51672cf9eb40b52503d52983fc7fad8c57b89885931bb834b05778e698ab55 SHA512 ac2272e69665782d3c7d66659d5e90b8752c16b3d3775706915b14332053f38852bba7ad7094d515202ac442b31db0282990c242ceff2275b54b98812410a532
 MISC metadata.xml 354 BLAKE2B f7fae56b019c0b03a1e699cd23711fa067c36549b7164f7d4f4aa1001f49d290d1dde42a5fa8c57cd77f20454181f259723ee6847ac38e97c7fd46235901b201 SHA512 79f19d5d674af1a45bfc90fe9bb2e4fe9e21d1fc195e6475b9a7c28014dba29a45fc49787b5fc9c2d7b33dc8ff6ddbc7a4710e296064d4fd097bbbc0df6a0ab1
diff --git a/dev-python/contextvars/contextvars-2.4.ebuild b/dev-python/contextvars/contextvars-2.4.ebuild
index 4b3537ab3fc9..d0d2c47baf94 100644
--- a/dev-python/contextvars/contextvars-2.4.ebuild
+++ b/dev-python/contextvars/contextvars-2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="dev-python/immutables[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 5132e3b33c96..c935db012986 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -4,7 +4,7 @@ DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648c
 DIST coverage-5.0.3.tar.gz 679171 BLAKE2B b87b256ecdae0b63ae08ed1aea9ff1f4177ec5da63c18615d66f207c3b7c71da4730432bfbdb66a8b55fa2056016226b09befdfc5d0fae57ccc56f08b2690b38 SHA512 51c648b4529cc84534865ee804bcd3dd35a6dcb23f20feb3c4702025b924de3a010fd8d08238eea926ae1874c5510ff006bc120e10d01db795ea0af6fb82834c
 DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
 EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
-EBUILD coverage-4.5.4.ebuild 1751 BLAKE2B 352c85a2d73b7038051580f07e2abb6874c4677c221a4bf02986b4af7e7b628b58bfe2fdef6ac4a6a4bca361942d7620e9cd3127bd7280fb2ce75591bbeb463a SHA512 e55db96e70c45bba7ba91c75a6857a6c1e81f725ecffec7f60649641c9648b5c3eeca8ddd1a6353249911b7d7e8fa2ada0a3e0fa3139b3a365c174d149d65200
-EBUILD coverage-5.0.3.ebuild 1646 BLAKE2B ecd044c83b02a4ee483312266265e63c821a861684bd520d4a9cbf9d9d1d92b8e81f91221b0f11c91e9c7a0c5c952973793c6b9a929443af4007271c96ef0ebf SHA512 d674c6104d6747409a33612f90b93960fc13fd7316cf14e76a75c948812977f428496e467d22280a9f79445649670ddb996475f1739ad1a89fd7cb07cddff354
-EBUILD coverage-5.1.ebuild 1791 BLAKE2B afac14009fd9c296df13bd77323f3ec6448826a36024b026e24c792b37b71af6b4711f33cc9ed31c7bb2f72b03463137944cb325d39009b0a74d3614ff946c6e SHA512 fdb92f3672e74b8c5a283a9a512abd896eb66c902406c924ac3a9953e36e45abcf0c0c4db5e96ff52f5b896fddbf60a2a4a7362ca720de37d31912bd20a6dba9
+EBUILD coverage-4.5.4.ebuild 1783 BLAKE2B fc7622f8233718024e34a5f96ee1999d68cbfb159c3bf27fc985b0ae6a2401d068b3b6215902b08abe0299dd3f5a6245b6a1d982e6724a829bfbfe5bbb640a2e SHA512 3f00e2ace77c07d613e199a1dec273007fe4fc92630d8679685307688e899429e988a4953cacda53bce715c47dd4c1cda8c86682e12cf73f05c8f3fc2457abd3
+EBUILD coverage-5.0.3.ebuild 1684 BLAKE2B 08528daa45b1fc2393876b31d63b10ad7cfdf972b17871577376c930a2adebd2632d6e4f92e57faee2117a9514c40be4bcd027f277d24e0190ccff2d0c68cab1 SHA512 ceffe7d77017e4d9fdd7d356d868d1994eef1582c7909f5b30fbaf7e8263d9b4eb6305d2015f0e6dfc8574ab3a044d86bf714b54008b285e73cc68ef87c66017
+EBUILD coverage-5.1.ebuild 1830 BLAKE2B e71216e07a73d2cf11d8afa6f7239cb10009f0325f39cbeebaaf86b657191bfa71f5c83c25bbc7cd35a85615c72e1e273cc3df5f40c84d4a7fbdd0da0c588a76 SHA512 cddc8b00d3447d4167e3d7f5f87b1e01466b37bff5c77f63c019c29a45947c650afd8bab017af46fa543ecfc14ebed34c86be4f404cf2505becfb5c32bcdb7fa
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 20b1ea189252..ffeefae57a23 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,7 @@ BDEPEND="
 		dev-python/PyContracts[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/coverage/coverage-5.0.3.ebuild b/dev-python/coverage/coverage-5.0.3.ebuild
index 87f93f4544be..b9b19d730594 100644
--- a/dev-python/coverage/coverage-5.0.3.ebuild
+++ b/dev-python/coverage/coverage-5.0.3.ebuild
@@ -23,6 +23,7 @@ BDEPEND="
 		dev-python/PyContracts[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/coverage/coverage-5.1.ebuild b/dev-python/coverage/coverage-5.1.ebuild
index 7e9dfd78916a..618b04743b51 100644
--- a/dev-python/coverage/coverage-5.1.ebuild
+++ b/dev-python/coverage/coverage-5.1.ebuild
@@ -26,6 +26,7 @@ RESTRICT="test"
 #		dev-python/PyContracts[${PYTHON_USEDEP}]
 #		dev-python/flaky[${PYTHON_USEDEP}]
 #		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
 #		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 #	)
 #"
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 9413528871ba..41995e00d159 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
-EBUILD cppy-1.1.0.ebuild 449 BLAKE2B 01e5ce8cb5e6d89160a0bb19500a26bf59a4da42d5ea3a676c2f0d670f7038e7dbbbf57df9de9b15b285a987a3a2bec2118e8ea299468a40d0eb02eac39e9ea7 SHA512 0df8fe61d304631b72a510935aa803d4fc6b8e9f45f4adb8b4132dcd4cd773bd2e50b1def5d01377fe5b3fc6d858baf99133c9764a73a6f8f906c1aa1e08a599
+EBUILD cppy-1.1.0.ebuild 454 BLAKE2B a2f7485e99c15fc2dec102c96e126aa23743ec6e1c8db337d9d62e38df8d7c66c291c703a4744cf503cd5514136b963fb967f97e4d2695405442705fa22c33e8 SHA512 95f06ba97977f9f568b1bf475a6fef9c298e67f6d566df6909085167c82c59462c8dd0787c327e7ba6719cca2d7b6c5daac06659584225356be61e2d93d733d8
 MISC metadata.xml 724 BLAKE2B f0d1175b26d8ca5c4bcd9676125eedbd33b266bd3592ad92a6917c526b4ab3e8bb12713f69699ff672a488573b2d78e49d14ddd82760b131b18ff431a91d543e SHA512 a002b0b11b089c398b7cc46d900a3e33a2573c33a27a4df6ac18cf9ce974c3ffa7c07d549f6cf95c8c3c9e56091620e94436a57c1b671ee11d8bd15f36f36671
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index ae05dcdb054b..6f945c4debc3 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index 4b5b5156c054..02815d75acd9 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2.ebuild 827 BLAKE2B e11473043a2bf2a64767ca5910d54a8ae40d7bd7dee45c44a1421b40258aafde0a5f3150b62263382f3d4a34702ca6cd66da07cbaf10da182bc683bf5c9b4323 SHA512 456a331d7a94e6ffa9f359036aff842efc3636278ff4fd76aae0e018a1a3f5d69c28a175b36b1a7cfec2e6c2841bffa1337b68190a72184ae496a100962a7513
+EBUILD csv23-0.3.2.ebuild 832 BLAKE2B a16a8570af0dfd392aa6d6aa2bcc98bbd2dc40b1f4eedd9c8317974335ff946dca2cea11d0f1a2aceb1f9527ea36c0835664ba7b79600d743e897f1050e2effb SHA512 e80bddd33800f9b4362bbae4dd9c2fbcd554bd4fb5559a877809278514d499afbac65a9d303530ab234a5bd8252d4cee7bade249dfe3b92b63afc74a97646396
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2.ebuild
index acf262762670..dd774623cfe2 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # note: upstream really uses mock at runtime
 RDEPEND="
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index b1e142a6b4a0..041cf04bcc59 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,4 +1,4 @@
 AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
-EBUILD curtsies-0.3.0-r2.ebuild 795 BLAKE2B 6b6e96cf602de67ba9f50572fb3547053756523d4cadb35506dd5fee55ea21e57e2319b4eeeaab0df143b135f44af58ebe6500233390de185dcceee6ea6ae946 SHA512 186167046443bf4c3088ad24398c6e20f37975a527305af9f8196de7a130bc869c71b87e48c2cf3f3db886355abd23af509ceb0f2912695b617a6cf509b02987
+EBUILD curtsies-0.3.0-r2.ebuild 685 BLAKE2B f07f481b5bb42e2fd63ea3be553a39289f57f75d325d5f96ab58904a2106f2d51f865bfcbbdb9be7cf6a810d3fcc70abff80369cb33f053eb31f1852941d6942 SHA512 b9a44eca87130792ce8388552e62275cd1cd6d1b4096a4ac79ab71795d8e7b2f2ec43831c14a654680a892a0077632f7c02aa0bc55a661ffaf37451667d57a98
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
index 72e5411576e2..77763052bb44 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,23 +14,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
 	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyte[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
+distutils_enable_tests nose
 
-python_test() {
-	nosetests --verbose tests || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 64f528485499..5f7da74f75d3 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,4 +1,4 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
-EBUILD defcon-0.6.0-r1.ebuild 581 BLAKE2B 5b4c6681bae1285915352272550e1ab3b5a0757c3b38be163a645873ca8a7fbb99791ecc00be788e93eac1093f2343bca52a6c0c2006f313194d0c36edf3d0b7 SHA512 bc7e249c159022737385f40d21c046e34e8cce89fb5d6845921712952abed55453f946206178f4b7d06566ec5b13fe564e76e43d46c9b079911c835df53ff187
+EBUILD defcon-0.6.0-r1.ebuild 587 BLAKE2B ceb12b75b0c3354c309ac0fb6b7cf82ae1ca8593b96e5619a1cc7949627f8dc2d252c64dcf79c7144883c34bb197021e2b19aac927fab7bc4fb1396e278e09d4 SHA512 299193a8c4c8da58d90fc3457edf83674da5e2f33575bd32b9801b2bbacffbecc3bc4fdb52899f9485a883a1b48259b9f405a8651140294f60b7fae303f02685
 EBUILD defcon-0.6.0.ebuild 550 BLAKE2B 8f51dddccd4986ed9c0b63cc6a5e9e5a59aa1900788710ec261eb0db1eb56c457fa64e24e8765c18bc7fac66629d48ac7d219af0d7f27b560d17f6b7e1c6ac83 SHA512 898848cd36ffcc28c34d1ebaa72e4c9383140a2a9265f6dad87a72dd5cfe38b3c682df29ca90c9644da8020e279a8df84c53928ed26873b59812f1f99f434fde
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/defcon/defcon-0.6.0-r1.ebuild b/dev-python/defcon/defcon-0.6.0-r1.ebuild
index 5fc00d82572b..bbe1598e7702 100644
--- a/dev-python/defcon/defcon-0.6.0-r1.ebuild
+++ b/dev-python/defcon/defcon-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 321e29b3f610..9ab7934fe8c2 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,3 +1,3 @@
 DIST distlib-0.3.0.tar.bz2 848089 BLAKE2B 70f88b570229e2ab4c95bd8da0375aba189f66dec8defcf8eedf1be6924d93bd20b54c68e5fba867a6c68a31d4ef926ee2dc18ccb0391278680f30a62d0cd251 SHA512 01b0e7d59736414a241efdf883e4ee63eafe9614ce3b4147781a5750d25d6383543146c5277e3e0d3e11ce03693afd0331c6e3416776a6f84de7a4d9dadf3de4
-EBUILD distlib-0.3.0.ebuild 1419 BLAKE2B a7447a927415e18384da41955010c5dcdade1b34ce3251dc402f02d57e3494c85c3e07959ca551f042a78fcf6c69f1ebe3ff0df97eb81e06cfe9e16e8f77fbb3 SHA512 f97861333bd3d0ca5426d16d24220be60612b3c60cbea1152956e85c57f467c12142324104b524f9f0228ca7df544445a8018fe309ce0a7fba46fab7d8f95b4f
+EBUILD distlib-0.3.0.ebuild 1431 BLAKE2B 08ab1319ca0b2bc8e3be5dcf9f59c04fafc4a4337df3f62900fbde378d93765720e98b4c39826f646192369beee147290d28087ed261c3a2c63a1491db16b96d SHA512 33c6358e130619fc283172c1d4d3f00438cd481eb245f2dcd733e882ab6fd77a5434909a9d193a7e93bc804e14b14e6311312c9c7405d5da2f4a78c43d962a63
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/distlib/distlib-0.3.0.ebuild b/dev-python/distlib/distlib-0.3.0.ebuild
index e9f016019ded..f175e215cd6d 100644
--- a/dev-python/distlib/distlib-0.3.0.ebuild
+++ b/dev-python/distlib/distlib-0.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 66e0f8aa828f..ddc0e44bb52d 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,5 +1,7 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
 DIST distro-1.3.0.tar.gz 48067 BLAKE2B b8dc48dc82e96c674c5fedf2f55167fcbabacde59954ce978085f0a05e5184bf8c323c76208f2ebe0a2cfb6ac41ce0351774ba6ba02dd13b22a7506ce3e5cf58 SHA512 5a3e363b7dbfb5f70967937d04b566e5c8aea10b6f3b9be7485e6f49130766ec5480ce1c1c14ec759e38b2488ffa697478246e53be72ad277cf3bebac7dde741
+DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
 EBUILD distro-1.0.4-r1.ebuild 580 BLAKE2B 20955997a8892260da7ae6bc2f293524de87d1afdbe1523fbe3c37253cdd8ac62dd6a1cc1835c428df8a6d3efd515641a3682bb258c3978413579dec82ef2b99 SHA512 72dd237a708854d166a549604dffc17286d79292ab6f5efb45246a6602860650a12ff0069327b0d8bc805ca35866edbd8a1da8ce1246fa3c638ecfb7837855a6
 EBUILD distro-1.3.0.ebuild 539 BLAKE2B 2b9294525e0b33f59b4ccb0b139812fab643953674af98f0f01219a76b7624edfa24ec1c5d88bc424b909912d8afac50c79604ebd7ae0f33793a2afd37ed4550 SHA512 1b82d1ed544e53fbc8658e843678d378c819fc933b5e5c9c8c272f0b44746f99153c2fc082c9238f8a21e32124fdda91c31f9e39c00f35b5efb69b6b914156bb
+EBUILD distro-1.5.0.ebuild 539 BLAKE2B 2b9294525e0b33f59b4ccb0b139812fab643953674af98f0f01219a76b7624edfa24ec1c5d88bc424b909912d8afac50c79604ebd7ae0f33793a2afd37ed4550 SHA512 1b82d1ed544e53fbc8658e843678d378c819fc933b5e5c9c8c272f0b44746f99153c2fc082c9238f8a21e32124fdda91c31f9e39c00f35b5efb69b6b914156bb
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
new file mode 100644
index 000000000000..bd0a5473a71d
--- /dev/null
+++ b/dev-python/distro/distro-1.5.0.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
+HOMEPAGE="https://distro.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index a05713a79adf..9d54b02b6c5f 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,8 +2,12 @@ AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fb
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
 DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e41eb88670517eeec84043083cc437d95301d86798b5945313b515d63bd12cba8484e74b6da2311af2e86ce87adc SHA512 b33ece4606e5a23626caee121018522166a0e1f32bd41ea4eb3d4c1f624943990a07e04c5a4f5d52958e733790178474e9314d346ce1e4d5d6e49ac2a700c857
 DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
+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-3.0.6.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
+EBUILD django-3.0.7.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
new file mode 100644
index 000000000000..2166d02e126f
--- /dev/null
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -0,0 +1,77 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+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"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.0.7.ebuild b/dev-python/django/django-3.0.7.ebuild
new file mode 100644
index 000000000000..68d6de70d162
--- /dev/null
+++ b/dev-python/django/django-3.0.7.ebuild
@@ -0,0 +1,79 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		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}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 9a78860cbbd1..033a1fc221f2 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,3 @@
-AUX docutils-0.15.2-tests.patch 1547 BLAKE2B 361285ad1ffd4d32a7e04b5e9e56a9dd91c69475a5c7b9fffd64b6735d789b4793ec35d0fa733d016ffd4eb5c97a8a8baba64bbb79b8f5cece71e9f4d3d947bc SHA512 83856452008c041295659c95e45d477672a1faedfae642d3980c3ac416864a77f21bdaebc88b67f43f7da87a92b3bd6baf04e37f44c66a46e2bbc941c0d75131
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 EBUILD docutils-0.16.ebuild 1871 BLAKE2B bd400bcb45b3c0c403c36af98b18a5b9e2ca199b7753f00419c286399e7f641375aa86873aa92b36fe2d72f93c6a54fe2aa3c222f12fa443f21dd862549eec8c SHA512 56b6647e9c484334a1bca6b41ea80f13d31a37295e7cf24b3b9389e2df198651b39f1fa2655f0f84ef0bf9b1c96bca4b960af2e6cded0bc469c05187ad505ae8
diff --git a/dev-python/docutils/files/docutils-0.15.2-tests.patch b/dev-python/docutils/files/docutils-0.15.2-tests.patch
deleted file mode 100644
index 11ccbd01b90e..000000000000
--- a/dev-python/docutils/files/docutils-0.15.2-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru docutils-0.15.2.orig/test/test_writers/test_odt.py docutils-0.15.2/test/test_writers/test_odt.py
---- docutils-0.15.2.orig/test/test_writers/test_odt.py	2019-11-25 19:38:23.327374852 -0800
-+++ docutils-0.15.2/test/test_writers/test_odt.py	2019-11-25 19:38:13.585433399 -0800
-@@ -38,6 +38,7 @@
-
- from __init__ import DocutilsTestSupport
-
-+import unittest
- import docutils
- import docutils.core
- from docutils._compat import BytesIO
-@@ -146,12 +147,13 @@
-     #     xxxx is replaced with a name for the new test.
-     # See instructions above in module doc-string.
-     #
--
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_basic(self):
-         self.process_test('odt_basic.txt', 'odt_basic.odt',
-             save_output_name='odt_basic.odt'
-             )
-
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_nested_class(self):
-         self.process_test('odt_nested_class.txt',
-                           'odt_nested_class.odt',
-@@ -166,11 +168,13 @@
-                           save_output_name='odt_no_class.odt'
-         )
-
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_tables1(self):
-         self.process_test('odt_tables1.txt', 'odt_tables1.odt',
-             save_output_name='odt_tables1.odt'
-             )
-
-+    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
-     def test_odt_custom_headfoot(self):
-         settings_overrides = {
-             'custom_header': 'Page %p% of %P%',
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 501f0ba82463..5e6b9d941c1e 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,3 +1,3 @@
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
-EBUILD eyeD3-0.8.11.ebuild 592 BLAKE2B b35b6ea614e9c77d316b470b3c911c7ac2184ccb313425aaf33b76f31d52d8664645bce740ef52a198433742fb07b03b0286d1958cc25f097446fd139c78b904 SHA512 abcd15098c4a7d46105c1db17dd37d82c1d18e7e2bbc8ad3b5140e04341c66719aa9fc5f66c0b47f3f656a58111cacdd0be4b96181ab5bdd64680a117f19a7c4
+EBUILD eyeD3-0.8.11.ebuild 593 BLAKE2B ea9b10db1e2066ec5d4ce91bc0510799d08c387ecea1ac9b77ced3ed00a8aacdbc312710d4024a5ce8708497c6afd956d29d3a778284716ac3905568bc002d37 SHA512 2dfaf91188c6ccca84526487747c95c482c1327d8d5b24a2c92d770717c032f708b31f25b8f0f997aea4273753b553f43078e4d576602f7125d493f53ceba692
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index 6cabc966a145..214716f6647d 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
-HOMEPAGE="http://eyed3.nicfit.net/"
+HOMEPAGE="https://eyed3.nicfit.net/"
 SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 2d238eb1214c..93dfa7836478 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,3 @@
-AUX flask-1.1.1-py38.patch 1134 BLAKE2B bc252d38ca5c49ac7a327b50ee62eccb26a81f041a81fb6996fba790a6ec0f11b004fe90917ef4d90238126a17bb9864f81843f41edc7e43795acfb382799482 SHA512 ce43cf60c59aa17c716802779c163231435310b1942dd02373da51658119922bd6707b910c23dea49a9727f5a6a82219893ad3918384e7ebe3b5025bb4f7a6db
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
 EBUILD flask-1.1.2.ebuild 1331 BLAKE2B c9721dad0a9e94b65f4c7b3f6b1afe645c7a0a5a8821bb5a51ba605da4ce9156186fd98c1ecfe48338510461c201fb523735e5a4383926b4bbede44e93ca9f84 SHA512 9fc78e36f192338d60fcced3d749de5030a28a8a0137d2c605c4cfb7fcd9829c1d6614dc6894f5a5544f3e5d21beddfa4002785e06665f13cfa247d863da021b
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
diff --git a/dev-python/flask/files/flask-1.1.1-py38.patch b/dev-python/flask/files/flask-1.1.1-py38.patch
deleted file mode 100644
index a03aa445137b..000000000000
--- a/dev-python/flask/files/flask-1.1.1-py38.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit c367a86cc5be70da4928b276d0218f98df6e854d
-Author: Fernanda Guimarães <fernandaguimaraes28@gmail.com>
-Date:   Mon Oct 28 21:37:25 2019 -0300
-
-    Test test_send_from_directory_bad_request no longer fails in Python 3.8.
-
-diff --git a/tests/test_helpers.py b/tests/test_helpers.py
-index 78a56221..21735af1 100644
---- a/tests/test_helpers.py
-+++ b/tests/test_helpers.py
-@@ -11,6 +11,7 @@
- import datetime
- import io
- import os
-+import sys
- import uuid
- 
- import pytest
-@@ -780,12 +781,17 @@ class TestSendfile(object):
-         assert rv.data.strip() == b"Hello Subdomain"
-         rv.close()
- 
--    def test_send_from_directory_bad_request(self, app, req_ctx):
-+    def test_send_from_directory_null_character(self, app, req_ctx):
-         app.root_path = os.path.join(
-             os.path.dirname(__file__), "test_apps", "subdomaintestmodule"
-         )
- 
--        with pytest.raises(BadRequest):
-+        if sys.version_info >= (3, 8):
-+            exception = NotFound
-+        else:
-+            exception = BadRequest
-+
-+        with pytest.raises(exception):
-             flask.send_from_directory("static", "bad\x00")
- 
- 
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index b4ec3b4ac05a..03ef3ddf401c 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.12.tar.gz 11286 BLAKE2B 9286d9d53bfca515ff01d329decc61201b8bc6231db8700d920530b21b8a213769f4c092ea4af901168ff31f57641f46853cd9d52a6a90398ec8b6ec67b7fb0b SHA512 d7059508908c6bc7f421d04c0f8dbc9884015009b3601822489119853d851f2bf3aab941a96d19b354edf3c9c377625d0faf7b92f7a63a6d597e6ceac4abcf2d
-EBUILD flatbuffers-1.12.ebuild 423 BLAKE2B 500bab2331609fd732c2de40c83a3b4d0d5e39b38b8ac2aacc5180267f884d146c3f4f03ea265019f0d08ca035aeb5702da99a56b8114620966174042e7d6f46 SHA512 78dd4a6bff070c547cd51abc6c5b25ff1fd5a0fec20c64aa3b674fe77afd7aa0b0867b880e9cf67154c86da49475039abffecd3804e7148668f3cdc4819db981
+EBUILD flatbuffers-1.12.ebuild 430 BLAKE2B d88572b03c58915b4167dd1f1258e71bc787dbc2157c317513abd960ce6c6f3aa839801b45a2852ae9d0054a0bc4ae80c39b6e464ef8364ea50733cd27d79cbe SHA512 8a2de7fab8dae686cf736325238c9613c09c038077fd52c032e5ba9e82d64c525efe3e26691ffca39fb05af52196ce3519f8a4af9c3b05e0903c24fcabe25bb9
 MISC metadata.xml 341 BLAKE2B 977ad4559ebb4cc73818553b4a725b63516d5522e170726818c01800a692729394c399bff12ce4e1e9859ac577b3b47673901f76e1a8c431b59e9a2f51461a59 SHA512 bfb03828d98e2316bc1614f2491ccfcfd5f1f3a858397b40755b64c6f550391061fba3933fcf28f11f881145f90754a7d5d28396a574c8a16c2040deaf364de0
diff --git a/dev-python/flatbuffers/flatbuffers-1.12.ebuild b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
index f6e07681c316..b4fc7d6ebf29 100644
--- a/dev-python/flatbuffers/flatbuffers-1.12.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-1.12.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 4dc7443d4f88..968bfb6deba5 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,4 +1,4 @@
 DIST fs-2.4.9.tar.gz 126022 BLAKE2B bd7406ee0c22171af349bed6096f58bc749af30f3fae6b8532d7a2b07dd7f0a55165f4b4ab413d6ff7c8861fbe7784ae383a984d26c1cdb1bdc9100c4ae0b0df SHA512 594536eccc043547df4ec4fd1fc507d3fad2838ebb46768a11f142c68d42a776f9fa3cda8651421c6255314835a0283407ea49ebdce04af84a1646efaf5391e5
-EBUILD fs-2.4.9-r1.ebuild 1387 BLAKE2B 01462723d75efca38d1a5265b5374f38f5317b9b58f2314b7c54f656cc3baf5e438a455f9364bfd2c98ff3232f02241e6582cacc9aa3187e7220344e17aa21e0 SHA512 4964cd47da3a6f9402e48cdad771dc4cc9fc610604cfb8ac96e4c338f8a819ed1a132e2602a04ee403caf1a122c1fb3520380fb07f6c54e4a3aa1bed423df4de
+EBUILD fs-2.4.9-r1.ebuild 1380 BLAKE2B ecebbb4fe9b981fea30334d7fd9f115915330f320558fdd48780d10984cd4cf57d828376cb620171b8339073b7e1a35a67f0a1b4f0e17effc00974537ea7257a SHA512 8ad7554a95461a3eecb5fd2ccab274184d2c3a03f5a43d90135f2f5e21f4b71eed004e448fe7da3675c4fe90a5496481ca32ae89f940f5d6bfe14f4db84c6dc3
 EBUILD fs-2.4.9.ebuild 1376 BLAKE2B 45b632ac7d1b5eced7f0de3f32bd14568423aa001af745fe316567c67f269383abc6869b8022cf70aeb6ec99db37520e349d69f70bbd1a74c756f8f23567e8d3 SHA512 c8123c0669b7146439444a44e1ff12f65f3b951bb4df2323873e93a22f3a8aba845a16874f154a05e3222fc31d1012733a6ffe25bb6489b552e3d197a4f01302
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.4.9-r1.ebuild b/dev-python/fs/fs-2.4.9-r1.ebuild
index 7bc6c8c04459..6bb49c26d481 100644
--- a/dev-python/fs/fs-2.4.9-r1.ebuild
+++ b/dev-python/fs/fs-2.4.9-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index f5b403945b38..1cc612a277d4 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,6 +1,4 @@
-AUX google-apitools-0.5.30-abc.patch 2828 BLAKE2B 52f328e0701002fbc95f2749329e03a682a15113c693030cc3648ca7432b05a4975d2b4437a76bb1e40232d8317cdf3db7e3e3a14fab780326526a494fe05311 SHA512 d53104ebded8c19a4ef74f721056c107b7be42c5936215d4722672e8ace02d4adc2d7fb8589d92b3025950c2535879c4e79e1ab43fa6ac2dfa1ea6e48594aa47
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
-AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
 DIST google-apitools-0.5.30_p20200507.tar.gz 365250 BLAKE2B 58d52016775b387b494d8b5897886f059fe74a360098f6527089039469d4d4e3c0d9ec63a12be1215741fd15a1a03e2204f54ace7c9eaf8bbdc8236c9c1fe576 SHA512 94879360c5de3d7405b7377b2baf0fa303c1b0bace56cf75d203b0a509ac028e1d3208a82ba08de7d17e4e26571c9b8601cb07e6897b658eeede9d06fd384fe3
 DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
 EBUILD google-apitools-0.5.30_p20200507.ebuild 1053 BLAKE2B e52b88a54e0140f768849d625eb80208c4bb0831785d4f630bf84ff71f5a350e8c3b3e8dafcd64d77ef588289e457e392bb7da130d33e7ca000962f7d5a254c5 SHA512 bcc2bd37d218564d257f3b72de3200398851a0816fbc2bd9e373ee6700d9b0d49b3433d55bebc835e383d246b3c48385ad7f76297c6a3a183b3e4df3dd2c30ab
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch
deleted file mode 100644
index 32f61a3d889a..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit cfefe5a8322b40c6e7bd3cc794fd644edcc3a6d6
-Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date:   Mon Jan 27 20:21:15 2020 +0530
-
-    Import ABC from collections.abc instead of collections for Python 3.9 compatibility. (#286)
-
-diff --git a/apitools/base/py/extra_types.py b/apitools/base/py/extra_types.py
-index 847dc91..e40a785 100644
---- a/apitools/base/py/extra_types.py
-+++ b/apitools/base/py/extra_types.py
-@@ -16,7 +16,6 @@
- 
- """Extra types understood by apitools."""
- 
--import collections
- import datetime
- import json
- import numbers
-@@ -30,6 +29,11 @@ from apitools.base.py import encoding_helper as encoding
- from apitools.base.py import exceptions
- from apitools.base.py import util
- 
-+if six.PY3:
-+    from collections.abc import Iterable
-+else:
-+    from collections import Iterable
-+
- __all__ = [
-     'DateField',
-     'DateTimeMessage',
-@@ -129,7 +133,7 @@ def _PythonValueToJsonValue(py_value):
-         return JsonValue(double_value=float(py_value))
-     if isinstance(py_value, dict):
-         return JsonValue(object_value=_PythonValueToJsonObject(py_value))
--    if isinstance(py_value, collections.Iterable):
-+    if isinstance(py_value, Iterable):
-         return JsonValue(array_value=_PythonValueToJsonArray(py_value))
-     raise exceptions.InvalidDataError(
-         'Cannot convert "%s" to JsonValue' % py_value)
-@@ -212,7 +216,7 @@ def _JsonProtoToPythonValue(json_proto):
- def _PythonValueToJsonProto(py_value):
-     if isinstance(py_value, dict):
-         return _PythonValueToJsonObject(py_value)
--    if (isinstance(py_value, collections.Iterable) and
-+    if (isinstance(py_value, Iterable) and
-             not isinstance(py_value, six.string_types)):
-         return _PythonValueToJsonArray(py_value)
-     return _PythonValueToJsonValue(py_value)
-diff --git a/apitools/base/py/util.py b/apitools/base/py/util.py
-index ac1a44c..ad086e4 100644
---- a/apitools/base/py/util.py
-+++ b/apitools/base/py/util.py
-@@ -16,7 +16,6 @@
- 
- """Assorted utilities shared between parts of apitools."""
- 
--import collections
- import os
- import random
- 
-@@ -30,6 +29,11 @@ from apitools.base.protorpclite import messages
- from apitools.base.py import encoding_helper as encoding
- from apitools.base.py import exceptions
- 
-+if six.PY3:
-+    from collections.abc import Iterable
-+else:
-+    from collections import Iterable
-+
- __all__ = [
-     'DetectGae',
-     'DetectGce',
-@@ -78,7 +82,7 @@ def NormalizeScopes(scope_spec):
-     if isinstance(scope_spec, six.string_types):
-         scope_spec = six.ensure_str(scope_spec)
-         return set(scope_spec.split(' '))
--    elif isinstance(scope_spec, collections.Iterable):
-+    elif isinstance(scope_spec, Iterable):
-         scope_spec = [six.ensure_str(x) for x in scope_spec]
-         return set(scope_spec)
-     raise exceptions.TypecheckError(
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
deleted file mode 100644
index 6003db87a97f..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/apitools/base/protorpclite/descriptor_test.py b/apitools/base/protorpclite/descriptor_test.py
-index fc27ec4..d518e24 100644
---- a/apitools/base/protorpclite/descriptor_test.py
-+++ b/apitools/base/protorpclite/descriptor_test.py
-@@ -16,6 +16,7 @@
- #
- 
- """Tests for apitools.base.protorpclite.descriptor."""
-+import sys
- import platform
- import types
- 
-@@ -78,7 +79,7 @@ class DescribeEnumTest(test_util.TestCase):
-         described.check_initialized()
-         self.assertEquals(expected, described)
- 
--    @unittest2.skipIf('PyPy' in platform.python_implementation(),
-+    @unittest2.skipIf('PyPy' in platform.python_implementation() or sys.hexversion >= 0x03060000,
-                       'todo: reenable this')
-     def testEnumWithItems(self):
-         class EnumWithItems(messages.Enum):
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 9c30c0c81147..453e8bc5f9fc 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,6 +1,6 @@
 AUX greenlet-0.4.15-Add-support-for-DEC-Alpha.patch 1794 BLAKE2B b87a8ebb4190c845b18e82b1218fd7c50164835d9280b780b161fadf25c5b2556f443512e10dc83a506dee5d1d622fcc235d0348899f9027d1ca4469dc0d0caa SHA512 d09d5b9f3d6527d40bbba1a0ad4c7b5f7c80078a80a6820e0626ae7832fe78553cf14c0604f126fe4a53e74dc7f14a6f85dc6822d8b19c37963974eebd5b18d8
 AUX greenlet-0.4.15-py39.patch 1760 BLAKE2B bb2c8602c838c2187b3f7090eb49571548962700947c89a00f7e1ac742f5a19ada33a0311b84830895acee88162014b7a3dca3aaf6b4e974dcb73f3d4d07bc63 SHA512 76d205c0e00e1c08976a84093f49c478483cea8dabd05c69dfb138e25879a5eced3d4ff00f1f7c0d34f251804f14d8a73658d2119cdaebbcf1922203014882d1
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.15-r1.ebuild 951 BLAKE2B e9843a61cd20e4d9e9cd54a65b48cb575f862209a86979c85ae12f37b04f5b985decdd336a7fc89bd3574f58d678c7de7c3030ad36a1cb8d55af75dc975ac448 SHA512 e300b988b4a36326ef9a25bc29cf3cda68d3e6da1f5796925ef379bb6520310a17e299594ed27ce838be04caf2084737b8720357d2ddf3a54e2861636f79fc93
+EBUILD greenlet-0.4.15-r1.ebuild 945 BLAKE2B 4f1efa470209da763646b2fe8dda817c0f7233098a83ad6ef0e0ca4fcd121311c64adff035175e37356ea9f8fd9ee2bd8365b849725600fad7f0da7b3d7b8b38 SHA512 25903e31a25cd5bfe5657ed21045560dc54dc7dfdab0525f464cb2d21f9389f0e59219a69740ea189d71dee3a666a041f26c364115c5e1b5a692ac5bf84525bf
 EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
index 5d9f0a2d2be3..73331b781d18 100644
--- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15-r1.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 ~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="doc"
 
 PATCHES=(
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 00f9c14f8da9..9bcf1a6afb61 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,3 @@
-AUX hiredis-0.2.0-api-0.14.patch 1220 BLAKE2B 530407c625f8beeef8e879bfa4c6754d45adcccdbeb8cf2b7bda745972d751904b037385ca690d9d77a4c440b86cb7d378be00cce1ce0ab362ba12b22c4b2db9 SHA512 f741d3a8f52d3ae2c412f70c4e63ee78224a2a0bbfdcf963b240f0aba89a8c765f8f1c75d20a50da9304eed96927cc97e0dc83b525982d60889adb36f0f716e7
-AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d3e873e58e06c86e523964f2b79a6c4de7b14267f63f5733313dec32e081133b8413cc36feb5afa61ff5fb43cc0a4da622e7 SHA512 4679b5b45654c22856278c59ddc37b405960504687cd0f055e74946fcc8e48e97d78f44a664e197cd96cc0ed73ada6ca9d48df05e086e98fd2139998d31a7bde
 AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
 AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
 DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
deleted file mode 100644
index c957ad7aa29d..000000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nur hiredis-0.2.0.orig/src/reader.c hiredis-0.2.0/src/reader.c
---- hiredis-0.2.0.orig/src/reader.c	2015-04-02 23:49:10.000000000 +0200
-+++ hiredis-0.2.0/src/reader.c	2020-04-01 13:26:50.504058251 +0200
-@@ -157,7 +157,7 @@
- };
- 
- static void Reader_dealloc(hiredis_ReaderObject *self) {
--    redisReplyReaderFree(self->reader);
-+    redisReaderFree(self->reader);
-     if (self->encoding)
-         free(self->encoding);
-     Py_XDECREF(self->protocolErrorClass);
-@@ -267,7 +267,7 @@
-       goto error;
-     }
- 
--    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
-+    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
-     PyBuffer_Release(&buf);
-     Py_RETURN_NONE;
- 
-@@ -281,8 +281,8 @@
-     PyObject *err;
-     char *errstr;
- 
--    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
--        errstr = redisReplyReaderGetError(self->reader);
-+    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-+        errstr = redisReaderGetError(self->reader);
-         /* protocolErrorClass might be a callable. call it, then use it's type */
-         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
-         obj = PyObject_Type(err);
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
deleted file mode 100644
index 19d4bd8598ff..000000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
---- hiredis-0.2.0.orig/setup.py	2015-04-03 16:08:45.000000000 +0200
-+++ hiredis-0.2.0/setup.py	2018-04-22 16:57:15.966520939 +0200
-@@ -40,12 +40,11 @@
- # supported Python versions is worse...
- #
- # Also see: https://github.com/pietern/hiredis-py/issues/15
--lib = ("hiredis_for_hiredis_py", {
--  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
- 
- ext = Extension("hiredis.hiredis",
-   sources=glob.glob("src/*.c"),
--  include_dirs=["vendor"])
-+  libraries=["hiredis"],
-+)
- 
- setup(
-   name="hiredis",
-@@ -57,7 +56,6 @@
-   keywords=["Redis"],
-   license="BSD",
-   packages=["hiredis"],
--  libraries=[lib],
-   ext_modules=[ext],
- 
-   # Override "install_lib" command
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 8350df2c1ba7..e049f3bed229 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -4,5 +4,5 @@ DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb86
 DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
 EBUILD httplib2-0.13.0.ebuild 950 BLAKE2B 405c5eb3ccd397910dbc997d7ae3652a238465ef9d54dc2b99b762981e4a61aa878c2f89dcf8d8ac99650f51dc59be64d27ac283a1936d53b95353124b7181f1 SHA512 cc67cc96ab139db8fd445edb429c47a8b891c1fbd2558b6718387181752ce27617f3f18cc661d20bd80aaf376e9c95062552f24269e1dbbee8bafb2f9de20a7c
 EBUILD httplib2-0.17.0.ebuild 923 BLAKE2B 603b57487fb24e9f70bd4bbbec7ad2094298bdfe6404eeaea152377076898cfffad2203e4de758a18c44b91728e8c025102bd50880165893bc3490edf3d832b6 SHA512 07dd1892b78409715b982cf4c1e45773486d8e4bd6842781e533d2ba9c7ffa2b28e4fe030c7f080c6cd59f2202d1eb8c5ae1ae3d35e6b95c8fa021719b03d58b
-EBUILD httplib2-0.18.1.ebuild 1271 BLAKE2B 38f2505fcfffcf3c2afc666122bb897dd68c5247892f057bad5339ea22080684d0815c6e202043c0b44f7338cca374d4feb99e08cc2c437525aeb986f6c51971 SHA512 d429c4bcf7baa1a51632fcccd8e7fe4fe2034b749fa605afa20735118358f8dc1785bf2c63e0e4153b60a1a4e2ee37537ffc839728b843010b293148f91fa153
+EBUILD httplib2-0.18.1.ebuild 1353 BLAKE2B 9bec446b56d3378aa40a7a0843827d3f8a61f187427ec127885a6b8e3aa83d1214297afed9a7e7bdbdd61faf576b3844893d55c2f4b43d47990a83c86ed612c6 SHA512 d8ac66b54f6fee170c589bfef5c9539de81f7afbbb8b2602408eb4b7f63dad6942d1c8a3c6498052d07ad12497b4adb79815c1104f325eb9c5c0fc7d710e259d
 MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/httplib2-0.18.1.ebuild b/dev-python/httplib2/httplib2-0.18.1.ebuild
index a88d198375f7..18e47f64e16f 100644
--- a/dev-python/httplib2/httplib2-0.18.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.18.1.ebuild
@@ -14,10 +14,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
 
-DEPEND=""
 RDEPEND="app-misc/ca-certificates"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 6a41b53895ca..6b5bd4ed20cb 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,3 @@
 DIST immutables-0.11.tar.gz 76589 BLAKE2B 64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a SHA512 fceb1feb5fd8de4444681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
-EBUILD immutables-0.11.ebuild 470 BLAKE2B 9c70a9bcae6b8a4acbc3894fa20fb164e802c7c92797baa90cd6471ced3b589cbdc93abef0462c7b1ca04beda495051c3301c471dbb990dfdf8d282addf59618 SHA512 6d4832764860e5df6a5411c4afdb4d96b417910944c27f6ed9f64e6136db9a7cb080bcb1ba8663ee0ba1b27e983a45080b1efc0ec05d58f5e66b03f7eeebdce1
+EBUILD immutables-0.11.ebuild 468 BLAKE2B 5bd912a30a0c5790e31ec75fb043a175e03f4fe56069a83f2b9d9aa93f81ea2180d42c26f3bca69b518679bcc27c9a1537d5c83316d608a4aae5a3e9f555f78c SHA512 f40c4f61403120cacae1d55f0ccb62a937352c46cabe7d75a3054dfbeac3e7a2ba65dcfa2c53ff673e0d2dcce973fad683772f52037cac93130b1794d989a26b
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.11.ebuild b/dev-python/immutables/immutables-0.11.ebuild
index d63114370c19..17e029c35a1d 100644
--- a/dev-python/immutables/immutables-0.11.ebuild
+++ b/dev-python/immutables/immutables-0.11.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 002b02bc1126..fdb6778277bd 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,4 +1,3 @@
-AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.4.0.tar.gz 23220 BLAKE2B d494615ba39620e772552b09637e280e0b72b16352387592423f824b67af315da1a0749e0dde8e55d3e0e04848a3c43802c12f20c79c5a067de0a3299510a199 SHA512 e482f109f387de79d66e69084fab70750ce472f7d665c3a617819ab604e376860c2832a0cab27867165b7ac60947db554ec686d73f182dcaa6935dc14ca3d935
 DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 EBUILD importlib_resources-1.4.0.ebuild 1274 BLAKE2B 0ba74e406c9d5f2ccec9f67c94ccecd96dc7a6d2905ae0c0183b8ec46bd9dff66dc1b4a3f166503900b04e5ffe931557bc0ed6dceb212b913e28b51c6fd7b441 SHA512 b376967818c52b3f023fe980f53fab238154327bdbe26fd70ee2b950b02a908d669f888f4c8cf4d7912761bfb625764f86d59d95ea0a7fd297fcba508c76e3fb
diff --git a/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch b/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch
deleted file mode 100644
index 1cff1fafeaf1..000000000000
--- a/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index c9ef791..412b1a9 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -19,7 +19,6 @@ classifiers =
- python_requires = >=2.7,!=3.0,!=3.1,!=3.2,!=3.3
- setup_requires = 
- 	setuptools
--	wheel
- install_requires = 
- 	pathlib2; python_version < '3'
- 	typing; python_version < '3.5'
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index c3b6b28dec04..ef0b8cda16f2 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,3 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r2.ebuild 680 BLAKE2B 670255f1e642bd7a1c2274cb8652ceecc32d8da44daac45ab41697d39191c6ed7756892c18d0c8ae3a3513aca24cd1fc9260d68271491467a408cbb01da2926e SHA512 765a63c63b5992136f261e8d8c73cb9e87f59bcb51313722752e1d5d58929a67b4a343826717773fc2318136338718487b927f3c87d0e6719a07987f66b0809a
+EBUILD iocapture-0.1.2-r2.ebuild 500 BLAKE2B e0c96dd6b4ec96020c0c7bcdd0cb5129b6ebcc5217a00897d3f737054f24f220e88ae95fcdce6eb8946a4478f8ccfaa234de5d2029c705d0d5303ada37f6c8ec SHA512 2856f81a48ca5f959e058044fb8451128bc9859c72403b924251d45e6e33c359a4cee9af7ef72190f8c3f9518bfcd3fbaa921dce07a73b47d7fcf6dfe742a5aa
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 3b9cb84cb71f..216c2210675d 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,17 +14,10 @@ SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 LICENSE="MIT"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index fcaee773b520..19f032b92665 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 828 BLAKE2B 3f1dd3283034075c39935ea7ff937a35bacf86c2811b0cc70f402a0550a61ed725fb24374b36ac04999a2749982d453df54134d732e8abad9ed7d997d90f76e8 SHA512 7d6fe030e2cbb836689bd5eb224e2a20f130950935e3f91ecdda1cab4681226ad770301525e8d3b3b13a01cee3234b6112ba86da6993bd7a4ed478bd28fad4a9
+EBUILD isort-4.3.21_p2-r1.ebuild 827 BLAKE2B 23b90518e7936bcc2c906639c040eb8ec14be93a1dff1ace59d8572568b8971710c7ef1462f5b78410ce5f1c9918bd6a2cb1c315141747f12e24b46561fce094 SHA512 6eba07dd6b9f9d8f6c0e3a4e2a7eee999b0d11404a847aaac37f3e25e97506ab44a11ef0afbf3faf4ed4cf29476b95e0f1802354ff5b807ebf1901210396cd85
 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 fd2b96d26a27..dd7584a0b2a7 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-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 7d811e33c9a3..a5f1a8f9ceac 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-1.0.1.ebuild 1221 BLAKE2B 015713b033bdae73a9dea9b427136846855b5b239ea321936a9e2ac355fadf0d5d40e09d21c6b40dfd36997192c670787c58d7c39c78a6ffc25c4f5c0a7aa1e2 SHA512 2cd85cc698f8eef5511e4005f2c97b3e3f4bff58be6d2f48d9c0d1c5f6eb757c08f6d5143cdb5a3882ca0a803ff1e6a02b22c8c2d44d33b284f74f14371cba1b
+EBUILD jaraco-envs-1.0.1.ebuild 1226 BLAKE2B aa448531f05a3d5c6da92657403e47d36d3419eb78abf6e96c81ad46ebfd02eb59da86f48865888fa2fcd9cd9ac89957a8fe4d017ed65138c23953d384c553ee SHA512 8e23179efa415d71c77c746b597bb3cf6fb52a1fcd0b9cdcc53183c60313befa3713ff745cc12179604b05c9ce6e89c04dd1af0c8430b7688a64182a517c0396
 EBUILD jaraco-envs-2.0.0.ebuild 961 BLAKE2B 1bd458d2f7f7d46de82c35a56dde37d35fe2827dd28b1541ae06e7b129a93bf57135abef5830b0a606887d5bb4e1d10789735d83f13ab119665d0bb4370e44f9 SHA512 7eab3367ddf1ecf88ac97febe45fbb32a4b48dd52837c6bd60455b8d617f925896ba8864b9cfc33e611a70f531247d99afdec1ac43a67823443ea831bfd9c41d
 MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
index 17dd0999bac8..d93173d1b677 100644
--- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/jaraco.envs/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 71387cbab411..470db73acda9 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,4 +1,3 @@
-AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c3240e3ab74f58dd76f87ea6cbd6a8a5d2b0159579df71001993c36451f79547e674a4d19659646cd86c1181787de0fe5a3b963e646c07c SHA512 6c743bbce1f369e5369ee34a788b7966422e469986e7c5f3d7efbdc1ebafc7487a929fa0a1164aabd3da3a5f9f3c120093cfd978554e8506d05604dec2417bb9
 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
diff --git a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
deleted file mode 100644
index dc296c4eb47c..000000000000
--- a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cc972095e5aa2ae80d1d69d7ca84ee94178e869a Mon Sep 17 00:00:00 2001
-From: "Jason R. Coombs" <jaraco@jaraco.com>
-Date: Sat, 20 Apr 2019 07:08:41 -0400
-Subject: [PATCH] Rewrite docstring on Python 3.7.3 to allow the test to pass.
- Fixes #12.
-
----
- conftest.py | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
- create mode 100644 conftest.py
-
-diff --git a/conftest.py b/conftest.py
-new file mode 100644
-index 0000000..b6fad41
---- /dev/null
-+++ b/conftest.py
-@@ -0,0 +1,24 @@
-+import sys
-+import re
-+
-+import jaraco.functools
-+
-+
-+def pytest_configure():
-+	patch_for_issue_12()
-+
-+
-+def patch_for_issue_12():
-+	"""
-+	Issue #12 revealed that Python 3.7.3 had a subtle
-+	change in the C implementation of functools that
-+	broke the assumptions around the method_cache (or
-+	any caller using possibly empty keyword arguments).
-+	This patch adjusts the docstring for that test so it
-+	can pass on that Python version.
-+	"""
-+	affected_ver = 3, 7, 3
-+	if sys.version_info[:3] != affected_ver:
-+		return
-+	mc = jaraco.functools.method_cache
-+	mc.__doc__ = re.sub(r'^(\s+)75', r'\g<1>76', mc.__doc__, flags=re.M)
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index c4633c71d86b..7b835144a9f8 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,4 +1,3 @@
-AUX jedi-0.15.1-tests.patch 4110 BLAKE2B 3e99d214fa218bc2488aaad1a9d7bad16f26f0bcea07b96b4d8a5ae162df799a5747987961dac602186507015297183e81efc90bfc1dc6cf27585ab739629fc6 SHA512 394dcee9577a62abdc7a6c074c79fa801b0dbe04796d17333fcafd1344567d3c4f741d202e3d7929f23236f854a888b94679e1d061488967d621a37b1229a188
 AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
 DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
@@ -7,5 +6,5 @@ DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd3
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
 EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
 EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
-EBUILD jedi-0.17.0.ebuild 2005 BLAKE2B 80a8a63e814a8a4128fb0cdebca8aaf6080fd3abdd84230205005a5028658976eba1e9d0e633254c24f3bbae178e11ef8445f6caa593ef3b0432caef6a327f11 SHA512 c5dd4a269ce360fe780a02d7297faee4e47ddb0a3b32912a6eecce8a80e2ff41b4a5b3c38fd64b3b6caaba8c085e931b0744097181a404e99282389f32b1ab72
+EBUILD jedi-0.17.0.ebuild 2128 BLAKE2B a5e1e2889bce86068fbe7407bed098d32c89ff735ff1498f78692aa430e66a5cd633379dbceb5baaeac3daf9fe0a31330f5b1142402fc1328801be3b5a3ac669 SHA512 6489b4bf7ae68fda13a3062e183a0a3063a1225ba914a8107c4371362fa1ef04b08ae2b967f927a03ac29024b2edc37c9957183dc10fab7c72923af575915b3f
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/files/jedi-0.15.1-tests.patch b/dev-python/jedi/files/jedi-0.15.1-tests.patch
deleted file mode 100644
index cdc59053df03..000000000000
--- a/dev-python/jedi/files/jedi-0.15.1-tests.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/test/test_api/test_completion.py b/test/test_api/test_completion.py
-index 178daee9..0c86f837 100644
---- a/test/test_api/test_completion.py
-+++ b/test/test_api/test_completion.py
-@@ -1,4 +1,5 @@
--from os.path import join, sep as s
-+from os.path import join, sep as s, dirname
-+import os
- import sys
- from textwrap import dedent
- 
-@@ -164,6 +165,7 @@ f2 = join(root_dir, 'test', 'example.py')
- os_path = 'from os.path import *\n'
- # os.path.sep escaped
- se = s * 2 if s == '\\' else s
-+current_dirname = os.path.basename(dirname(dirname(dirname(__file__))))
- 
- 
- @pytest.mark.parametrize(
-@@ -181,7 +183,7 @@ se = s * 2 if s == '\\' else s
-         ('test%sexample.py' % se, 'r"test%scomp"' % s, 5, ['t' + s]),
-         ('test%sexample.py' % se, 'r"test%scomp"' % s, 11, ['letion' + s]),
-         ('test%sexample.py' % se, '"%s"' % join('test', 'completion', 'basi'), 21, ['c.py']),
--        ('example.py', 'rb"' + join('..', 'jedi', 'tes'), None, ['t' + s]),
-+        ('example.py', 'rb"'+ join('..', current_dirname, 'tes'), None, ['t' + s]),
- 
-         # Absolute paths
-         (None, '"' + join(root_dir, 'test', 'test_ca'), None, ['che.py"']),
-diff --git a/test/test_evaluate/test_signature.py b/test/test_evaluate/test_signature.py
-index 0bb5cbae..2fda3d55 100644
---- a/test/test_evaluate/test_signature.py
-+++ b/test/test_evaluate/test_signature.py
-@@ -16,7 +16,7 @@ from jedi.evaluate.gradual.conversion import _stub_to_python_context_set
-         ('str', "str(object='', /) -> str", ['object'], ge, (2, 7)),
- 
-         ('pow', 'pow(x, y, z=None, /) -> number', ['x', 'y', 'z'], lt, (3, 5)),
--        ('pow', 'pow(x, y, z=None, /)', ['x', 'y', 'z'], ge, (3, 5)),
-+        ('pow', 'pow(base, exp, mod=None)', ['base', 'exp', 'mod'], ge, (3, 8)),
- 
-         ('bytes.partition', 'partition(self, sep, /) -> (head, sep, tail)', ['self', 'sep'], lt, (3, 5)),
-         ('bytes.partition', 'partition(self, sep, /)', ['self', 'sep'], ge, (3, 5)),
-diff --git a/test/test_evaluate/test_sys_path.py b/test/test_evaluate/test_sys_path.py
-index deaa64ca..fdee2ece 100644
---- a/test/test_evaluate/test_sys_path.py
-+++ b/test/test_evaluate/test_sys_path.py
-@@ -1,7 +1,9 @@
- import os
-+import os.path
- from glob import glob
- import sys
- import shutil
-+import distutils.sysconfig
- 
- import pytest
- from ..helpers import skip_if_windows, skip_if_not_windows
-@@ -33,12 +35,10 @@ def test_venv_and_pths(venv_path):
-     pjoin = os.path.join
- 
-     CUR_DIR = os.path.dirname(__file__)
--    site_pkg_path = pjoin(venv_path, 'lib')
--    if os.name == 'nt':
--        site_pkg_path = pjoin(site_pkg_path, 'site-packages')
--    else:
--        site_pkg_path = glob(pjoin(site_pkg_path, 'python*', 'site-packages'))[0]
--    shutil.rmtree(site_pkg_path)
-+    site_pkg_path = pjoin(venv_path,
-+                          distutils.sysconfig.get_python_lib().lstrip(distutils.sysconfig.BASE_PREFIX))
-+    if os.path.exists(site_pkg_path):
-+        shutil.rmtree(site_pkg_path)
-     shutil.copytree(pjoin(CUR_DIR, 'sample_venvs', 'pth_directory'), site_pkg_path)
- 
-     virtualenv = create_environment(venv_path)
-diff --git a/test/test_utils.py b/test/test_utils.py
-index 17328a36..71217086 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -77,10 +77,14 @@ class TestSetupReadline(unittest.TestCase):
-         # There are minor differences, e.g. the dir doesn't include deleted
-         # items as well as items that are not only available on linux.
-         difference = set(self.completions(s)).symmetric_difference(goal)
--        difference = {x for x in difference if not x.startswith('from os import _')}
-+        difference = {
-+            x for x in difference
-+            if all(not x.startswith('from os import ' + s)
-+                   for s in ['_', 'O_', 'EX_', 'MFD_', 'SF_'])
-+        }
-         # There are quite a few differences, because both Windows and Linux
--        # (posix and nt) libraries are included.
--        assert len(difference) < 38
-+        # (posix and nt) librariesare included.
-+        assert len(difference) < 22
- 
-     @cwd_at('test')
-     def test_local_import(self):
diff --git a/dev-python/jedi/jedi-0.17.0.ebuild b/dev-python/jedi/jedi-0.17.0.ebuild
index ec64254f90cb..e8e830ee68ec 100644
--- a/dev-python/jedi/jedi-0.17.0.ebuild
+++ b/dev-python/jedi/jedi-0.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -25,7 +25,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -54,9 +55,12 @@ python_prepare_all() {
 	sed -e '/with sqlite3\.connect/,+2d' \
 		-i test/completion/stdlib.py || die
 
-	# really silly assumptions, not fit for py3.8
-	sed -e '/len(difference)/s:20:22:' \
+	# really silly assumptions, not fit for py3.8/3.9
+	sed -e '/len(difference)/s:20:27:' \
 		-i test/test_utils.py || die
+	# py3.9
+	sed -e 's:test_infer_on_generator:_&:' \
+		-i test/test_api/test_api.py || die
 
 	# tests relying on pristine virtualenv
 	# this relies on test* not matching anything else
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 41def7a44232..6904008beffe 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpickle-1.3.tar.gz 76571 BLAKE2B 797ac90d1aacb620d9917bd2a34dbc960739b29f64d7bc003c934333fc0d836657a4907a965725248b2f9489876ae251440eab3888112f158c28f19e33efe036 SHA512 5e7faa32f4fd2da88d9cfea8c0355121ece12aa1b4434845e6bd679718f433e5c27835b405f833a31d69d09d7a6ae6c3d5e4bf1f6dc9c50c7ff1690cf82271b0
 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
 EBUILD jsonpickle-1.3.ebuild 1464 BLAKE2B c296889e4932cb48a7e07ceb4480280c5f751eac869c0d70923a79758ca407fa0e2432212d269e692164a981c2745e40b097d32fb7042b9d86ec9f25c018fd66 SHA512 5bd82786b9e4260caa244bf9280300069b569eea5765eae0c9a381d3c804da2d4a882cc726a163f97bd8ff205e446f115e5bab896917aefb1c25e63f1a6788f2
-EBUILD jsonpickle-1.4.1-r1.ebuild 1293 BLAKE2B 5444f6debbee382575a279877368060b77e05130ba966947f0d2049fe26cb02aaac0918ac79911921f86cd67a03782785147c444f80d8dee43eebdb749367c6a SHA512 9e5b96a83f473ace7989f5b76117830f1e65b70d40222c3daf97c2fd10bc01b674061317108fb20d6d2dabbe7ea7f790f1e110c1df4c42279688fe9800466754
+EBUILD jsonpickle-1.4.1-r1.ebuild 1291 BLAKE2B 8f3748c82dff390c5ef4a73972a0b6b7af22b7132ea54fc3ed70ced7dd6252f4e1cf1df7307ffa47c9b4dca764d0a9c44e8b2b86c2630816f3c0a28c64b6272c SHA512 fe8f85a44631b196af34175b8dc28507b10f0e682bb66f1fabd2ef94418c6c3ac7deb374335a83d6dcd04aa258b32376d044b9dcb5d8d552d699254a4839f78a
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
index f62eec6bfb7e..01a5d3be0b9f 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 795cf16f77a1..fd02b9799a71 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,4 +1,4 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-2.0-r1.ebuild 663 BLAKE2B 7dc8a6098918babdded8b9355eae60543fc9b850c47617cedebdbf5706e61cf67c738923860983d2eedabdbb5853c4f5cd579eb0de0aac50218b7b266365232d SHA512 822c1b35d7a54bb8bbbbcdfc8834393bf8ef0713a5f9c35ec6d30f08a0369def161d6899ffaf09ff2271591b64adf04438342f05ddea7b583024f50eb4a3dd84
+EBUILD jsonpointer-2.0-r1.ebuild 657 BLAKE2B 12187333d581518c4af2d5b85bc1066e17372028585fe7354131dd6545d895d7871b488f0745cf0d8f473b42bf86df2bfffc0457972da92a6e31311e0446b230 SHA512 98f977b8ff0f5c6ddd08ad370d6f7046b0ba7465f6ac712d8aa2b0b8c9e7b5591d530874f6286e34da88fadfe42b771fcb7881c3863acbbb88923d60c04e7611
 EBUILD jsonpointer-2.0.ebuild 625 BLAKE2B d411c533826cc23808cbdfacb38ffe6d93bd63c663abf1bdcbf6ae12d36e8e2e2708c2cc64db493faf2f1ab279e224df31a4e7349ad60e84dc8828119927ed3d SHA512 3c21bb33e6bba667dfb62ecce849781b869c1bbd39071564df3f5e6b8c7491662d3dbb62de22673848aaa9aca8b9f937201732fe0f1c9fe5d4df3e14f26eda35
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 2f61b34edb5e..d1223ad8e4b8 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 9a1f41338058..22ed783bb4f2 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -4,5 +4,5 @@ DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf9
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 EBUILD jsonschema-2.6.0.ebuild 1037 BLAKE2B 53228667cdf093e796aa33d9a75051ff6f8d55a7777746227ae821af820f7ba782db4852d92369e5160c598ce1442fc8f693b1183802ba2f72724c0f0347578a SHA512 71e29830554566c8bc27c2d0d7a1d90a91006e91c6c930708f23a393f25a801bf4f56ad68d0b0d7f6319ce4dad4020e2bd7c784c1dee1fc6b1d235146a4a171b
 EBUILD jsonschema-3.0.1.ebuild 1216 BLAKE2B 8dbbb190ea4fa4e8b4717a85ea912e1c5b9ef318143c7a5093e3f39f312939fe4034ceaa9694fc481619b1ec1a15f926bceb9a46924fe55ad821f20ead6e1741 SHA512 ee670550b321627adf4db6ad3b8a55a2aa006b4709aa466d20630509349a5013ddd8d81798c7065ad6b2078cfd30d79656846d66e871b0e980ac84abf4770ee6
-EBUILD jsonschema-3.2.0.ebuild 1661 BLAKE2B 281c3bfb04652dd48a750982e55d4a583fbcddd3a172fbdac820c6cab3d5d89d514c1aad817b88c9e5420913849836a91fa23d37bab9edf6a93b0a1ae2cab368 SHA512 45512ebff5e485da5965cb1630eaa22c011ed0dde627cd7c00fb35759c095bdb803903c9437c3b563d8ff35efbddb66c63a8119499ec8ee8493d8766afc3030e
+EBUILD jsonschema-3.2.0.ebuild 1655 BLAKE2B c200dc4ad4bc18c7099e2b280214ebd109ecb6ea8cfdb334ece9c9fa7e1385cd9e2f5eec7daba08da9dbc426a6386e4161caf95cd22d173a8ca6ebe48cc187e8 SHA512 a52b3f2b82090a507e145c774a62e0b18fc614a2afd16f38f6a541bf2ea8b67da315392bafffe7564edd1e11ac58a7591cce86c874eb50de2b7dd370906eeabe
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 8006d3a74e8e..cba4aa2c3dd0 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 3f8ae27f9e13..fe6a84ae847f 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
-EBUILD kaitaistruct-0.8.ebuild 390 BLAKE2B 97a98d89de43063a8fd500c721626c6a3bd5ab04f435fbc3928c5e785d9e8c198b8d2acd6e0324094ebc93dbfdc0c1b8ce77043d828a245a41f186894e08987d SHA512 005fd4c66f988c7e4aceffaf89ac7cefcc1208fb8a583d799a682a6e34c03fb11fc7533e0555c595d232858b4a663ec433232cecd32cf90bfe3abe89d5e58cca
+EBUILD kaitaistruct-0.8.ebuild 394 BLAKE2B 5d47f200a12dacd51fb073766d85630b595bfed39b95d0204998e52947ce50a9839b2152c2dd1882f25ee12e126345c344ecbd7830d43b498e6eb553c942cf15 SHA512 213c04cbdedb5df7d7ab2af06dbafb5e818e58a406f724739292bfd45f20dab85542b29dc5581135f790c0fb33ed629804d28a1f3a9816eb235452724948101c
 MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
index c932baa405ff..626735a49c23 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 0860282dd649..0ab0a218c9e1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -3,5 +3,5 @@ AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf
 DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
 DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
 EBUILD keyring-19.3.0.ebuild 1643 BLAKE2B c902a24962b88f11287b55e957a10c50410dead3a252d0827edb6bb72747b7e0686a896b93be67aac3e60f066ace99addc3f798a853d69374b6761b4b54019a9 SHA512 5ef0899592a3284f2a05de1a66b846532af35de7143a5f57b7933dad689cd1a2b94de5b83ca0038a8288c402ddb71ba538eb0f48885496a986f221aea30c5e78
-EBUILD keyring-21.2.1.ebuild 1268 BLAKE2B 16d9752e5f64761bc55bca55a881cbefac7641209e019031653c7148ef79adb97a2be02a5b53c66caccbc347d8d27f3d6c8f1d56b7cc8abe6b4ff85ad4283ac8 SHA512 909508b934065d100c359157c2cb88828ecaf40e739bf44cad5d8013f2fe103e19db9bea1070185924f0bee4a8242cafbeb4ee756aca55e5622959f53ba827da
+EBUILD keyring-21.2.1.ebuild 1274 BLAKE2B 09ce045944478da8ded1c129c1510166a28910be93cbf1f1f5efa0b6f22d07f08395e123d1b0a2cb78cf1af43ff9a0eaf1d747e9e3c8e49950b77e6f709bc58c SHA512 0a6cf495b4bfd7da9d4be1fa471bb6ea2f1890552289fd1959dd809799f23bf541f3dbca0c15a6ae7a1e41688cdf532232bfd884700a7b29286e6b01944df7f0
 MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 14014788c0eb..31150c3125ee 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index a4aeb7f509fe..cd28e8b7d892 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -3,5 +3,5 @@ DIST kiwisolver-1.1.0.tar.gz 55086 BLAKE2B 5f45a9c540a1a732cf8319de7dc2e6b503170
 DIST kiwisolver-1.2.0.tar.gz 54244 BLAKE2B 42590c2cbb78b3c2ed568373616e772326bf5a0e133396d9e9cf6468132ec88b45d40f68f51baff7bc22ca261567ebab81cf2585009657bd2a59df4e97c33f1f SHA512 05541ff46cc64b9958d714452138dc7bb343e6cc9308408a3f8cf25242e9640af37f8bfd22a7038e8ca70a895f57bdb983346259bce22b1630ac10b974d00a0e
 EBUILD kiwisolver-1.0.1.ebuild 538 BLAKE2B b79352b1c0dcd18240b0e93277b765a3d2e00b83462426586c52cec9534c33aadcfa912a7ca984dfd38c7b6aecdf03f909945b8882555b9fbff886859f0d288a SHA512 c6ac78627965c73122b84c78cecfa92766c55b9c6ed2a0a6397edc6880bebd3a60943e16830b671076bc30d77dc107a6b29d56ec8b4660f1be6c8d87696e9221
 EBUILD kiwisolver-1.1.0.ebuild 532 BLAKE2B f3ebb8cb5c1eccda8bedd563582df893debbc73af21e3809ced69ae2f747a035e36d47699fff77c0895da5c24fc89f6df087a124fa2dc2c7b6ab5a5b5834f0d4 SHA512 11a929d9d0806973e634547c02bee6de70a27f580dbc3e8805030c1e61dc14b823ac795092dfa865d410d7552ff85dbf23ee4b664c803bf6803397d5a6d95b33
-EBUILD kiwisolver-1.2.0.ebuild 589 BLAKE2B 531054b4a829ffa7ececd6650f375b14e95dc8c78282cc8f693edfe9a97bf726626d7bbe49c370b2a80e2ff5ff14f55eb8d2dfe7067db4cef1f1f5b982aca4a1 SHA512 98322be3788cf9948a701eb92a70e9c924ea0607c293c56f6b49581ba089892763c607e137e5279676edb737b5a57f588c710f4b2eb497de00daa0bcbdf7fa1a
+EBUILD kiwisolver-1.2.0.ebuild 594 BLAKE2B ac494ec3399de03a9805fc1aa5847f819ba970c8f9f9e2e4fafbca46f4272556eab9777b0408f01756aa079be5ac6c7343739a279bf34f3eefd49e2ac30e637a SHA512 582fe0b678d24c4d9fefd0331d0cbad02bae79d8059f90b92854699b3668332bb6b9e5fb54d76baa188bb97f1dd382228665e6bf31ad4cf1158332b002f8a15d
 MISC metadata.xml 488 BLAKE2B 81301b1703fa5f0b55454baf153da24ded5b76ab63c66fdcea748c6369f903d58836b86678e0e1cdde074c38be7e0d7162a70ef7c38e3211dde320523d77d35d SHA512 f12cd6068772e49e0ff8dbdb319b3018887823c053f8a79061bfcac341480872ecfe0fbcbb53b9afc2caf9105d1935260e0e492fbab3a24c0018db68388ca8e1
diff --git a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
index c1ff1e32bd1e..3a1f79a66854 100644
--- a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
new file mode 100644
index 000000000000..1eafea3b7ee8
--- /dev/null
+++ b/dev-python/klein/Manifest
@@ -0,0 +1,3 @@
+DIST klein-19.6.0.tar.gz 100867 BLAKE2B 2d03a5040d7f470bd73b25a66a1dbb2d6278a12afd7ffeffe0055b2d8bf88d5fd6d97e08bdbc185fbfcd34aa0589f79d79488cba77b4b08430dbafd8ba5e0afe SHA512 c0853333269d4d79206446bc7ac333f536eb9dbeea0ada65b23610e4e8a35208820ef1bac78c17a4e71c22ed2c06f5467ce6c59666dc36fde3e4c0843ed69549
+EBUILD klein-19.6.0.ebuild 1392 BLAKE2B a4b186c76dfe95a00ecd5393232e70f1f21667044557691f7aae9cab72616f5605d39835df8a1d444c1060e96e0af3ef3dd2193fdffb7f5ff8f2b6b8009ae538 SHA512 58ce19ea372eb0ef919b20f0f0d5a43a6b0ce3b26e905d8a906032405cf8bcca40bd04f9201e23e5607280a0d9e2c48f5b458ae7284004f9b7b0206cad6a0cda
+MISC metadata.xml 871 BLAKE2B 3c8af447344bf5629b8697933ef90310b1adc29392d7667e72f7b471d8da93da31125f434ab34a1717f9f5f80bf5d478c6e8f8f126eed92dbc54928584fa99da SHA512 6f9bcf2450d43a0f30568c93779c978d136aa9ecdffac561464e276cf29e5a44db60227c98d061072af1ea209d15b85790ef2fd64d4c21d0f7dcf4e280005b48
diff --git a/dev-python/klein/klein-19.6.0.ebuild b/dev-python/klein/klein-19.6.0.ebuild
new file mode 100644
index 000000000000..f89fedf523f1
--- /dev/null
+++ b/dev-python/klein/klein-19.6.0.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 distutils-r1
+
+DESCRIPTION="micro-framework for developing production-ready web services with Python"
+HOMEPAGE="https://pypi.org/project/klein https://github.com/twisted/klein"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/hyperlink[${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tubes[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# nuke irreleveant test dep
+	sed -e 's/"typing",//' \
+		-i setup.py || die
+	# known test fail: https://github.com/twisted/klein/issues/339
+	sed -e 's/big world/big+world/' \
+		-e 's/4321)]/4321.0)]/' \
+		-e 's/not a number/not+a+number/' \
+		-i src/klein/test/test_form.py  || die
+
+	distutils-r1_python_prepare_all
+}
+python_test() {
+	distutils_install_for_testing
+
+	pytest -v ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/klein/metadata.xml b/dev-python/klein/metadata.xml
new file mode 100644
index 000000000000..dab0ec77e4d3
--- /dev/null
+++ b/dev-python/klein/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>hawkowl@twistedmatrix.com</email>
+			<name>Amber Brown</name>
+		</maintainer>
+		<remote-id type="pypi">klein</remote-id>
+		<remote-id type="github">twisted/klein</remote-id>
+	</upstream>
+	<longdescription>
+		Klein is a micro-framework for developing production-ready web services
+		with Python. It is 'micro' in that it has an incredibly small API
+		similar to Bottle and Flask. It is not 'micro' in that it depends on
+		things outside the standard library. This is primarily because it is
+		built on widely used and well tested components like Werkzeug and
+		Twisted.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 585fac586a8e..01687ecfc333 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,5 +1,5 @@
 DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
 DIST logutils-0.3.5.tar.gz 27703 BLAKE2B ceeabbc64603da949e771531fd1a7cff6bc760ffa98fcb952eddc5da39d019e202949dc596398ea68397c573cb9c2bace77f8e5462030e68d2f5768444a23b45 SHA512 0194bf4f01e7a29d4211495dc5fead9d4bd5bc1b791d25ff38ad28960a229a9bcdbaa7e6d3b5a4105eef6c9aa159459d6529c2615df113e7ec1ae93aac5cce6c
 EBUILD logutils-0.3.3-r1.ebuild 487 BLAKE2B f1348dac89a6ad33a1255f8ba6a90d3f2a818ea87e2930a64f26df747ce8c90b16adbac24d664116aeff28f451a862b46d40672025207c30eb66d05cbee32f37 SHA512 361b62c73eccc1b673b8dcbd69b9029552f5247b84f14fd2fb3e577dc8309d1690fe2b2e965ff24a12ca81c06ba461d85170e2f52060fec26bc0f391107c2d94
-EBUILD logutils-0.3.5.ebuild 456 BLAKE2B 7e923861de00627df708fcee53f306009210c984ec4da2b6a917fada2c67df1a8327c19d13afa5d1abce1862e7686f3fc3f0107907b34347ca6a25067ef0be62 SHA512 c38c69eefbab11b2cb81e791efba29b4b1aa11ce9b805214fe6898ca340a33dfb4d19f543c3598da8f492f462cde82802fd219f7a554ef98e489a465d2007128
+EBUILD logutils-0.3.5.ebuild 454 BLAKE2B 2181984eb17de2663c24b273a0ab1b6fafa7e2cc6b9e36c653995cff5ba9e4c494b1abf8127e3468026012c3040cdefa21869ad5fed838f2ca0aecc4544e1f67 SHA512 17335ff7e4fca7d71f34d5c36b02aade118321a3baac89020d80b0c2d8bb0efd67bbaad2de574a85258f788b8bbe62fb73149f5d99507099b2f15bdc834a6c56
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.5.ebuild b/dev-python/logutils/logutils-0.3.5.ebuild
index 2e5a0aa26451..c99fdc0a55e5 100644
--- a/dev-python/logutils/logutils-0.3.5.ebuild
+++ b/dev-python/logutils/logutils-0.3.5.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 3cd31fd54ea2..b31f93e8e14e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,4 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
-AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb5f28ee275a018497fb55c5da9ae8f8284f38635ac8322ec5ac071ea7dfe496f30dcabde2293e7a6703b3147d SHA512 9c2ea59c526f0ab0a0feaed86d9fca7253582ca8bd09b7ccc6e9638100ab53b5ba716a1c61c311019d13b25cfe72fa28be5cf38eecda1d33e77315f0a7fb166d
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
diff --git a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch b/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
deleted file mode 100644
index 780970897f8e..000000000000
--- a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
-index 435807a5..3999de1f 100644
---- a/src/lxml/tests/test_elementtree.py
-+++ b/src/lxml/tests/test_elementtree.py
-@@ -27,7 +27,7 @@ if this_dir not in sys.path:
- from common_imports import BytesIO, etree, HelperTestCase
- from common_imports import ElementTree, cElementTree, ET_VERSION, CET_VERSION
- from common_imports import filter_by_version, fileInTestDir, canonicalize, tmpfile
--from common_imports import _str, _bytes, unicode, next, IS_PYTHON2
-+from common_imports import _str, _bytes, unicode, next, IS_PYTHON2, IS_PYPY
- 
- if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3):
-     cElementTree = None
-@@ -2928,6 +2928,7 @@ class _ETreeTestCaseBase(HelperTestCase):
-         self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href))
- 
-     required_versions_ET['test_register_namespace'] = (1,3)
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_register_namespace(self):
-         # ET 1.3+
-         Element = self.etree.Element
-diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
-index 9dc648eb..1853e546 100644
---- a/src/lxml/tests/test_errors.py
-+++ b/src/lxml/tests/test_errors.py
-@@ -13,7 +13,7 @@ this_dir = os.path.dirname(__file__)
- if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
--from common_imports import HelperTestCase
-+from common_imports import HelperTestCase, IS_PYPY
- 
- 
- class ErrorTestCase(HelperTestCase):
-@@ -27,6 +27,7 @@ class ErrorTestCase(HelperTestCase):
-     def test_empty_parse(self):
-         self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '')
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_element_cyclic_gc_none(self):
-         # test if cyclic reference can crash etree
-         Element = self.etree.Element
-diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
-index d058fad2..b905fdfb 100644
---- a/src/lxml/tests/test_http_io.py
-+++ b/src/lxml/tests/test_http_io.py
-@@ -17,10 +17,11 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir)  # needed for Py3
- 
- from .common_imports import (
--    etree, HelperTestCase, BytesIO, _bytes)
-+    etree, HelperTestCase, BytesIO, _bytes, IS_PYPY)
- from .dummy_http_server import webserver, HTTPRequestCollector
- 
- 
-+@unittest.skipIf(IS_PYPY, "broken on pypy")
- class HttpIOTestCase(HelperTestCase):
-     etree = etree
- 
-diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
-index b8b41063..e8d275b9 100644
---- a/src/lxml/tests/test_nsclasses.py
-+++ b/src/lxml/tests/test_nsclasses.py
-@@ -12,7 +12,7 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- from common_imports import etree, HelperTestCase, _bytes
--from common_imports import doctest, make_doctest
-+from common_imports import doctest, make_doctest, IS_PYPY
- 
- class ETreeNamespaceClassesTestCase(HelperTestCase):
-     
-@@ -49,6 +49,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
-         self.Namespace('ns02').clear()
-         self.Namespace('ns03').clear()
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_ns_classes(self):
-         bluff_dict = {'bluff' : self.bluff_class}
-         maeh_dict  = {'maeh'  : self.maeh_class}
-diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
-index 78035d04..45e73d97 100644
---- a/src/lxml/tests/test_objectify.py
-+++ b/src/lxml/tests/test_objectify.py
-@@ -13,7 +13,7 @@ if this_dir not in sys.path:
- 
- from common_imports import etree, HelperTestCase, fileInTestDir
- from common_imports import SillyFileLike, canonicalize, doctest, make_doctest
--from common_imports import _bytes, _str, StringIO, BytesIO
-+from common_imports import _bytes, _str, StringIO, BytesIO, IS_PYPY
- 
- from lxml import objectify
- 
-@@ -216,11 +216,13 @@ class ObjectifyTestCase(HelperTestCase):
-         expected.update(DEFAULT_NSMAP)
-         self.assertEqual(root.value.nsmap, expected)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_date_element_efactory_text(self):
-         # ObjectifiedDataElement can also be used as E-Factory
-         value = objectify.ObjectifiedDataElement('test', 'toast')
-         self.assertEqual(value.text, 'testtoast')
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_date_element_efactory_tail(self):
-         # ObjectifiedDataElement can also be used as E-Factory
-         value = objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test', 'toast')
-@@ -377,6 +379,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual("4", getattr(root.c1, "{}c2").text)
-         self.assertEqual("0", getattr(root.c1, "c2").text)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_setattr(self):
-         for val in [
-             2, 2**32, 1.2, "Won't get fooled again", 
-@@ -812,6 +815,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(3, len(root.findall(".//b")))
-         self.assertEqual(2, len(root.findall("b")))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_build_tree(self):
-         root = self.Element('root')
-         root.a = 5
-@@ -841,6 +845,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(value, None)
-         self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true")
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_bool(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -874,6 +879,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.BoolElement))
-         self.assertEqual(value, False)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -881,6 +887,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = "test"
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_intliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -888,6 +895,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = "3"
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_floatliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -895,6 +903,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = "3.72"
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_mul(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -907,6 +916,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertRaises(TypeError, operator.mul, root.s, "honk")
-         self.assertRaises(TypeError, operator.mul, "honk", root.s)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_add(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -917,6 +927,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual("test" + s, root.s + s)
-         self.assertEqual(s + "test", s + root.s)
-             
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_mod(self):
-         s = "%d %f %s %r"
-         el = objectify.DataElement(s)
-@@ -982,6 +993,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.StringElement))
-         self.assertEqual(value, "3.20")
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -989,6 +1001,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = _str("test")
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_intliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -996,6 +1009,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = _str("3")
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_floatliteral(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1003,6 +1017,7 @@ class ObjectifyTestCase(HelperTestCase):
-         root.s = _str("3.72")
-         self.assertTrue(isinstance(root.s, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_mul(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1015,6 +1030,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertRaises(TypeError, operator.mul, root.s, _str("honk"))
-         self.assertRaises(TypeError, operator.mul, _str("honk"), root.s)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_ustr_add(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1040,6 +1056,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(value, objectify.StringElement))
-         self.assertEqual(value, _str("3.20"))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_int(self):
-         Element = self.Element
-         root = Element("{objectified}root")
-@@ -1056,6 +1073,7 @@ class ObjectifyTestCase(HelperTestCase):
-         value = objectify.DataElement(123)
-         self.assertEqual(hash(value), hash(123))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1072,6 +1090,7 @@ class ObjectifyTestCase(HelperTestCase):
-         value = objectify.DataElement(5.5)
-         self.assertEqual(hash(value), hash(5.5))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float_precision(self):
-         # test not losing precision by shortened float str() value
-         # repr(2.305064300557): '2.305064300557'
-@@ -1091,6 +1110,7 @@ class ObjectifyTestCase(HelperTestCase):
-         s = "2.305064300557"
-         self.assertEqual(objectify.FloatElement(s), float(s))
-   
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_float_precision_consistency(self):
-         # test consistent FloatElement values for the different instantiation
-         # possibilities
-@@ -1172,6 +1192,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(value.text, None)
-         self.assertEqual(value.pyval, None)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_unregistered(self):
-         Element = self.Element
-         SubElement = self.etree.SubElement
-@@ -1334,6 +1355,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(["why", "try"],
-                           strs)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_str_cmp(self):
-         XML = self.XML
-         root = XML(_bytes('<root><b>test</b><b>taste</b><b></b><b/></root>'))
-@@ -1361,6 +1383,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertEqual(root.b, "")
-         self.assertEqual("", root.b)
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_int_cmp(self):
-         XML = self.XML
-         root = XML(_bytes('<root><b>5</b><b>6</b></root>'))
-@@ -1383,6 +1406,7 @@ class ObjectifyTestCase(HelperTestCase):
-         
-     # float + long share the NumberElement implementation with int
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_type_bool_cmp(self):
-         XML = self.XML
-         root = XML(_bytes('<root><b>false</b><b>true</b></root>'))
-@@ -2052,6 +2076,7 @@ class ObjectifyTestCase(HelperTestCase):
-                           before = [objectify.getRegisteredTypes()[0].name],
-                           after  = [objectify.getRegisteredTypes()[1].name])
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_registered_type_stringify(self):
-         from datetime import datetime
-         def parse_date(value):
-@@ -2522,46 +2547,55 @@ class ObjectifyTestCase(HelperTestCase):
- 
-     # E-Factory tests, need to use sub-elements as root element is always
-     # type-looked-up as ObjectifiedElement (no annotations)
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_int(self):
-         E = objectify.E
-         root = E.root(E.val(23))
-         self.assertTrue(isinstance(root.val, objectify.IntElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_float(self):
-         E = objectify.E
-         root = E.root(E.val(233.23))
-         self.assertTrue(isinstance(root.val, objectify.FloatElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_str(self):
-         E = objectify.E
-         root = E.root(E.val("what?"))
-         self.assertTrue(isinstance(root.val, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_unicode(self):
-         E = objectify.E
-         root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1")))
-         self.assertTrue(isinstance(root.val, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_bool(self):
-         E = objectify.E
-         root = E.root(E.val(True))
-         self.assertTrue(isinstance(root.val, objectify.BoolElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_none(self):
-         E = objectify.E
-         root = E.root(E.val(None))
-         self.assertTrue(isinstance(root.val, objectify.NoneElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_value_concatenation(self):
-         E = objectify.E
-         root = E.root(E.val(1, "foo", 2.0, "bar ", True, None))
-         self.assertTrue(isinstance(root.val, objectify.StringElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_attrib(self):
-         E = objectify.E
-         root = E.root(foo="bar")
-         self.assertEqual(root.get("foo"), "bar")
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_nested(self):
-         E = objectify.E
-         DataElement = objectify.DataElement
-@@ -2576,6 +2610,7 @@ class ObjectifyTestCase(HelperTestCase):
-         self.assertTrue(isinstance(root.value[0], objectify.IntElement))
-         self.assertTrue(isinstance(root.value[1], objectify.FloatElement))
- 
-+    @unittest.skipIf(IS_PYPY, "broken on pypy")
-     def test_efactory_subtype(self):
-         class Attribute(objectify.ObjectifiedDataElement):
-             def __init__(self):
-@@ -2677,7 +2712,8 @@ def test_suite():
-     suite = unittest.TestSuite()
-     suite.addTests([unittest.makeSuite(ObjectifyTestCase)])
-     suite.addTests(doctest.DocTestSuite(objectify))
--    suite.addTests([make_doctest('../../../doc/objectify.txt')])
-+    if not IS_PYPY:
-+        suite.addTests([make_doctest('../../../doc/objectify.txt')])
-     return suite
- 
- if __name__ == '__main__':
-diff --git a/src/lxml/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py
-index a2df6ddb..0951d5e1 100644
---- a/src/lxml/tests/test_xpathevaluator.py
-+++ b/src/lxml/tests/test_xpathevaluator.py
-@@ -11,7 +11,7 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- from common_imports import etree, HelperTestCase, _bytes, BytesIO
--from common_imports import doctest, make_doctest
-+from common_imports import doctest, make_doctest, IS_PYPY
- 
- class ETreeXPathTestCase(HelperTestCase):
-     """XPath tests etree"""
-@@ -742,8 +742,9 @@ def test_suite():
-         suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)])
-     suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)])
-     suite.addTests([doctest.DocTestSuite()])
--    suite.addTests(
--        [make_doctest('../../../doc/xpathxslt.txt')])
-+    if not IS_PYPY:
-+        suite.addTests(
-+            [make_doctest('../../../doc/xpathxslt.txt')])
-     return suite
- 
- if __name__ == '__main__':
-diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py
-index 08d03514..b81716c5 100644
---- a/src/lxml/tests/test_xslt.py
-+++ b/src/lxml/tests/test_xslt.py
-@@ -19,6 +19,8 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- is_python3 = sys.version_info[0] >= 3
-+is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or
-+           getattr(sys, 'pypy_version_info', None) is not None)
- 
- try:
-     unicode
-@@ -2085,8 +2087,9 @@ def test_suite():
-         suite.addTests([unittest.makeSuite(Py3XSLTTestCase)])
-     suite.addTests(
-         [make_doctest('../../../doc/extensions.txt')])
--    suite.addTests(
--        [make_doctest('../../../doc/xpathxslt.txt')])
-+    if not is_pypy:
-+        suite.addTests(
-+            [make_doctest('../../../doc/xpathxslt.txt')])
-     return suite
- 
- if __name__ == '__main__':
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index e08b43871c74..c9cdf59a13b3 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,5 +1,5 @@
 DIST mamba-0.11.0.tar.gz 33598 BLAKE2B c52ccbf1fca5dd6f27b4515fa6db65a8a28537e705d734bb126bdc9a4bd4afb5119aabc212f871508f91c21679e7e2215d0c7f13adfaabdf6ea49c942b7b3d64 SHA512 2faf941700800ba0432bfd170d6ff2278e5fc3ba4e85f486d33ed5f07e148284d400e2b02ac0f957a27d47b705fc52b042dc4311bdd175907e307e4dbfa95246
 DIST mamba-0.8.6.gh.tar.gz 15428 BLAKE2B d1c13d2e7b5bd4b18c497e1b1df21c19dfdc19b235c796e8277e96a95b787df56466661b995bcd424e550a2f139e7ff8b5d75e72cabde3af1593edb36321f9f5 SHA512 1ac59c7df23ec5d2abe5123756c438c282be668f615a8737f35478ab314cde8ffde2b02ef78ead1946b9c467362b825f73e0ba7f441ab44a1fd116db9b7f2750
-EBUILD mamba-0.11.0.ebuild 986 BLAKE2B e44be105a257f83bbf133c8e98dacd1cf169484f001b8caa6cbbaa3a17f153aca55fef719070871417d313e5b6e71a176bfd5b864ba8d55dac2e5259b33022be SHA512 cd032e8a9aaa6546e73eab4016a3d6aa546961d8feaad40d007ddfe3e1d99602593b8f19cea9dd3ca40f3cee44375e9be7137e69f3277fda8703adacaa57ad86
+EBUILD mamba-0.11.0.ebuild 985 BLAKE2B 7511d4c66ee08b4c98d41d643d357555fef8f976affa9adc6edc027514fe3bf232379381a713346246cec305ade97929c4826aaaaf2d8cae8f05fc7aa6a6e088 SHA512 3726358cc420f008cb682d4d89207d1af605f8fb7998240b228dda5a34215f8fb4cc464cd8dfdfe3206a03bb563322856925a34fbd06b41c0849fbdb2b8d8590
 EBUILD mamba-0.8.6-r1.ebuild 917 BLAKE2B 84d077583450081e42796de95ff868cc0efdca189f7a2b05bdf52b0a1be05a731f12deacc49cfcb59c2cf7bfc8fedd04be815fc27f6b49ebc7289efbcde2b3f4 SHA512 456d68087911b09109d3ba6916d77d2d75646e6d4b2ff1b1bb35f9e80208c2babe30e1ab98d1e24d10192f76984331b38bd35fae5273ad957644db4f664d7ee9
 MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/mamba-0.11.0.ebuild b/dev-python/mamba/mamba-0.11.0.ebuild
index c0c67a7b7de3..3f6be0377656 100644
--- a/dev-python/mamba/mamba-0.11.0.ebuild
+++ b/dev-python/mamba/mamba-0.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 4538442fcd80..396ec528082c 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -10,5 +10,5 @@ DIST matplotlib-3.2.1.tar.gz 40325615 BLAKE2B 7fd299f7d3948987e341e4313ed82d15de
 EBUILD matplotlib-2.2.2-r1.ebuild 6370 BLAKE2B fab5c042e14172c077f62ed4ae9a44800e2d779fd8119a4bc16d343b6702976b8e3e94f9f5b2884e11cd0cf7cafe37cb11418c5c97e5c9be4b1c4e581b5b7972 SHA512 3a618bb2718901cdd4be90679fa248d20e595b32d631f414e3c63c35ff98c58897d0167a0fb11c150808fe44f6cd5641c7bfceb933ad4c09c2d92984fb7e8d28
 EBUILD matplotlib-2.2.4.ebuild 6442 BLAKE2B 52949608100fd31dd47ffd28d97040548eddf1309539b9e367da537af985c338974b9b96ae1094e8a8e53e1aa985b3e884507c2e2afaeda0ceca648f812d891f SHA512 fe219e8e65d7b66d0283c9fca1ae4acd08c993a77d44c5d361b7337510233572f2100da15bf97b1f70d8527cbd8d3ceefcd1c231f2e11cc4010e29042685756c
 EBUILD matplotlib-3.1.2.ebuild 5828 BLAKE2B 0ab5bcb5ca71e16ef0df465f2028d384e35980a04d01e74f073e149d49170e0a0039e9767a5d5cb1d53c1d0e8428e4212957248427518ae86c8be4dfc013f447 SHA512 6a8a36c474ed647331fba9210d4520d7eac006ca456a75e576fec80272f6fec71634edf4f02c6a7f2508a6e61219e72e7f14cc0582bd4731e42b8e91c8136612
-EBUILD matplotlib-3.2.1.ebuild 6108 BLAKE2B 8a2736177699b844b5f8b175d90e0cf9eae4bd62963b010c654c0ffe6946dea36ce8bb07e3278c5c9ddf914c5318ff2272d1c376a545e3accfaa398015f69df5 SHA512 597da00ec184a8122efd63d7ffc82d2a0e64b2d108e6b5d3ec68a9e55e8726eafca1f23deda773a9d3fa8fa72122a7a507455f683098043ea65030a8325aa18f
+EBUILD matplotlib-3.2.1.ebuild 6113 BLAKE2B b640d611d2f619462c8cf97ae9c663566ed28f123212a6df0efd5c2eb7ff5b042a646ef0645d0859aa2cd48137e076dea94dc0636f6c106def7e2c2157b6713d SHA512 17436a575584445c8da48ab0f47aad5a067158c79c9449e1d8428061f86acae51cb280c3e8f1a702989b864a97f586b09a9d9f612a169b7e6b18b0f0e738cc14
 MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/matplotlib-3.2.1.ebuild b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
index 88dc355f0038..71c93b77c276 100644
--- a/dev-python/matplotlib/matplotlib-3.2.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
 
 REQUIRED_USE="
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index b121dbe9612a..6cc8d79b09eb 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,4 +1,3 @@
-AUX micawber-0.3.2-remove-examples-from-setup.py.patch 652 BLAKE2B b7551df8c1bdc16cbb10b54e071b965a273d4b51192cdf17f50d516580a6b52065d10b46274c1e3a90a063d87fe204111ab65eac2c4a937a9e59728ae9381d9c SHA512 225bfd7c7306170c7c6d0b564c84092b015ac078ac597764c0029613209851e157ae5bfa2e910a5368f540e68c5a01aa44df78511dba753c6d875b8eb144cda5
 DIST micawber-0.5.1.tar.gz 34210 BLAKE2B cc3be0dfdb52a733ff37f249d589f37812c5f6b641b1dd2092faffcfeff9cd79c3989324def721859584280405a28c046ec98aeee3a89106fec0e3f27ed4fede SHA512 888826ced322a0584d827f7e0c58691281d8147e7c3ca9e940493a8beba41fbf6d005b0ca7c4ee6eb8e9c37edea4fb8244aaea9f553b886b1410d91aecbae4ee
 EBUILD micawber-0.5.1.ebuild 670 BLAKE2B 7c8079710773d453e544edb8cafc0df0b0e4bb3fd3c809adec1ab7324765b27aae4671723f0b0fc916028657293e63db0b14f5f29a7d3acb0a369df280f4e432 SHA512 aa101c9f5eccc1e8d666c42628695c175a2fa8da499f3396da30f8ced3145a7fafe3d85838fba267d6f5d9952e15249a60a97a1ed7274e7301879afeda8d7813
 MISC metadata.xml 332 BLAKE2B 1d2fa19b717b98bac1f2ad6fd261ce54360b6185671a3d1a51bc72080a6708196c0abcb5d5226dc0e4c693258caf85476a53d4b19d452b847e67a88adfed275c SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0
diff --git a/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch b/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch
deleted file mode 100644
index 3d031e8a91cd..000000000000
--- a/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- micawber-0.3.2.orig/setup.py	2015-03-30 02:08:40.000000000 +0800
-+++ micawber-0.3.2/setup.py	2015-07-20 14:53:42.776972042 +0800
-@@ -13,16 +13,11 @@
-     author='Charles Leifer',
-     author_email='coleifer@gmail.com',
-     url='http://github.com/coleifer/micawber/',
--    packages=find_packages(),
-+    packages=['micawber'],
-     package_data = {
-         'micawber': [
-             'contrib/mcdjango/templates/micawber/*.html',
-         ],
--        'examples': [
--            #'requirements.txt',
--            '*/static/*.css',
--            '*/templates/*.html',
--        ],
-     },
-     classifiers=[
-         'Development Status :: 4 - Beta',
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 41c57e5e0440..d3b9e532b1c7 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -2,6 +2,6 @@ DIST minidb-2.0.2.tar.gz 13928 BLAKE2B 7b6997bd0ed852561c1a45e1d8f63030798c59ebb
 DIST minidb-2.0.3.tar.gz 13992 BLAKE2B 7ccb26625c199517ee63e99b1839037046c29a4c72a26f457ef3b4c22ef1f23b0bf632b37790c2981fd2c08929a39e8f015b4cf890d04d5e9926cd07b5def699 SHA512 90e2c51af64a373a9dce5e6fad94440a8e5ff3136ba4004deebb5f9a7a7f039ebf1b903a361d678771b6e18e951cacbd7392f1fe2df8db04cef04526a07a3ce2
 DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
 EBUILD minidb-2.0.2-r1.ebuild 592 BLAKE2B 53d23badbcd6caa90f6b76359d9f44b85e31f0ec20b3d2f03d671e49e8fe24926899d254f6ba4209425082ebfae4ec441ea71b174a8b9a948b111b3242631e55 SHA512 1d0354576b6a1a174ccc7404fcd4331caf49b72ada41a59635f03df70648abfba0ca32355304bf3868f61eebf822bdd45eb34d7021ec56f58c4e70646c9fde7d
-EBUILD minidb-2.0.3.ebuild 443 BLAKE2B 99af1561fea752e73a9e0c377119f499c0bf5f370279839cfacf995165e74fcf0350fe0be5cdccc55b12eb3807fd102d35f9c3567877a99f620b79c99331b69b SHA512 41630b74ed666d6662665bc8a16cd29ae7e113ec6da38b9cc1da3e54d508e6efc036228d355f057087aeb192ad275e83bf942ea020a055e868e1137688f3c48a
+EBUILD minidb-2.0.3.ebuild 441 BLAKE2B 041a4860de3422178b80df4b99d1e3e9143fd7ae864c3f8c6fdf2aa65952888265365a3ccadd6fe0ea5877c05d572eca14ada376f4617fc2ee203324f15f52ca SHA512 bab42bfa547f71831c06f660e137d7c9cf02d4e109d76c21f4097b3babd358c9688de39dc78ea450c3e2e8724d847a4d05ee78f34e11482b08338f4f428e8d02
 EBUILD minidb-2.0.4.ebuild 445 BLAKE2B c4645c6b95b4622d3fc536f95d2104c40137d479227a3434d6f0971892119b2c04effe98a547bbe546030833370639a012711a0eb11fa64466eb029ec89431f8 SHA512 25822938b715a87de7495503c7bde24ce9baba2a24e3f7a06fcdf16314b5598e98b5ee88326d2a98517806fe483888873a468e406b0b1075ba5516758492f0e6
 MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
diff --git a/dev-python/minidb/minidb-2.0.3.ebuild b/dev-python/minidb/minidb-2.0.3.ebuild
index 06868ee324b0..b18609625fef 100644
--- a/dev-python/minidb/minidb-2.0.3.ebuild
+++ b/dev-python/minidb/minidb-2.0.3.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index 016c77e3cada..eefd16b8d990 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1,3 +1,3 @@
 DIST misaka-1.0.2.tar.gz 78702 BLAKE2B a07be5c94098e716d1494c69d84c50f8a78fe3b3a1a21d9a2ecce1c7474de9e493775b50f18cbdfa7c2bfb914fc4229d281282a80523e794de846d0f947238f1 SHA512 ba3ef2e4c66e0e33e21bb554c3e317342929b3d9969aaba7e3dbd745430b3952b6bb7d3142a3049c4de3e3dede7cc68a9810cd43642e014949e4564fcb2cc74d
-EBUILD misaka-1.0.2.ebuild 516 BLAKE2B 39735e5dae4df62e7e3abe03d77cf11f02bcde2f9a5e8b741c90ef5ae3a9135923f8b17c6eda36eab77ab7f1b5f6f5889da5c0ba86156dba172da92698c9a82f SHA512 f93c06fd52d9c1ce7728f3dbe2d1a542686d4be7ba85d361507ab48e139b4a36b08f9f3235bf1e88fe7da46359d1e68c34951a330f53eb188939d6f53a84c825
+EBUILD misaka-1.0.2.ebuild 514 BLAKE2B 8f2038be015dccf62c6cc5b92ccf64f8e1b2e3d2f4555aaf7b3927f4df42e368b862edce8e3e2bc14da6023f24c36db5c9f0664e6e3cee1202d7850e484ce769 SHA512 b32c21fc1245dffa1f0480575556e68fac46ec7a17338757635438a7b5f01f6c999595b3d6ad263337c64021c1f8b623e806f29461aae40ded4d22b08e3cb9cd
 MISC metadata.xml 325 BLAKE2B 5af905c4032f92ed588676973f3525d35f77df80423be95e4e5bc87272ce71c2d685bb26cc09a448716f824e51334f60c716545130a959ca2f6e5d7334760c53 SHA512 bc9e07a67003034cee777f14118c2bf840d6481b61f84d811f42fd714cf9bc08675eaade34d2ac79c8efcb31e56e607156109a0b0984e23037f5744efd045a9a
diff --git a/dev-python/misaka/misaka-1.0.2.ebuild b/dev-python/misaka/misaka-1.0.2.ebuild
index d5020c59225c..0d286e7345db 100644
--- a/dev-python/misaka/misaka-1.0.2.ebuild
+++ b/dev-python/misaka/misaka-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="The Python binding for Sundown, a markdown parsing library"
-HOMEPAGE="http://misaka.61924.nl/"
+HOMEPAGE="https://misaka.61924.nl/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index b015c9916788..bc834c6689f5 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,5 +1,5 @@
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
 DIST multidict-4.7.6.tar.gz 57710 BLAKE2B f08a45d4ce404dbb64d2561ee2328c0aa3a8fbf65483082c11e5e1554bec23e5c711da2350e241308a1239256b942ef6c420e6e51aef342b380cc01f84d4ca72 SHA512 5f90cb04fe2562884c331018a5002e1370e2596e0afd21e4289ab696847a3028a074bbaa6717b3905161f823f8592d6572475307039f8f97c1ac65aad815a6b0
 EBUILD multidict-4.5.2.ebuild 1129 BLAKE2B 017145854cc27f2c1280d8f81fa1fd7204066d36b000c827525d786ee34e78cbd309c7dcba54125dd048973e4a8dc1f16d77206b258e53d7a87a5839e92f481b SHA512 067dc0278f9cdbf3bb61f2ce6530b67000a535d234f010fc6f2066638faef40d9b108c9b0b76dce7a22396b9010b37a41909634386c80e22502f277150133bcc
-EBUILD multidict-4.7.6.ebuild 726 BLAKE2B e545b279fa18a2182277b69450691663a0ed6174d93455651aa65bf4f0f4b88ee4028b5306c818afe7156b1dcfdbf8ad4bbc64e686ab2e57c9576e969a46db9d SHA512 33ff49b586672bc6df810bc7315a1db80853e063bc767e827da238e099b95f84d00022f168fbd540aff8c5ba1e006b34966d4d6270c4ede1e6987b92c11147b3
+EBUILD multidict-4.7.6.ebuild 732 BLAKE2B 1d275ecf90899551cc5d44f08bfcdc8642bc8b787f654869e91675eda46b897d0f855b30a423cb65f62ff72d036f20d04859190ef2a545491c5367f1fefee285 SHA512 fd3e5f8072f003227a292f7d61c707a34f090e8338fbd80c2497c5243c89f324443b846a08e6ceb98b69dbe3f828db67b372cf86d29eb3d404f7c0c275c94509
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.7.6.ebuild b/dev-python/multidict/multidict-4.7.6.ebuild
index 3b6a3d9ddecf..80f447507069 100644
--- a/dev-python/multidict/multidict-4.7.6.ebuild
+++ b/dev-python/multidict/multidict-4.7.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 87ee8dadb2d7..8a483ba7539d 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 732 BLAKE2B 982f431ef878da8ae0996808966b69201da4cf0a653467b115ca72c61cdb5dded13f164b02189e7cf4c669e41992a63cc19b0f810a501c59893e8a3c2c40d969 SHA512 2b696ab25940eb6d97a6243b25406eb6918f28eae26717baa367a0e986d0df0a6b6aa18f3325cd406018439cbe85c17985c9427907ad7bebea471c5b84b31e14
+EBUILD munch-2.5.0-r1.ebuild 735 BLAKE2B 00083a872bb052f0802c14331ae55be2a26cee7114317d65a60727c94bced61f3b90d96fa4a6c11552ddb5e0107c0f711141311ce1fe7f2b491b7ae5329ca83d SHA512 7b744d1faf42ac254cb477e111cf238c35b4da77f5b0ffd703843f5fd97ce03b752e95e68ca5222f6b7731b574ad486ad0ab231959ff505d75aeaaaea84366da
 MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index e2a755e99a60..5f016a764937 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 ~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/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 80eed316f9bf..91782c573a37 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,3 +1,5 @@
 DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
+DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
 EBUILD nautilus-python-1.2.2-r1.ebuild 946 BLAKE2B 52f4f4077034a671568e4de1337a7464e62718ea2ce9db39aaaeb7ed53af42acd6c3c4870596ed14c648b8c2ed39c5c145d85599d184df6d3e049a8f09e504cc SHA512 6ea8233389a35c5114a9c73b29586d37c64974b3ab8589378a6d94466375eecea712f3dbe87cfa251f1eae6531ff43302de23b609984a1e5442b56756a68e059
+EBUILD nautilus-python-1.2.3.ebuild 952 BLAKE2B 6354343ec86b42de1cf0db07651468559fbb0ddaee6ac1bd7c767c85e5a4cfc7de653e9a6aef8d2cb0104256b6a37248bf17971457bf094668766d399352501f SHA512 9a4a5a29377a5dca89d3cf57352c61ff692e366010b4e2d60abad9f52aa4835c194367f987aa3cfb705c24216b363767a696a961f8e202dc681c848bb60be38d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
new file mode 100644
index 000000000000..8f8557f2af2e
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Python bindings for the Nautilus file manager"
+HOMEPAGE="https://projects.gnome.org/nautilus-python/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Require pygobject:3 and USE=introspection on nautilus for sanity,
+# because no (user) plugins could work without them; configure itself
+# requires pygobject:3 or :2 and >=nautilus-2.32
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=gnome-base/nautilus-3[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	# Directory for systemwide extensions
+	keepdir /usr/share/nautilus-python/extensions
+}
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 34564b59c8d0..4800d353ae41 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,4 +1,3 @@
-AUX nltk-3.4.5-corpus-tests.patch 1625 BLAKE2B d070e7295ccdda93eae813de2ddd1c6ab3832722ddb815287cc1aa05ee5a3e6619be796d0dbc63a1c389a6f3a8b4eb9630564c2139bc636302d07c2212c446f1 SHA512 495179ae7ce022d1733508013d7a74c01f258a918047337b9d454bdc6f4a2b49a9fa2b77891a0af317ef6b1706802ab90e7c9bd2936fe5dc6f67371dd705c1f2
 DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
-EBUILD nltk-3.5.ebuild 1633 BLAKE2B 9df8ecea15fc2f23c410abe00b4e39f8e955da3c6fadde782d0070310c96397cf6e7eb03f338d8068dc64ad5b134e756beaf64e6efe96b49722cfa12d4377511 SHA512 4342c0bd53ad0af4ddab1c6c77812bb72d760fd7e98f496dc2d4337d1a1f36b8f44a097629f31b9de28dfcb71964d3b5951fd6ecfe4e86364dbdd345e3a5f9d2
+EBUILD nltk-3.5.ebuild 1670 BLAKE2B 4c6cc612fba517798f4a95d8b1b56c01911e331589cc9b16b368dfb4b690fc5cd41cb641f722b93e9c3e141acfb9dad15d1695b647e262704863a8d102ae3b24 SHA512 badaa18a4be51c9fdd398abdcc854c23d29af1a2816d1cb22123df6d1923c6b59645b86e2f2d096c949b95d6dc5a0c1e472a9f69c71459ae7ece004a1b0d52a3
 MISC metadata.xml 369 BLAKE2B 71cbdd71c636a0ad09350ff40d6f8852ccba6058d32b5ea7dfb2202d5909524fb78b4eff17b6af044ea65d67c67cb19cbc8fff1d20dcd9d4ed9906a0b5a49271 SHA512 7ee1d09e28699e68fc04a1ada4aa7fe091a1624cdf5e1be9568163829a0ae832bb26c58abb7509226c212f0d34d6ad549afb169a67167f1ae26b66ef431db65b
diff --git a/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch b/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
deleted file mode 100644
index 0284aec02b91..000000000000
--- a/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/nltk/test/corpus.doctest b/nltk/test/corpus.doctest
-index 5509fe2fd..0a34c9522 100644
---- a/nltk/test/corpus.doctest
-+++ b/nltk/test/corpus.doctest
-@@ -94,7 +94,7 @@ If the reader methods are called without any arguments, they will
- typically load all documents in the corpus.
- 
-     >>> len(inaugural.words())
--    145735
-+    149797
- 
- If a corpus contains a README file, it can be accessed with a ``readme()`` method:
- 
-@@ -387,8 +387,8 @@ examples illustrate the use of the wordlist corpora:
- 
-     >>> stopwords.fileids() # doctest: +ELLIPSIS
-     ['arabic', 'azerbaijani', 'danish', 'dutch', 'english', 'finnish', 'french', ...]
--    >>> stopwords.words('portuguese') # doctest: +ELLIPSIS
--    ['de', 'a', 'o', 'que', 'e', 'do', 'da', 'em', 'um', 'para', ...]
-+    >>> sorted(stopwords.words('portuguese')) # doctest: +ELLIPSIS
-+    ['a', 'ao', 'aos', 'aquela', 'aquelas', 'aquele', 'aqueles', ...]
-     >>> names.fileids()
-     ['female.txt', 'male.txt']
-     >>> names.words('male.txt') # doctest: +ELLIPSIS
-diff --git a/nltk/test/unit/test_wordnet.py b/nltk/test/unit/test_wordnet.py
-index a7b26ac91..a1df3d396 100644
---- a/nltk/test/unit/test_wordnet.py
-+++ b/nltk/test/unit/test_wordnet.py
-@@ -204,7 +204,7 @@ class WordnNetDemo(unittest.TestCase):
-             u'preobrat',
-             u'preobrat_v_mišljenju'
-             ]
--        self.assertEqual(S('about-face.n.02').lemma_names(lang='slv'), expected)
-+        self.assertEqual(sorted(S('about-face.n.02').lemma_names(lang='slv')), sorted(expected))
- 
-     def test_iterable_type_for_all_lemma_names(self):
-         # Duck-test for iterables.
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index ffb0ad46e42d..d127c3a08cfd 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -19,9 +19,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x8
 IUSE="tk"
 
 RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/joblib[${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 5222e1e7ba62..5182909152d2 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -5,7 +5,7 @@ AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a9
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
 DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07
-EBUILD notebook-5.0.0.ebuild 2211 BLAKE2B dec5d31a5630cf4656ebfcaa842995c5b13ca57de3da9984653675283b2d3989ff5bca3aae39718ded005b1af60c080e6478a238bd3f69b670565585d7773f46 SHA512 8549fab9903c51a58b0f35b9cc32bfcfe03404a940cf9da7bae50dcf7f0e40559b3a522882a538a8ef4e8705bb407af75eef17992f3e0ff9c21efe17a3e165bf
-EBUILD notebook-5.2.1.ebuild 2516 BLAKE2B b429e5ee472f5295796c4f84cae8c20de9979ab26d362cd2cff2fdc1564742f8ef227e4a2cdb0db920799230aba9f3154950e50d2cdc1293f480b1d4f89115e6 SHA512 f14bf9da66ba0c8ad00ed722d3c74bc1c6420fc7af2e83e356289259c9990f7fd3794eadfab621a6c701c2d283585b78f1b6e823c96aac68bfb54922150aa352
-EBUILD notebook-5.7.8.ebuild 3000 BLAKE2B 05a81e32db189363b7d3e4ef35c61abb90a9ce8c0515987777503076e9528c78f5f32dc6cef5fc27b55a331ae6e72d577453c9f484742bcdf498d6da57c8e05a SHA512 b40b4be6710f29b82dd8968040f5d2932494e426af903e8418500e8e3bb844601c32727a750ad518ea7f52cc2fd211900fb58b7a5d42378c585002381f839b52
+EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef
+EBUILD notebook-5.2.1.ebuild 2517 BLAKE2B 6ad0ec3dd6a6aa30f269bff462b737801d3d6f5837ad655a75c7946579d74841f86335167ec11a544c5f5b9ba3ab19506010f2475546fe762bc3a968fe0c77b5 SHA512 599604d52c0b3f14eca04921caad48de5516b946c22d386c4343fecefd1cb7c543084490e007a0762251e1a7b4caea57d2e142d2ca56ea6a9ec9c52a53b00d92
+EBUILD notebook-5.7.8.ebuild 3001 BLAKE2B d2ca55e74d0e5d2f82b931700651879278e113b15c468e46c449dcd5f1f58deca42b5efe8f741aff5942e49e671882e178089764a42c3a260c4ebfe5ecd0a697 SHA512 6e436471fbd0014fa0084dbfb903c18118cf0119c447f3ac733dbc845de55b8b28771768b3e937e8bddd3eff6a93482d83b3308f9f551e17de1be885517032da
 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index d58a631f686d..d4c0e2123f49 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/notebook/notebook-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild
index 33f68859535e..29ce4c1c11a5 100644
--- a/dev-python/notebook/notebook-5.2.1.ebuild
+++ b/dev-python/notebook/notebook-5.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ed340b66e0a0..a713d74f3835 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index d73a08886ac3..d19cce6fd59a 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
-EBUILD nototools-0_pre20200207.ebuild 946 BLAKE2B 1e7492505c494c9bfc16cf0e2edbe281e54ce2472a0dd0a36b3e2038fcf49f0716ba28bd34e535b0a2ad8294b1c358007f76be84447710822f30fb33c63d512c SHA512 c26e89e3d74dfdeb53b343d4b91c6b14f4599ea7b705aed5d362810e590a320848a34f92a5e88eeaf96bc059bdc2455b463ebc58a91c6033107a3255b447ed9c
+EBUILD nototools-0_pre20200207.ebuild 953 BLAKE2B b35966cac8382c0c1a8a81605b50e7b0baa51ebe2456bf3b70f4ace4213fe4ed2761f46f59a7ac2d8df8154230f28ddc837b1947a30058da235afc4af233f769 SHA512 082c84ba2add05505c052baffc16743ddebb9bea5ae42646a169ea8ce9917aefa0141eaa93cf358f042d9288d91c37061a85930d834f8345c411562417f0db60
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0_pre20200207.ebuild b/dev-python/nototools/nototools-0_pre20200207.ebuild
index 95abe33d4b68..2c8b5e90d206 100644
--- a/dev-python/nototools/nototools-0_pre20200207.ebuild
+++ b/dev-python/nototools/nototools-0_pre20200207.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/notot
 
 LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	media-gfx/scour
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
index cff7d757f0cd..83b805005da9 100644
--- a/dev-python/numpy-python2/Manifest
+++ b/dev-python/numpy-python2/Manifest
@@ -4,5 +4,5 @@ DIST numpy-1.16.6.zip 5143340 BLAKE2B 2c31473551aaf00e7d3175ce37463ce0f14ff3e77b
 DIST numpy-html-1.16.6.zip 12190671 BLAKE2B c24586a40bb05fdb2f2f092778e01f7c60b17d2c695d0fb8577e988778ad80b711edf7e067a20c699946344a50febc152ab586f4653b80bcbeb489650dafbd1b SHA512 ad25e7b91b992af78a6748f12d6fcbe153d96cb8667d5dc4a6b6b2a6105e24a11c32cbf63dd3314ed4aa9b65a55ec5b3a51cd7763af5dfdd133510ddd6e4ed16
 DIST numpy-ref-1.16.6.pdf 5183393 BLAKE2B e92a8a7a32ab45d2fdfd6760e62d8d9b5b3f89e202a29e18ef1b6ce49ec56bbfea0e48e0c47b4c35cad02783fa1db33726a0f4fed4a50b0d8ed84babced8b79e SHA512 66dbb684f4140874d19826b479c781e16e7992a7cec46137f785f9a8fa071911966fbb3932cbcdcd040bbb5fbefac8c96d511ef623a57fc268aac9331aae8d22
 DIST numpy-user-1.16.6.pdf 621980 BLAKE2B ec735ff7057935d3a7f33f291792b74618f5dc10ee091c434f49c77e58f683821af9cce46286564ac9b8cb0111498f9d1b657d0c343e0a4313c3f895982dca8b SHA512 ff03719c91707a39b4bc388558838f72d4412f34dd0b07f2a0b2cf8fedac6811e8789985013cf1f23c7a650f115655f71e9cadc51ef4e7ae6e49d7552752409a
-EBUILD numpy-python2-1.16.6.ebuild 4546 BLAKE2B f75598df8e832d523682d14a63247bf66335054b6cf3761cdfb86f1ee783df17e844e5169d8e8cc310a7fd1aba30009e43e17d33f7311fab17a12b3428257954 SHA512 71046ffd8c95ab6f3868152d19a41d8044ec2b8da469de51986a0174809d2d35481fa097d40f2ff27bd4e36c4c6ab29addf676a9c231e6bcc2f42ceace8d8011
+EBUILD numpy-python2-1.16.6.ebuild 4544 BLAKE2B 73d2aad4b4bcc88287eb7c6f285d1e046ec8ef6eab83a51760ce27a617743c8fcfe8260b3496d045ecc6f74bee2c25c369463a49b4fdaa74fd8713019bf3ea61 SHA512 0fbfeaaa16ac3a552186f3cca77798694a40822c2a6ba6f2fdc3823042e6ad0d6c18ee1408c358f287ec4bc8c56016dcdc29602a045cf18f8b57b3bd9c54c18a
 MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
index 082803a63d19..4fd160747814 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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"
+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 lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 3e124b7f55f8..c3ef530b861a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -4,10 +4,12 @@ AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67
 DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
 DIST numpy-1.18.3.zip 5435268 BLAKE2B aaf14627ca24e27806e6a5498a8b91f85c2582794db2ef2ec315e88b107435aeb2e8f288c68ba00593150787d6deb887faa029f850df4c6cb65426499f7ee83f SHA512 afb14dec81ade556e10b7de372e9d7b01b4bf246609c5eea26ad76ce93e6d9caa95479ae70dbfb725f28ac4802f94203c92e1e991852d2866b5225fc9d68e68d
+DIST numpy-1.18.5.zip 5441636 BLAKE2B d11bbf3c38a4194942d024ef82d63aa80a3d9044480a54e1b25d57b26f4dd7936b8ddd9c8b2636e307392c96fc51cb687e7a0e32ea7df9c85d46d80be45bdb46 SHA512 ea1896535016d3b207152c503005bf82095cc82c263f7f32ea75ce2d9394724f9700cf2265f9fb1f38169c37a0fe63ef97e88f84637f11758c52c624eec3d141
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-1.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
-EBUILD numpy-1.17.4-r3.ebuild 3694 BLAKE2B 0c614d42c0a67922d882eddde2cd97de9d3d24c72d8a344ec6690afffa5e1f47962a2762fa49e38d54bd0d64f003ead03d2e4c0dfac4e0892745751add5f921e SHA512 41b898ba6c4eebd1c9382e2bc392e04a3e0d56e6c5ab3707d7a252e02d45f05f54de6569da9f6f425b9874d3082a020cb7a2171500e3c6f53559a90b36cf6b7b
-EBUILD numpy-1.18.3.ebuild 3735 BLAKE2B 6442e75f8f8c4cef1c9a2fc06edd5cdbc71327c6f7952c90b4a0d3b34ba541571fe706a043f2c9617c69ef2babfc32b08b2b50675eced5358bb3a428727056a1 SHA512 efdd2f3b0435e5411c232159ae2975ef0d41c182bdda2833f633f6410d83bf8e456fc5c0cd06cbe211e61c67daf9911ce37b0d6d8d0189804cb3016527d7ad0c
+EBUILD numpy-1.17.4-r3.ebuild 3692 BLAKE2B 3066645644584c6cdeaeddb84da1ea811300e8f7df77efc643e39461253451fb3008d9194998db83f13648e1e79a6b06c85bc063678a1b76b1c3acf051583502 SHA512 622b8faddb286e75b85ca73cad6946ca6fc2fcf78f38bc38095ca0a0e038cdabe104681b51e093f6b1ed27602d5088b2f036494c217045368a0e3bd0ca7156ce
+EBUILD numpy-1.18.3.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
+EBUILD numpy-1.18.5.ebuild 3734 BLAKE2B fb067fa06e1341dee3f64bb41caaf149d96d1870b1c6911af81859b257cf1b2ddf3ed21833255345e63d89202508e812a9263a281878268422d018ce0926521c SHA512 148632766a283427b693670b7d733138ef9d119bd640db4ea04d0858a502e7befe0a2328c261ce692368cbee77581c9c2f3d5a75f0b741ecd9353194afffc381
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.17.4-r3.ebuild b/dev-python/numpy/numpy-1.17.4-r3.ebuild
index c785601b1c78..6c64e49ccdba 100644
--- a/dev-python/numpy/numpy-1.17.4-r3.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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"
+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 lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/numpy-1.18.3.ebuild b/dev-python/numpy/numpy-1.18.3.ebuild
index 05e59611dcc7..eb27fd1bee00 100644
--- a/dev-python/numpy/numpy-1.18.3.ebuild
+++ b/dev-python/numpy/numpy-1.18.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
new file mode 100644
index 000000000000..eb27fd1bee00
--- /dev/null
+++ b/dev-python/numpy/numpy-1.18.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="1.16.4"
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+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="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.15[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	"${EPYTHON}" -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 6edacd3e4827..2c316733e71a 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,5 @@
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
 DIST numpydoc-0.9.2.tar.gz 27555 BLAKE2B 47b7788c502a26c40889c84563c0b94983655a653fa1f783f47d667021c65c7ffc0d2cdd14a16dfcb982da48642c0b07c949f57336d5b67c897a78815684bcac SHA512 db8f5c3b409ece0a40f1c2ccb06eaa182896d173a5c913c7e6c5780fd021d746c48557fee6f050db8c42cfa41a5021901342bbb93dfd8b8daf7d43fead9cf94a
 EBUILD numpydoc-0.9.1.ebuild 782 BLAKE2B 8c0c94fdaac4280ce66502dcdc254de03a8d33384586be2efa249728c93bae31a655f90869d33ee518ae8bf9edb97b56de4785ece4d076caea896efa6bfcfe03 SHA512 4bd71ffd4a8fdc1b61e853d39773cf1500933df899abdebb9fe4cc57bdbbda91e7f917038caf548abd9710bb58e6f3499e3db62fa54eaa0681fde58ed4483010
-EBUILD numpydoc-0.9.2.ebuild 594 BLAKE2B b53c2734bf24b1d208bf7c1bdd8226b3df662b3a06a967692db3feaac09d6fa9dc5401c51806c599bae6ab98b2cf2ac82783e770e38c83c751bc3a2355875bbf SHA512 a76826bd2e0e8e1d1ed6c47039c086fbb675ba1ed35bffbb13345b4a9a90589477344b5632cacbb29da7208fd2776d5437bddd06ea06f990ee8c747cebfb0c78
+EBUILD numpydoc-0.9.2.ebuild 599 BLAKE2B 10a2fa535d396c8a6728d77d1821ed9cd0a55ead466f43a982e00a2c13c145590466cd3a0bde08d461b66512ec82ad4109f05a623e8aae8e293d18f7edc0b999 SHA512 eeed43d37205d535ceaacd2484b2e65167bc34f134208a53579457cee20d21b3d63c7e8e2a34dde040d4194e7bb001317de9191de0b247f15865f02456cadedb
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.9.2.ebuild b/dev-python/numpydoc/numpydoc-0.9.2.ebuild
index 5722653d5557..47be816cb48c 100644
--- a/dev-python/numpydoc/numpydoc-0.9.2.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index b6f8223d514f..9c2d12ef6356 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
+DIST oslo-cache-2.3.0.tar.gz 57209 BLAKE2B aa34c4deb0206c86181e629b1ccedaa3b0b7a503f4648b9ffb23dcba84c98658017a720701176776652a2a58447c54662314dd4853ec6ccf6c2acebb4b559325 SHA512 c3ad9c326fa71985d4546bd20bcb8aa9508808c8eae2a9e3dac1c014d148bfa8f5a847eb2ca8d1a204cce07b6d640f9541491dd41c7c6169e993e408786358af
 EBUILD oslo-cache-1.33.3.ebuild 1064 BLAKE2B 753592d05bf39a8ac6ec16c056bddedb5e99b007d57679d277dd74e598531c8388fa19f421e8c5a537cd4269e5e448f2162e6f15ea02abb01135524580e66c80 SHA512 90195588142d161bfa928a5690ac37d0fd0b125c0f44448289251e12116357e9f1bb3fa232228022a8b348d297e338aff14abc3a736f450c137a073acb9b3d90
+EBUILD oslo-cache-2.3.0.ebuild 1023 BLAKE2B fc25169df8bb81be966a7e8776bd2d3d2d690f72ab56133841ae6937f1542fba589a60d054cf974d6072aa5f59180655b5da992d1cf9406243029cb81d7e497d SHA512 4f3c9aea97dcb20064430c073553f4d927d01b6dff2895e33159f5a7eeba73ffe51fd0bd6d541aab1ca443271878acca6ad82eb50b8c0471ec269a98b6bce242
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
new file mode 100644
index 000000000000..617334205e5a
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+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/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index b09c482ee957..a4b7c8fc20c1 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
+DIST oslo.concurrency-4.0.2.tar.gz 53910 BLAKE2B 090d9ba4b5267f63edf6cbc6f585e48019a4ac293e24914a8f7c52009b34ce9a4822a8705934c642663bd2a09be3085458868159ef041498e2085e4ccbec50f9 SHA512 ca1ef615ebe986acac853666877061bbc7a02c09bec294ec6221ae4800a561cf9f218855f7eb8b96184d645924e5c68963b47116835c7d2495de83617439d1ef
 EBUILD oslo-concurrency-3.29.1.ebuild 1815 BLAKE2B 72279de34583eec51ce337093b9b0efc24628e10a9ec07dbf981560a8cf77331d80a3b5950aa1df52034282995b441ef7317547caff41257daadbdec11799cc1 SHA512 9576baba99ea2de1b6d241fb4f2cb8537126099070cf24e08f618ab08c05d13bec23cf3c0c18005edec3d58b873fc90205ffc1dd978b4f1bc9e0383f480bc23b
+EBUILD oslo-concurrency-4.0.2.ebuild 921 BLAKE2B c70117bf079d08c7187cfd6a0a886a761b24234912fc48115101e4975d2f0e627a4d09b36f1c865f396911c31311f56ec2b64a35f754f0c56573f3a66a2f859d SHA512 5ba1207cce8e69ed2156a160b2d325b0270f54d10e713a124bf57f4e848916546861832d4b4f4edb47ded5c2ed18f11c6d6e4891df0eb8c76001d6c7fee26400
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
new file mode 100644
index 000000000000..7d4e1b76c591
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="library for running  multi-thread, multi-process applications"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
+S="${WORKDIR}/oslo.concurrency-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+RESTRICT=""
+
+CDPEND=">=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/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 53c7cdfe1545..4885f68fce96 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +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
 EBUILD oslo-config-6.11.2.ebuild 1306 BLAKE2B b5487b165d8d0033e059f12e8659d65337cb5440bdb1842cdbe8a5f4cc7dc7955b35d0b903a1a3eb107c979debd205ef7de6346e21550a880536fa3a1b6f7806 SHA512 cfc567e14554504a9a4251a50cc6a6404938063868d19d5a4f9fc85d7a675c0870f4f2c50e32492400ff0a83cf1f3edea888ed4d16e528e7e9f49604a7c70893
+EBUILD oslo-config-8.0.2.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.2.ebuild
new file mode 100644
index 000000000000..ceaab62f1656
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.0.2.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_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 96f2037beee8..031f8b7dda13 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.db-4.45.0.tar.gz 172505 BLAKE2B b280daf94dcdcaa21051bb1c8d611199725b7ad9017225f16ef2ae7342941a6b2bd474b1598cdb54e301f5143c985f250ec1b1f64cddf2ac3cb71a03d9acf589 SHA512 f976ff2aab1e39ce253618ed5669ee0b824ada03073028a990899784d96378eb7c5a2476e1a60ab9afa5a30fd8e34c84b0545d63a7f3c522cad9c7423208b1ba
+DIST oslo.db-8.1.0.tar.gz 171252 BLAKE2B dbf6f580d95ce06f0ab4a50cf289765a2fa55459c56b89f079cbe93b319c1ebdd4287c47a7b69e0bff1ff91149f2dc9c7b8d90769f17cca26f42a2d0a69e46d6 SHA512 3070561990c630a26c936f787be1cacc7747b915bf01178624047551891c9e44b3d17a8d818bfac259d7083a8bbadba1859ade4a15821c00316bdb3860056208
 EBUILD oslo-db-4.45.0.ebuild 2126 BLAKE2B c304a08e657950229de40bba7eb90153b62003060b96c2c98149696e9712651eefa636a8ab936008d399be25006cf1189eacf7409db0b5a19d7488800c070c84 SHA512 a3a59c744bceeac135d28f46f2edbf50a6abd68d2ef95cd644df0cb1b26585992981270ac701a23df02d173010e7855f4c606af27c6a84b05c031534cadcd93f
+EBUILD oslo-db-8.1.0.ebuild 1476 BLAKE2B 90214b1966ab90c3b90b61f4fde3b3befca038c18b6265705d5ea6b745907d20ec7301aa02d33ec811545292327a25f75858cdbdb570f9da7a3dbef3cbb398ce SHA512 1f9dce5db51c45fa7890334a54ec6416b9e7c64c28b7de541f09407ccd63422e8131bc1344f09ebc7f498e59e296d421e69639ef28f16b4d019068242bfafb45
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-8.1.0.ebuild b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
new file mode 100644
index 000000000000..216614e84cb7
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+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/alembic-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^testresources/d' requirements.txt || die
+	sed -i '/^testscenarios/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 4f3d9fb8e1be..39f0796e3b34 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.log-3.44.1.tar.gz 87427 BLAKE2B 225f855c2539557d4d673c23fd58618c669864ea3d5c13f6ffdfc64b4926fd33ec45b6730671b4fe70a105aee39adea63af88a735dabbd5fe9588afb1fd9e2dc SHA512 b8c655bbe2e49b1d69ba7a68c9f115f012d75f0bc0fa1d5583d692b01e65dc17c956fc738cf8092ebb90ac9605c644989526fab4132f23ddef92835ff433e1ca
+DIST oslo.log-4.1.2.tar.gz 87095 BLAKE2B 20dd69c5002f33c288c7c04818435076ffba112b91e0f5726cb32674f10e162e378bce221278428714aa827cee81253cc21bb0588934cd024b7948b349e60a76 SHA512 f34ed66bd289fc88420d02d67ce59b498274d44f43d20b53cef1369699d715ec9706a5f62b81de3005010de1e1fa4c36aa935ee72f81160a75cbda3596a0d167
 EBUILD oslo-log-3.44.1.ebuild 1314 BLAKE2B 3210cc03011bb3a427d514033f0a65a537a5b5b672a222c38b9515b77fd4e00b86ee9fd6e7a5450722931a65030a3563207bf00d47f72ec71e605def7f14160c SHA512 e67dfb0104f968ac1859e564823d5a7b2be6633822b06599dc78648b27db1734945c520f3d86da6ae47f84ce68cd9b27ae5445d5f25fe251adb95a811340fb99
+EBUILD oslo-log-4.1.2.ebuild 1273 BLAKE2B be8e807df3640d542a0b80b5024bec7c6fcbf3fb124f2b48de90504bb6ea6801c55f3effde8d5629778e79b99fe4003c2ad5cfb3a2ae3dcfb1d583c349657150 SHA512 d8f71fce7d6fc2028f4f6371795e54aefd8fe7a501c005462d0af747e126fe61e3064ce19c6a710db80d5ef41d36c9ead5984a904e247e8a23ce3b71b692bbb6
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-4.1.2.ebuild b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
new file mode 100644
index 000000000000..fa80b804fb41
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index bc47fd040fde..b3a5f9b721fd 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.middleware-3.37.1.tar.gz 56354 BLAKE2B e9b119d2163c3949eb98b7580b4d5aa4a4427b9a8b3a841549f282358d8daefe62cc3f0588535c744aab7b77b44d38691316f50b9d60e5c974e3a0714a367699 SHA512 1864b2c25602ac7e27e2b080617f7af5f38083705735893dde744e7535d127d62ab0f29a0ef2575ec53af22969544d83e454bc5913b5719c4eb7d312764fa5c0
+DIST oslo.middleware-4.0.2.tar.gz 56678 BLAKE2B 5e548f35eccb896447337317dc68d2294c6cf9a064c8cf938c205dbea47af11107d98efdfbfa1829dd2c4f74bd6a9ab51854cdb267321c1b80dc8f9f5ccdf3ee SHA512 8be5fcd85b3afcd0115f4c700f7b2e8846d5b23f0e93765e2cf693b2e0f982a9a8feee6648e261e36890a8a57c28dc550d2d65e5ebc209a4e709b463e5f8ce04
 EBUILD oslo-middleware-3.37.1.ebuild 2018 BLAKE2B 0bb6bf29c5d9fc8580a3df64abd2a559cf0d9e2fd1df686b3fafcd3fc6dbc38322d720dbf08c65644e5dad7ad11dd5b1e469aa3e42ccb3c8cfad66a44e74d9a6 SHA512 b16ec22d46819772c88369c01941d3dbcf3a56245c64f08a714b14d5487c14cd34e1175179d9d1b1135f40b0af3390d3ace3066c01d3f776b3995350830e0fe8
+EBUILD oslo-middleware-4.0.2.ebuild 1164 BLAKE2B eab966da85c28f0091e8ddf65f338e2365bef0b1d5daa765bc2426e9fda9ce5ca862923d8bd30987b650e4b36b131675f012ffbbeed4d00c5165ce26e485019e SHA512 dfc32935b9ba31e7b070929677f4de6eb49772a5329954e298ee4b8b47cde5a08cf31d876c8f047b8c51147269ee9fb34b3842a73168fc28de1478384cdd19ca
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
new file mode 100644
index 000000000000..6ad72d5e3427
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-4.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
+HOMEPAGE="https://pypi.org/project/oslo.middleware/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+RESTRICT=""
+
+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/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 6b12ea77ebe3..a0a706525d1e 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
+DIST oslo-serialization-3.1.1.tar.gz 32180 BLAKE2B 5ce0db206732430b2553b0eb01d5df717069a07370a20ef452b77e83ed95f1cd0542eac287ba28d4fd2a3f66541823c362a925e48a3ed175abdbab2c1aa5b2f2 SHA512 5a551c33a001eeb73213dac1b4e4bc50db2ceb7dc2f9881c07abbab05cc8ccfda4d73cc9bdc673e26628aaa05c3d66f9c76ba4eb370c851990f3614b33233a95
 EBUILD oslo-serialization-2.28.2.ebuild 2076 BLAKE2B f06a95e8223ad64c4056587654ef214a73363437e0772f18f42cc6e0f6defa38feedb97840e1c8052ada654aaa88e053c6504daba9ba37c04aa43e48515b3121 SHA512 a8d776dbe338b0aa799db28d0701b073aa78239b666afbfdad1634c8a02c679c6d94b326afd5c54d29dbd0f2f1376deba2d3fb4573794a8987dd591329937640
+EBUILD oslo-serialization-3.1.1.ebuild 1003 BLAKE2B 638027c5c6ba4eb54763df3d126e915c412b132246ba622ec57e145bf214ccec16c55202c0fe05ff5ed883069ff69a7b0b60cd4ae9124e567f715f94f61293f1 SHA512 f720ee345e5937028fff4c2dc7fc1d3c5f5a4e34e8d6a580c2605301663e0918982d18922f37799d424712ec7ff1ac9afe0fb1f8c1646520c4ce04ecfd6c49b4
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
new file mode 100644
index 000000000000..2b721387653a
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+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/msgpack-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index b582ac63f3de..294e1bb7cf77 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.service-1.40.2.tar.gz 80334 BLAKE2B 6000ba70c414ae6396f8be3911511b073f0f6a73a3a98e92e0c662b42a637b4cccbe684ceb1df2613aedad3fbd430ff588dca001997293563f39525efba05d99 SHA512 e412ae3d96e7e7f5f40238b3b9d9623a36347c3d8c6e06baa11133da71d4f5e55bd1ac2f43b45a2f84f725f84c59ec6870bc557fb623ab681bbeec27bffd086d
+DIST oslo.service-2.1.1.tar.gz 81030 BLAKE2B f6221d9e3d7624dccb614b2dbe6529937fd00495db80cddd9412c53fdacd4a5c5a5fe33468ab53c65e0cb741e82519de971f19d662e633f658641c978dcf0b2b SHA512 8d2beba973444eb6ef32c011928376b6ba61388837178f9043105100f05644137d9bf6ae235c4c7260b05d956bfda42890dcd5727dd4d6f9559e7206f7139f95
 EBUILD oslo-service-1.40.2.ebuild 1543 BLAKE2B c4a8cd555c697c7acf2c8d9443b3b4ed6147e2d564aebf1c7ce51ee51e2750a5540a72f7d3ee3058f6ceaf224c49c9c4c99af511804c4c944c1fa8650ac405e2 SHA512 03bf0a1d45ff7a26b3d6812eeaa5a72e89cc33f93dbb127899ab05cfca9b0f4c9da16c41d28b201a35f8f5ff958f20ae099ed2aa9657da913fb98c481df72ea6
+EBUILD oslo-service-2.1.1.ebuild 1547 BLAKE2B 14f5d5f5111908ab19e2a8768e075ce240ad2e3d22203a7b155c632bfc0b7ce7d931ab43f727467e7c028f377ce51492a9a1296db0981f724db33211925883b9 SHA512 ad23b3f405f148dd24fd6242c4b9ee9ab7074924415984ade15543a2e2906a693594f38a4fd39338d3ca3fcd64bf2ef327865c7db28b906f8c38e0e6193b2275
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-2.1.1.ebuild b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
new file mode 100644
index 000000000000..d318fd27e7b2
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-2.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_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.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/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/yappi-1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 9b1e76d82d84..3dae9234b7ba 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
+DIST oslo-upgradecheck-1.0.1.tar.gz 15636 BLAKE2B 1247658ae351e11b3320415cd66bb5831bd018bced2e0440dc882d4c945dc81111544b063fb78e4b812d50c21ef7bde3eee30f8f12724d00077a32a05bb308c2 SHA512 92a8cfe51e4ddcdd7a1e8cab7296e7702a1389cbc9df17d0c5da133b21413efb5a650495d1b3bd2e2a58c376dd8c844e96ae20d2d56d387c29de635918a96d30
 EBUILD oslo-upgradecheck-0.2.1.ebuild 949 BLAKE2B 40465a982f8a25b4c8c2b5da23465ffcb2846347fc62822d7366f3c55632872154b7a5f2e73149ae8a548bcf72525dfd2026091ce3de0b597f6c83be6c1334ec SHA512 c23bbd5028e04c793b48ea37196a8bdf0bf72b4543f21e6b671cbd97392a71e7a3f0f54042f22bdec18269324905753f146c44e1dcfd0673bf6a3d2be4594f1e
+EBUILD oslo-upgradecheck-1.0.1.ebuild 951 BLAKE2B 5169a766dbdcdc2cd21518412fed13ae114a78ef685968f445361499dd457da4924d7847571dd6ad175d2cd95d807a5feab3c2b1e8314b2d09936bb11be97900 SHA512 688089daf4622f8e07d13ac154a01f521f3eb84130f3b9a8017469f6601860a1e48db9d43f871841ea2920f1249431063d4014d1c6dedfecbf7f826559f0d721
 MISC metadata.xml 373 BLAKE2B faf870e41a823c9dc8e6829fffc6cdc1852889bf17de0ef5b93f12321d86d7cc538368cb93edc56807aca7f25e0d75255045acbc6cfa60329aaea35e78721346 SHA512 c82e432bee2d34b39fca929ba2b602d65d13167c555eb0a3b07d39c5ae864bb4d6ac459449200bd767f040307ebf854e0a99d72d5ba1f965053190eed68c401c
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
new file mode 100644
index 000000000000..c3202a21255e
--- /dev/null
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.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
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 1b69688905e8..9e18993082ef 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
+DIST oslo.versionedobjects-2.0.2.tar.gz 152102 BLAKE2B 6b7d19d0a17d895e65eaa15ccf4fcbf71dab10ada019ba9c2d7701ba8d7b3111542bb5be6be9d4ebe9d659c4b74f6d406a354f9e1f5990983ad36c6576ef8e80 SHA512 0c544ef33c213f8823a7ec9c2714d3053e9db0a6bdc69f8c41654c0117a2f2b43c94bc6dcd2d6f98c8447e85694382be5df9d57fe21b4718cc811d9589582f66
 EBUILD oslo-versionedobjects-1.35.1.ebuild 1345 BLAKE2B 3a6f24e9c06a0aa63ccc2738c8ca008d4096c0434753fe6ac94f12e5ac25490868bb091dd8c3a2525c6d4f200b2983cba4db0c7b05869de4f2f7761153d9d801 SHA512 0402a890433ff23f6f790d733f5756ef07c4a7cbf2835cbf33a43f66db773a984a98b1a827a60f106f120de12cd8ec36ebc5196c0789848d87747e1232a3a1d3
+EBUILD oslo-versionedobjects-2.0.2.ebuild 1304 BLAKE2B 2cbd23c851aa83ebdd75c16455f813bbcf0677e67f34acb2ed23e528b1707e33801822b94a3d47fa5a9d7c2d72d8172adf514e37788f966362dd6f315b5adcbb SHA512 9d0e21b0f55ea706027835f5bce97529198daa9308e600026f16793f82a0d7cf27a57ce199f763126347a5639c98910e38b4908e34c16e01309b43796e51c5fc
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
new file mode 100644
index 000000000000..f87856097ade
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.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_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=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-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index a0302d9187ec..01690bc48acb 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -5,5 +5,5 @@ DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84
 EBUILD parso-0.5.2.ebuild 740 BLAKE2B 58006962dc3210fc8f3e507c5d699f700ab60ae0655eeb59137d44981c6ad9b607507d8f76bc55be4db0cd7f97a347b5b46003a67cb453d0d75ee16a40da225f SHA512 0c641807ac7c7f87baa760d4fdb6e3825857835de9478a387e8c8edd7dacdaeee8fffde32e6644fc9d61c55612a37453c13af8febf9fe54e42e11047775771ed
 EBUILD parso-0.6.1.ebuild 789 BLAKE2B 6d2e677dcb103af8de97e28753b244067bd799db3baf04614b8d559284afa08f861294aa747ef7ac359400cde5d6d7e92a31672f09792dce3bbcbad4a52eff86 SHA512 f9f0805a8ce9538c1901a1772a1d7bda92ef68bd4fe2e04b273c6356dce2001103b76af7e89c05c04da10795d512add51f6780be083c0625d0e7464c06e54267
 EBUILD parso-0.6.2.ebuild 791 BLAKE2B ca877d9c7c064d69cf91d1df7669a500246e6d2c19bbafb735f25d914185ee8bc28fd8cdcb250f7503754de0dbcb4029f31a2d494f824406f0607022d94bb63b SHA512 ea7bb8306c569d8dd381b7e4f9e1f8baf9b9f29c5bcb6312d15899e8679d02492df6707eeb879b7614ba03461336904626a91f5fdc7b02c41fc1499bc98f22c7
-EBUILD parso-0.7.0.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
+EBUILD parso-0.7.0.ebuild 746 BLAKE2B 62762737bedbd2583bd4f271bcf705f99e278fb651fb45f7f06f287dc835ffe45592a13e59a0d14b563107730db046059ca415a4379a559c1e4e450646a8d239 SHA512 a7be9ba693c72949014a780130a949d99e7e2db5099c13d106fe8ea8279efe43490bb3dd0e19ce26e8a2cec834fa94784825ba1b6eb0ce80f62e8871519b377c
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.7.0.ebuild b/dev-python/parso/parso-0.7.0.ebuild
index d9dff2d95d49..a6d051a7085b 100644
--- a/dev-python/parso/parso-0.7.0.ebuild
+++ b/dev-python/parso/parso-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,9 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index db2a46451b7a..2272a2f16ba8 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,4 +1,3 @@
-AUX parver-0.2.1-gentoo-versioning.patch 771 BLAKE2B edeeb76368745ce85ca812c399fe919dea9da01b1ed8f9c4b5a151809c0610d59b9213d441fbf891ba15389c9c9caaa610509a213585481a2ecbf09de85c33a9 SHA512 d4d8cea17ec8aa6bc3a2e3855f2d1e85b2954290fe41a894dfdea8617afe87f1dc79e882b14db608d5b58f1df4129509b55f8aa64862d770d81fa07e59c53b34
 AUX parver-0.3-test.patch 1078 BLAKE2B d81c48c59ec2f744c70c8dfea7ff6133c652105e933f2de77e6c50c097da5038f3d753e809d2237cb840fe927986ce1cbfd2620c629346ed8f232d7d1770ebe6 SHA512 2d4a8eec787eee57be68d57f6b041e4ae4fb437767b02568b3aa258c8853461922dd7a963fde0be134dd8cbcd4578cf93ad8eba37ec55b26733cc3671984de69
 DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
 EBUILD parver-0.3.ebuild 892 BLAKE2B e1ebb523e895c6e94933cebc0569bd13804a9fe154a5220ff565801cb4b8a058a02f991375fd1b51ca6969b61e6bea28ce983651fb0f1aef72f58c195a80e5e2 SHA512 3a4c2dd56e0db206df68c5ff835dfbe64c949dc1cc17708f143145fd395cb4da1f5c05a3532df98e89ced7cf030998bc9aef9f9144f4f4da7f18339235da1dee
diff --git a/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch b/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch
deleted file mode 100644
index a2cae61afa46..000000000000
--- a/dev-python/parver/files/parver-0.2.1-gentoo-versioning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c5c2492..8f5c8c7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,9 +18,9 @@ LONG_DESC = open('README.rst', encoding='utf-8').read()
- 
- extras_require = {
-     'test': [
--        'pytest ~= 3.5',
--        'hypothesis ~= 3.56',
--        'pretend ~= 1.0',
-+        'pytest >= 3.5',
-+        'hypothesis >= 3.56',
-+        'pretend >= 1.0',
-     ],
-     'docstest': [
-         'doc8',
-@@ -49,9 +49,9 @@ setup(
-     packages=find_packages('src'),
-     package_dir={'': 'src'},
-     install_requires=[
--        'arpeggio ~= 1.7',
-+        'arpeggio >= 1.7',
-         'attrs >= 17.4.0',
--        'six ~= 1.9',
-+        'six >= 1.9',
-     ],
-     extras_require=extras_require,
-     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 59f7b038b46c..ddad6603e750 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,4 +1,3 @@
-AUX passlib-1.7.1-tests.patch 1552 BLAKE2B 86cfedd409d6aff983c31ec33362577e5e353fa00fafed47927cec318d79d79fea75af80a283ef23b6453fb2da1bb5c46ae513b784e97941a8a45dfd4089bb26 SHA512 ccdf6814890e1c25b5eed9b2685ca2778fe155c3f7d75f2b76433a91785baa93b692aa6ee0f3a85b768f3b0189be185acce1e570961d28540d8f9dd12a81db7d
 AUX passlib-1.7.2-py39.patch 870 BLAKE2B 87781afb87427dd78c9040babdb2c3be9f8b14099bee1d1e0cbd0a1bc0deee56b0ba0f65adaa5a9bbd81fd998152661db5a602127a74e59bc1aa07d1ce1e1c46 SHA512 a77f51cad2c460abc41b99cf59c76f33c1a15a51b4237c968185dc46c11c6e4aa1dd866082df13cd9b34f7496c9750c276c18dab8ea08056200d125e3dccb324
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
diff --git a/dev-python/passlib/files/passlib-1.7.1-tests.patch b/dev-python/passlib/files/passlib-1.7.1-tests.patch
deleted file mode 100644
index 697262fcd9b3..000000000000
--- a/dev-python/passlib/files/passlib-1.7.1-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Only in passlib-1.7.1.orig/passlib/tests: .utils.py.swp
-Only in passlib-1.7.1/passlib/tests: .utils.py.un~
-diff -ur passlib-1.7.1.orig/passlib/tests/utils.py passlib-1.7.1/passlib/tests/utils.py
---- passlib-1.7.1.orig/passlib/tests/utils.py	2019-11-19 21:39:07.373344777 -0800
-+++ passlib-1.7.1/passlib/tests/utils.py	2019-11-19 21:39:13.525351120 -0800
-@@ -16,6 +16,7 @@
- import tempfile
- import threading
- import time
-+import unittest
- from passlib.exc import PasslibHashWarning, PasslibConfigWarning
- from passlib.utils.compat import PY3, JYTHON
- import warnings
-@@ -3149,6 +3150,7 @@
-             self.assertRaises(MissingBackendError, self.do_genhash, 'stub', hash)
-             self.assertRaises(MissingBackendError, self.do_verify, 'stub', hash)
- 
-+    @unittest.skip("fails due to unexpected support on linux, probably out of date")
-     def test_82_crypt_support(self):
-         """test platform-specific crypt() support detection"""
-         # NOTE: this is mainly just a sanity check to ensure the runtime
-diff -ur passlib-1.7.1.orig/passlib/utils/__init__.py passlib-1.7.1/passlib/utils/__init__.py
---- passlib-1.7.1.orig/passlib/utils/__init__.py	2019-11-19 22:55:46.438000094 -0800
-+++ passlib-1.7.1/passlib/utils/__init__.py	2019-11-19 22:56:37.144958345 -0800
-@@ -903,7 +903,7 @@
- 
-         # the current time, to whatever precision os uses
-         time.time(),
--        time.clock(),
-+        tick(),
- 
-         # if urandom available, might as well mix some bytes in.
-         os.urandom(32).decode("latin-1") if has_urandom else 0,
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index f4992c0e6244..f672c2bd6478 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,3 +1,3 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r3.ebuild 398 BLAKE2B 9725b53bc3e64ab30208e775213d2eef7d5ad1326ca1505bcc40246c99a4822da8bfc5a602cecd2c339d2d929007d518083d211f791e130a3637e94a1332213d SHA512 1901cc29d17d5375f1bd2ce4f8509646cbd120aed8d91a702cd127648fb95372d19f72b499e453555d4a9510f9aac1916967226aefd0d6af1e02b2507d7cae4b
+EBUILD pathtools-0.1.2-r3.ebuild 397 BLAKE2B c305d289cf9752e46535bbeffe91a517f3478e92856104e75255c2988a6aae9078fde68bbad5cdfe07f1d69f8b62dd4b63a83e9dd44f3cd92c3f31d03be2930a SHA512 5104d2f68a473890b3fdc1bff89c24bd15a3138fda3f53096b40f7aedadc685ea091fe97883c977a09a5a4f2e4232bee13e63fa7775883d81117987d2971f5aa
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index c471e0304012..8752b31bb000 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6..9})
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 22d6298ab859..9017d5bb51fc 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -8,6 +8,6 @@ EBUILD pbr-3.1.1.ebuild 2927 BLAKE2B eaffd31603285ff741a6d945150eb80676a04cce33f
 EBUILD pbr-4.1.1.ebuild 2797 BLAKE2B 8d178fb9f0a69b22996ea2e40d5df70086ca35230a78656766ad72e7b83c55048fb9f2727868bf49b65473c6dd9c8adb848764b75a0137bd3b22963f62274bfe SHA512 545c0cf96bcfc74691eb804fb95ed6b266cd98ffbf97a15c8b5dc7f5da88f270cc7d8c4d12ab27a477488669c1abcabc08c2700dfe1fe9b1258213608390a268
 EBUILD pbr-4.2.0-r1.ebuild 2938 BLAKE2B f35461acfa86271528f8b5e69b18396bdd3684dd382271b75543a739453eec3e2f8ea9885810447a3b66051303dd4af8711298010a7c70eb9f82369c5e127f38 SHA512 1dff0573e0e793ac68aefb82cdb5680595ef50800706c2e7a6e76a11e9387d00f00ce20154c9705d6cd30f7e386a95fac93922e805b3d41a99caa4e3730e1fb8
 EBUILD pbr-4.2.0-r3.ebuild 3133 BLAKE2B 4c2757cacce58ed2466b58613934370998b4e9479d9a3a06e1326cb43e9b02d5171ea393b353c7a442b791d6c2259f7592dc129f3ddf3198f7896dad7dc5f5e3 SHA512 5e12308c218345aebfb66b6dbd8fde60617112a0194a743feeb8e437844de88893c1add6a6ab34ae86b291e679b14a931e9da59db274ab69d4ef02cbe2c6550a
-EBUILD pbr-5.1.1.ebuild 3163 BLAKE2B 8c0a0a58bdc851c977e511921ec883c43198d6a603de81a3ee5670585aae91ad2d026ce4b77158dada3afa293e290651d71c87687d7b94b0dc9d333228305fab SHA512 692101c6b9de894658db8cace646c19f9f8d944b7f15cd41e9b76f12295901c97d63cfc06ea7f9dd48555a5459e0e39992241cfb03c2643ea6c8820e723b6579
+EBUILD pbr-5.1.1.ebuild 3160 BLAKE2B b03f66786e120f51764ec97c23e8c94631ea85105e2f9c8506a37f20e3fdba1668cbade439f1a18e582cd21cafe618078953cb2f33ec9bed69a4295915e2a5f4 SHA512 5d4202dcd672da134328ee07b108afb5a1b7531c8faa9ab7013784c2097ecc39ebc59846fe676abfa1538feb16eba386b4e15ff4d2afd941e5db01fbbf0d192e
 EBUILD pbr-5.4.5.ebuild 2506 BLAKE2B 3beff550f3349560c83a865c9b7b8b392b5a6172cd3b31699d3e54d09ecc6128e32764015f75f0e2623f0ad16a75ff92440b3c0d67e0c99a93a5575d3c9667e5 SHA512 1feee555396315cdc6d0fa1089d1f05ba7951b9434968d4a610e935070f158157d45cd909511e4cc8dbad78e7ca050250baae9f36b067e61602441c42cd07987
 MISC metadata.xml 711 BLAKE2B c5572087c31ce124b9ffcfcfc1042f0e484dd68f9b4ada35e25a7eaf0b98bcd1380a5bf14c364c28919a06ca5126af9ad83ae0eee3dc97af3d690faecab6e335 SHA512 196cef8eed603fa985d71e456afa5ff39ddd0967485ce9d7d1b6721ba706dec099890a30618de88aa5b1e31a31dfbdc84cf357ff52595a08f4a7f395fffe2738
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index 1fbca040a1e7..a61da94516ec 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 04fb09d7f8df..dae6a7b2994d 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,6 +2,6 @@ DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab9717
 DIST phonenumbers-8.12.2.tar.gz 2397674 BLAKE2B 8101aa4e42d53d9c4734f0e3e1085ba814d75b53228a5da3efd7310faa0c5e0da419b5a9f127e4ed2554fa06db5007ec7eb430800ec7cbde69c3c8944e45a99f SHA512 16b8562afe94fb14104c266b12db063cf6c9dbda9ae2301a044cfb2e708845f1857b5ecb986e409c67c16e2fb7e4df527906c4d43c302e14df698607deb078a3
 DIST phonenumbers-8.12.4.tar.gz 2269009 BLAKE2B 102630893595fa34f8e5bf3dc5122f43393e26ada216df02e843a40345aa40df83aa6fbf115d71e986a7e57e6a55bd6fd4eb4af14c4872bfe717cb0ec5be604c SHA512 5d93de2b7b6e974593659fb8909c05f2f6f8c29766deea914472b01dde38abdfc9f4f6ee8c718e2ad11e840070b350b623cb9ca58368f24cf1e03804712fa38d
 EBUILD phonenumbers-8.10.22.ebuild 523 BLAKE2B 24eeb05726d2f9d849644b6af229762cf037129e27132d4dc364e47e6651ffb4520a41ff4b488ed2611a989fdf8dbdf3ad1261ea9e4d83f400edeea563b672fa SHA512 0411af8491522b28a005405181c384b8133bbe2c944600faa6c0d41f4652abda346635f30f3dbbe6b39f94eabb33abc686eaa3b2fb59c7b6c5e99e3bab8f865f
-EBUILD phonenumbers-8.12.2.ebuild 526 BLAKE2B d7f518932e132e6a6e0f2d6cf8aa4a8392b61c0ec46c23aabd64b389bb76a87692bb65da46c3cfe58d1dc2f2ce52b43ed83d485df7ce1a30dcb26d68ec578efb SHA512 b2c8842bb74f9ce6da75ea597f1df497de6b73002a089a17455954830339f04da5d23b0b415259354a7395004a154519d23f8957f5e7f7387a9a0de41237b954
+EBUILD phonenumbers-8.12.2.ebuild 524 BLAKE2B a9a7d4c6f0046715d87196a67d8bcebeb4f97235d084adb01f48bf5b2cd6d6d34046c2bfd351c891da4951f04b692598f9b70bd856d77f3a7490da8bfbf0b6f6 SHA512 c493ec11d4b19df796fa5b33d099ddec6ffdf4965d1cb8da4e203470d44c5070fd8ad46f3ec8771730a391f970d702e883397eabac5b36fca5ef54dddf98f91b
 EBUILD phonenumbers-8.12.4.ebuild 526 BLAKE2B d7f518932e132e6a6e0f2d6cf8aa4a8392b61c0ec46c23aabd64b389bb76a87692bb65da46c3cfe58d1dc2f2ce52b43ed83d485df7ce1a30dcb26d68ec578efb SHA512 b2c8842bb74f9ce6da75ea597f1df497de6b73002a089a17455954830339f04da5d23b0b415259354a7395004a154519d23f8957f5e7f7387a9a0de41237b954
 MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
index 3665d14f2c2a..ddeb720dd441 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index b9afba9bfa71..e978c5c40619 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
 EBUILD pickleshare-0.7.4-r1.ebuild 600 BLAKE2B 7599d87ae92adbac63830f4e934c89e5efbf4af2bf407b80da276bd5a217fa91bbd201867aa117c63dd27c105e8d3051af7dabbab54dbb3fb94342e77019db35 SHA512 89567d792397942c02c41d538ba8af933794f5d16d5809d64702223de6b379451c2c1d4946d656f02e83dbe99819bf68b4eaca37c5f1acd1fadec1547347b17f
-EBUILD pickleshare-0.7.5.ebuild 614 BLAKE2B 223181ad799df57ebe176e9df991a1b5c328cf90c627d9d08a7d102638b490392cd0c817a804355e9f1df5d4dbec2f9ba32e03b9939c5d134d455f181c5dadab SHA512 0f435597671bafef7bb2e6f01941f3704df5c715d5ce3af61a4195389a6dacc252a6f45e8f521d34a4a36a060a8b3b4727e481d4a28381082bc8af9eb8f18b8d
+EBUILD pickleshare-0.7.5.ebuild 610 BLAKE2B 9ca0ebf2cbee8ffb18cbb219dfcba15cf7c983624aae578a60198e53eadf937fb60676200ec2ca58b9b3f27bcc0babfa9805ea1e6f2365224a279b5b237a72b6 SHA512 e87f58f33e51aa4d76c62a163948ebc8f82f2814ce39b9ecb59d22e890a0540acfeb4649ab465678db25595a2eeb1199895d800e043387fe54635ed7fafb1f6d
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index fcc022d87e7c..00409430df9d 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index b70085580c45..aef93692756c 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -16,7 +16,7 @@ DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
 EBUILD pip-19.3.1-r2.ebuild 3915 BLAKE2B 62b2cac9e9c63dadf2ed8210cb975f0b39d5a7b1afa21a613d30f372638e399dedd9cc7a088bea650ca0f1a66388097b1566126501614e9d096724769da541d9 SHA512 2d23168da12f9488b7f7716f00ba85c0e6c8831d81dfaa6791f633f9470fbb6836d5836b7fba78b3902daa22c65330ed4b0c7b721a44faf4c3bed9ebf8441389
 EBUILD pip-20.0.2.ebuild 3976 BLAKE2B 5512d028ee60149c8376e361004093c7db5a2445d754882fc76368170d0295de135b0927e5a05a4f376787df50da2c23a3f111c45c62490b9d179720e1797aed SHA512 66c120c43c77d5ebfc37e183c817a5314ee7680975e214f8afd41a68da02efb1c8fa5640810c6b1bbea91361fa2ddfc928f55cbfb5a4b27047aee6996bbe55ec
-EBUILD pip-20.1.1.ebuild 4154 BLAKE2B 030ea1f83c4f319f2adc356522b22f909573f4cea7dbf8cf67f52a40b8982252855d4b65000c8a3e3111f528323e91fba238b9415aafda2648c8eb90e0414c98 SHA512 e75a6a97d51e87715cc6954947acf19dcc00152f06aa8fbaa66b592b639652d20dbe14394b12472a0989a8d68750be1d203e15400a3c5993f873cb95fe61561d
+EBUILD pip-20.1.1.ebuild 4159 BLAKE2B 35aa594ade5d4af7c460bd1f6ef358ff580ed9dcd89624573e2d81487b9c4da4e16024774a6efd74f1a463b0685532a764bff599802ec92add8ee2388695b01e SHA512 1de3aa6d9a5136297b7564c3d9ac0c88692ddd9f67f540b4022ecb53069b6b668449bd55cd64db257572d8e1c2221f52a8f4eb422fc7074924ebfb13d4578c79
 EBUILD pip-20.1.ebuild 4064 BLAKE2B e9726ae69afe2c7c3cf38fcbe75b14a2cd70d8e681d14e1f46a5d40324a5f60167693c40cf1c67bf97c32ef08abd789fac20f1f49c121355d2648e7fc1deae23 SHA512 9b624db37a21464965f8e848257decbd8a827ac85e347cb5b1d409e4b8490d9257d45720a0aeeea6891327884f44b18a1d0f1ec01abbbf07e7aa85fef87901bb
 EBUILD pip-9.0.1-r2.ebuild 2454 BLAKE2B 7d6eba7ecf7279234a820a90edf51e2c2aceecd06ae212e1fda4912fa8a265c8217c27c90bb0f6e112fd53f766dc4e926371f11408d20f41004a60e24ee83a46 SHA512 5fd2425d32692d483814dd03f80ba634f2612e3e5fe1ffe8d043d717064483eaf01b76b053e383dd34bcf1bd2792346d0ed1648461f9414093dd082c13b61d88
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index 6b8c56540203..c6e2c880ab95 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index e283c81eaff9..38c567e2e43e 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 700 BLAKE2B a4e91afc488d39dfb16b53c8288b2c3688f5e5bd7a5b40fe1ee7dd95c54d843a75d2da651898500a6f71221e1fc676ea666ad58bcaf34be948348222e23c63ce SHA512 a778531736988f0d317c15a929aa4b83eff7aa3ea2cad4c52229a2881e5ef73afcf6346093f8da597e5af8a0d4d1f764b32ee2777cb8da2fbcc0c54722ec6389
+EBUILD pipfile-0.0.2.ebuild 699 BLAKE2B c36f4e4a7288de0e3fcd2857e413ea5c1b0b1a0f312b6e2268f02df4a58a37a151f25008ac5d4cfc592b955c5b03104f39eabf6d5cf1976cb8a2a46ed9962029 SHA512 a22da638d0fb17d4e7a9935bd20611620f47544f9d2a0f206a6648a11056f66dd3fa022895acd4bb431510937f71f3a229544e0adce7c5bf83cde158854f4039
 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 502885b370ac..a048027cf05c 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/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index 920e0613f893..b559a6180f5e 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,3 +1,5 @@
 DIST pluginbase-0.5.tar.gz 41964 BLAKE2B 84fc187b60182f100a9016ac663856b29587e60b5ef5ac9c51fb4ed99666908a77c9817c2dc5fb64e82b807e635bd10beb5ce7644e31e63262736cc667a7b8c2 SHA512 921ddc7dacb6ad63abc90beb1d1d993e7b15c9cfe21e850a5852eb40735436e08b39fd2a6d83e23f641014ee81e718aca147ef1e21b55f94ce04a64ba7780455
+DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
 EBUILD pluginbase-0.5.ebuild 935 BLAKE2B 27bf1cfdd73c8264d07f7a4934ca521699192b8908335201a87eb56a12d3b9230f5eb4df407bb69621b24ee21fe02d6ecb72c63c7c9a4c631fb6801ca6d4b3e3 SHA512 1150ca5bcc39e7ff05ab78687417663ae1ba13fcba7f701479605da0162ba84508205e2c89bc50a9298c0c06c0adab1578cbee914532ae2d62555b1a0875699c
+EBUILD pluginbase-1.0.0.ebuild 931 BLAKE2B 6ee3880edfb0760347a590982827f5c1c3335c34256875424cd18a2a2f0da2b5ba409c447a65968c742fe394e32b1c7536cd114cc5c91d890f076d08bf73768f SHA512 f32fa8efdb45e93ba0391001eef6ce4e858e51018f74d9cbbcfb3702b5d7780f0f2b9b8ffef378dc72822ef0e40d879782d11a815a1a40759cb424e405c8f512
 MISC metadata.xml 385 BLAKE2B 0b58f71f7f6e816ba3b2c41212f371d37b0b09b38fc69a1adcdbab7a4537f9e9e7c5c0d9505e5dc72d219f30aeb5a3739c7f58bf4927f75323bd2b34e25733dd SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2
diff --git a/dev-python/pluginbase/pluginbase-1.0.0.ebuild b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
new file mode 100644
index 000000000000..634f1829e08d
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -e "s/, 'sphinx.ext.intersphinx'//" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	cd tests && PYTHONPATH=.. py.test --tb=native || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 22b34485beeb..42e79decb51f 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,5 +1,5 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
 EBUILD pocketlint-0.17.ebuild 478 BLAKE2B a2bc81998644c7cd671a21fcfa043a16ea9ea958678578ca257b161e56c731df40396b5a82936b77da0f6be8a2756bb76cfa1028981cbf37bf6453b3fadeef19 SHA512 e7f54bd33bdd4401fcc92f09d9c7af04669ac352c6a2a790f78cc73d6663a20ccb5f2e0d1505f96e81abafe0a5b11fd7e5c87d1eadfc150d3787b843d919f33d
-EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 2a3c26ec0035f8f77f7d57d6e0fcbcd685a5bb89049eff03cf083ff8fb8d6ddb35d85c559c8ef221a64147b3b028f4d703c04cdaf56264706034c097b7761774 SHA512 9369f0fd7da203f60f58c08f558f9a0c6d03c5ef3aaa22fc980e79d54c2f89b7717ab69293d4b1160295487a2c671e4476f3288c81d4a9909148c0ac50369b49
+EBUILD pocketlint-0.20.ebuild 481 BLAKE2B 129c6680bd3a00eefa43d8aab7f7a30ad23167c6d7c768b6ccdb9f6f79bde59da9402c5f6fd071488ff7337cb2b745b99aaa04fb888273002bbb2cc0bdc002ab SHA512 8998adc73291a4c073ab2806c29f85c843fe8c20534a85800d4d957e2769ebe49114c16c14184bd500d662f9cd2001905a52b469235ed96fecd7b9a3d2ab6483
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.20.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild
index d3095c6f4606..2f45b27f56f3 100644
--- a/dev-python/pocketlint/pocketlint-0.20.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.20.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index ef49e69c8db7..cff75861d33a 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,3 @@
-AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e
 AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
diff --git a/dev-python/psutil/files/psutil-5.6.7-tests.patch b/dev-python/psutil/files/psutil-5.6.7-tests.patch
deleted file mode 100644
index 3e6ec254c19d..000000000000
--- a/dev-python/psutil/files/psutil-5.6.7-tests.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -dupr a/psutil/_pslinux.py b/psutil/_pslinux.py
---- a/psutil/_pslinux.py	2019-11-21 17:23:01.000000000 +0100
-+++ b/psutil/_pslinux.py	2019-11-27 12:56:11.491875281 +0100
-@@ -1108,7 +1108,7 @@ def disk_io_counters(perdisk=False):
-                     fields = f.read().strip().split()
-                 name = os.path.basename(root)
-                 (reads, reads_merged, rbytes, rtime, writes, writes_merged,
--                    wbytes, wtime, _, busy_time, _) = map(int, fields)
-+                 wbytes, wtime, _, busy_time, _) = map(int, fields[:11])
-                 yield (name, reads, writes, rbytes, wbytes, rtime,
-                        wtime, reads_merged, writes_merged, busy_time)
- 
-diff -dupr a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
---- a/psutil/tests/test_contracts.py	2019-06-20 08:10:28.000000000 +0200
-+++ b/psutil/tests/test_contracts.py	2019-11-27 12:56:11.492875227 +0100
-@@ -174,6 +174,7 @@ class TestAvailability(unittest.TestCase
- 
- class TestDeprecations(unittest.TestCase):
- 
-+    @unittest.skip("broken with newer deps")
-     def test_memory_info_ex(self):
-         with warnings.catch_warnings(record=True) as ws:
-             psutil.Process().memory_info_ex()
-diff -dupr a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
---- a/psutil/tests/test_linux.py	2019-11-21 17:23:25.000000000 +0100
-+++ b/psutil/tests/test_linux.py	2019-11-27 13:18:19.715499797 +0100
-@@ -17,6 +17,7 @@ import re
- import shutil
- import socket
- import struct
-+import sys
- import tempfile
- import textwrap
- import time
-@@ -380,6 +381,8 @@ class TestSystemVirtualMemory(unittest.T
-                 ret = psutil.virtual_memory()
-             assert m.called
-             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
-+            if sys.version_info < (3,):
-+                return
-             w = ws[0]
-             self.assertIn(
-                 "inactive memory stats couldn't be determined", str(w.message))
-@@ -410,6 +413,8 @@ class TestSystemVirtualMemory(unittest.T
-                     ret = psutil.virtual_memory()
-                     self.assertEqual(
-                         ret.available, 2057400 * 1024 + 4818144 * 1024)
-+                    if sys.version_info < (3,):
-+                        return
-                     w = ws[0]
-                     self.assertIn(
-                         "inactive memory stats couldn't be determined",
-@@ -878,7 +883,7 @@ class TestLoadAvg(unittest.TestCase):
- # =====================================================================
- 
- 
--@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip('very fragile, broken with new ipaddress')
- class TestSystemNetIfAddrs(unittest.TestCase):
- 
-     def test_ips(self):
-@@ -1363,6 +1368,7 @@ class TestMisc(unittest.TestCase):
-             psutil.PROCFS_PATH = "/proc"
-             os.rmdir(tdir)
- 
-+    @unittest.skip('fails on Gentoo')
-     def test_issue_687(self):
-         # In case of thread ID:
-         # - pid_exists() is supposed to return False
-@@ -2090,6 +2096,7 @@ class TestProcessAgainstStatus(unittest.
-         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
- 
-+    @unittest.skip('fails on Gentoo')
-     def test_cpu_affinity(self):
-         value = self.read_status_file("Cpus_allowed_list:")
-         if '-' in str(value):
-diff -dupr a/psutil/tests/test_process.py b/psutil/tests/test_process.py
---- a/psutil/tests/test_process.py	2019-11-22 12:37:20.000000000 +0100
-+++ b/psutil/tests/test_process.py	2019-11-27 13:07:36.966525513 +0100
-@@ -351,6 +351,7 @@ class TestProcess(unittest.TestCase):
-             self.assertGreaterEqual(io2[i], 0)
-             self.assertGreaterEqual(io2[i], 0)
- 
-+    @unittest.skip('fails if builder is ioniced already')
-     @unittest.skipIf(not HAS_IONICE, "not supported")
-     @unittest.skipIf(not LINUX, "linux only")
-     def test_ionice_linux(self):
-@@ -1486,6 +1487,7 @@ class TestProcess(unittest.TestCase):
-         d2 = clean_dict(os.environ.copy())
-         self.assertEqual(d1, d2)
- 
-+    @unittest.skip("broken by Gentoo sandbox magic")
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-     def test_weird_environ(self):
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index b6c83776bd45..b679a8383f6f 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,5 @@
 DIST pybind11-2.4.3.tar.gz 138789 BLAKE2B 6279ddbc4ca4c8a62eeff684cac789a315eef0ce769258c8152f7073f8bbea39e582ed1ea86fae6878f46c675ed998c314bbaa54a40457287833cc555f5d9692 SHA512 97b6ffb38dbda8021e8265c2052df65785d532dbcd94a2b711306f806eab1a9e2aaf31ea466f13eb5784856ac69e0f4c1dc6d742aa70e5a10ce9ce338e5e9d84
+DIST pybind11-2.5.0.tar.gz 573769 BLAKE2B e46d99f873f8266efc577d3e0ab1e8a78784a45c35995bc3486501d627698e0fb10205008e8cb82c84e971f20cd02a6d2f08390f3a3041fff1a21c45f11b197f SHA512 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2
 EBUILD pybind11-2.4.3.ebuild 478 BLAKE2B 67d1ceb0003ce620d43f0a33800d5b9718a1a48d00eec456e88b63134df36dca5ab246e08efeb8ee1991f30dd3a6ff0c12a4f35fd156cf92326954448ad83c22 SHA512 4f8965e2cd685936d76ec5e131af307a919e72ba1e8d845993b3c5c6d1f203927bc2127a389658715d88fb208f5b3f5ddc7b574272cbf0e3130e3a80e1930e7e
+EBUILD pybind11-2.5.0.ebuild 1782 BLAKE2B c37cdf9b285e96d27afdfc74b1624bc3a348f934e8755ed6c53aa360a1d7401c1662b3802be3271501e83e348c267676fc83623a64b85853c8778df8f222df19 SHA512 78f3b820422dab59c2a2f5c8ecec0f6d1ee778d61a250c86f4080ce5d0a768b499ff4463ed2af7f2308806aeaf9301bed411187e670b7d458fdf679636cc3025
 MISC metadata.xml 344 BLAKE2B 43767c7307da199018d865ab629b72a9df002046ae4fb011fc52610d56a0f890af4da32a56ef0ec73f9f20bb6849734cf7bf25b4f961b6e7fa6e61695ac96a58 SHA512 185ed0ca79b66e1ae69b3989366a304efd4cb71845e62bad7cb64b21d3c5761e2fb09b9eb4aa9647a975e2759de1104910ebbf48b6069bb9aee24b129ec3fb3b
diff --git a/dev-python/pybind11/pybind11-2.5.0.ebuild b/dev-python/pybind11/pybind11-2.5.0.ebuild
new file mode 100644
index 000000000000..4cbab835b55a
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.5.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		dev-python/breathe[${PYTHON_USEDEP}]
+		<dev-python/sphinx-3[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/eigen:3
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( README.md CONTRIBUTING.md ISSUE_TEMPLATE.md )
+
+#I can't make tests do anything
+RESTRICT=test
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python3_7' )
+}
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	local mycmakeargs=(
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile_all() {
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+
+	# documentation is not covered by cmake, but has it's own makefile
+	# using sphinx
+	if use doc; then
+		python_setup 'python3_7'
+		pushd "${S}"/docs || die
+		emake info man html
+		popd || die
+	fi
+}
+
+python_install_all() {
+	cmake_src_install
+	if use doc; then
+		python_setup
+		local HTML_DOCS=( "${S}"/docs/.build/html/. )
+
+		# install man and info pages
+		doman "${S}"/docs/.build/man/pybind11.1
+		doinfo "${S}"/docs/.build/texinfo/pybind11.info
+	fi
+
+	distutils-r1_python_install_all
+}
+
+python_test_all() {
+	cmake_src_test
+}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 4655d57370cb..d5597cdcd3b9 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,5 @@
 DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
 DIST pyclipper-1.1.0_p3.tar.gz 53353 BLAKE2B 1e510ab97ef98b83c763d4bc1154eb32f94bb035823ddcffef09fe32861c2384ccd6ffd29e5a31c0cabf71c801dd90d0176a68e93c6c2e2c9bff03c2be3fff33 SHA512 0b3c3f18593bafedaedf8a91411ba5d3d1c2ac55c949bca21e3a527ca0930eae5ea033a0f57337573a1106e2871a50dcb0176b959b98ad8ac58636c6d45f94a9
 EBUILD pyclipper-1.1.0.ebuild 697 BLAKE2B eb94f08accf6b67bd82bcde3b794e49daaec73c905937bea4f31ec03446b8b4d3f72298ab1e891d79fbc260588ec47eb3e629774cb875868c22dd88688cf1355 SHA512 fd81e4272d19c9b9b67a3cd74a216ef84e9af8150b176235bfa320cca385fc9603e143b9f079591943cfd222e679d1207a11012cb6397732c8e9577ecf3dec4c
-EBUILD pyclipper-1.1.0_p3-r1.ebuild 769 BLAKE2B c1472af6499a259f05c769a8378fc733ed047831ba9af390827a04e7a4ddb47385db295e4219bfcf58104ba2c82d7da4405b37b5fc355db1ce2eb5e8e0c7e0eb SHA512 dbebd48c3fff1d023f08887551507030b29772c8222db78320e044b7b109a7ac26ca9ce3d844fa882af430a4a8c4867b27941cfa67b099c4f511e8e6dff7e6e8
+EBUILD pyclipper-1.1.0_p3-r1.ebuild 776 BLAKE2B 72d02ccf4e4b859f76408447fd9b697e847e3263fb1a07c573c340b89459d4bb00a1969de9cd56606366415a74e40c0fcf939d744d94d84c7fa0445b4833b1e3 SHA512 15e92e2727d9cfc3bda88e4e8ce69fc41428d60a1449f476a75988dfca3994392def45d1474f234f5642cdc453cbe15257867282b3726ff17ea54330f9e33fd8
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild b/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
index 0b3f303ecd9c..c5a57c46be36 100644
--- a/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 277ad3e08a45..31cb7b5d0ca0 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -3,5 +3,5 @@ DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9
 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
 EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 992 BLAKE2B 3db7b7f60e3dceb0aeda3b74c8dd9a06bc9d9a75b8fd7be83425c3be43e9d162ea5dc4eca80425c83eef1e90cc4674e7c6f7bcf6d75591d2c1e0bbcadcae3867 SHA512 3d142c9e99ba744c550b8a598eb539087af08d0a18c5a34975bf034f646f955cdc66e8101288144f0b2be27c0053fd4d7b9677c1fdc4ae978916f5ac8adab74c
 EBUILD pygame_sdl2-6.99.12.4-r3.ebuild 1002 BLAKE2B 0421f75bedbc27a02f6701d845bf2e418e36e656a451dfc73b96002f1ff473cf9da176029c43ecbbb7c99dda4f745a48bf554dcb9266fb7265915eb3be4da439 SHA512 8e9f5e3cec0e0eff03ce356c116838c63b37ecb343fdde27c5851598d94028553eaccb1aaba77ff7815fd454ec0596c694a712734e9eb3c60ca44f7e4de4b675
-EBUILD pygame_sdl2-7.3.5.ebuild 941 BLAKE2B 9d365f8ef70e371d8dbd2893b71282f4c1431d43f76e20517b5c69c87576642900f4f56e345970945f0e0650ac16642e06035ac2f18e6a3f4f63e3ec335cd4d1 SHA512 dcd3a8f4b18abf07214a6dfaa4532ff23a41a691f58b2ad286308602bd7d6c2db70d05f3c51dace2ac3239092273c74aa611a872a72580d39ae74d2bf00288ab
+EBUILD pygame_sdl2-7.3.5.ebuild 939 BLAKE2B 28f6647b562056c8c7b82b7fa4cb0460a31817d31797391bb4b36c87fceebdee3b5976ceca54902f355ece3907d89db263dd92691f400635165cf5f61c751d3f SHA512 06bfc457f505774dd6625211093068ae76c81cea966848ba4d50dfc2cb7919f9b7fda70331043520247a6af4ec7eb4b82095e64c1f242f697816319225395bee
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
index d774c961920d..652dd7b262bc 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index b9666d8d8300..d748741d916c 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,5 @@
 DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
 DIST pygit2-1.2.1.tar.gz 235852 BLAKE2B 997c54359c87bdbb5338d6524ca119a058a2dfa9ec5079abfeac5e3f1312e7fe0b6a532cf3dcea6a2b317124337746b9e4fbaa71585bc88a8afa37f8b74a7f97 SHA512 2491892e50d9298d68c2f90b3c4b23c87e51995ccc29e285eb2f868f5e34d2568d5f554818203bf2c735179aeb197e3b7aba1be88e72a6526812e3ee2e0b4348
 EBUILD pygit2-1.0.3.ebuild 962 BLAKE2B 6e16fd3bdba8102c51de84d67c050d074842c458e6c15424d8d7c847cee5d889fbe26935f35a4c10572f5eae0cff02d782c1716e454f66a37d17f00afe97b85d SHA512 d6dfefa43f8a0c38334fd7192fb1e27f2649967cd278e008c9a046797149f9c97afa1c6a7e616d4871887efdafbeff03db67998cf600a9e673d95110d620f868
-EBUILD pygit2-1.2.1.ebuild 1009 BLAKE2B 36e20c06be7476238c893c7a73ead825c3db46d9c3c54f5cb98ff31c6b2129a06cbf2930457539515b86752171240c8a1db138c5a456377a62f08faf73feab49 SHA512 0b58e7364f05cc2641116769ab47aa21dd5255bb2af446a20f333a16b219de92529b13fdadd9d710ab6c8f665a30570922306e8f9f80ad5cfbf6912b5e1c036e
+EBUILD pygit2-1.2.1.ebuild 1007 BLAKE2B 15edcce1e650b95e0d035f927c4532d25dcfdc7c34543815ed28c33e129b581c10c6d740a4e685f5eb483d5f751dcc545cbf64f82cd9c802b655d2b1b8f15201 SHA512 fdbcc70a204200c2515ba9cfe7f163f06453c4cbe9557acd87bdb3b4538dac0e30efbb16ba0dde654f1b380b2e0c1e151caf44a3b86a784396592063775fe2b5
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.2.1.ebuild b/dev-python/pygit2/pygit2-1.2.1.ebuild
index b9452ff5064d..301d38422032 100644
--- a/dev-python/pygit2/pygit2-1.2.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 97aae795f126..c77908458ff5 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd6
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 EBUILD pygobject-2.28.6-r55.ebuild 3539 BLAKE2B 872ca364cdb0a63ffdaaf22fbb61720b5b12d74b794d8ce33a844ce533d6ffe8960ba5f27cdc17cbdc8243a16ba7878431a22821adfc957975594de0742a21ab SHA512 793f82faae740fa25d871283a7ea83b1c2ac6913bce191a616bd66c8d142d2c0568c6f9499f301ea48086d3811b0efd277b7e010a83e5d9c6b9c640ea6dff825
 EBUILD pygobject-3.32.1.ebuild 1773 BLAKE2B e8255cf6550b6a7d8f8dd9533871befc6de86713dc9c52b767ee3b9d609944244c3b9f8ced5a8d3621673cf37a3e357d2bbea7c05b967f3ea85b20fadf7d234f SHA512 47cd7b27fdc1cb596f8bb59bd231f7cddf08df5519f1efd9a7bdb3de679c10ee7f7454e0ffc4786c0073865029a97fc1932c201ba127d0c573375e1120b63a53
-EBUILD pygobject-3.34.0.ebuild 1768 BLAKE2B a2652b7ee11f9a48815123fdd3edceb3062ca5ae859377712bf53367b7ad0387455c90b51168f34084e4ce4b74a3e07a913e8fd819a0ceca822f27c78250d27e SHA512 1e236eceefb55177591a0c50953a46e43152ceb5f50d72827d5d36d891dfc2094f689b7448e86045a742d962b5cb5f270a9f95d8b3414e1653f6739d952a8ce1
+EBUILD pygobject-3.34.0.ebuild 1767 BLAKE2B fe5a8a8cc7839295e4b2d187f014e7c770ca8c6fc8d087b72dea63f0a3b0b88a88a23fe535d4760bfae8d69be120dcf6065b72564ca40c40e4b2b7542da7ac7d SHA512 17bcc697c3b9c784cee40c09daeaed28247f758c1567e840706a93814dca2f8d1518b67a5e312abee5c1940f0eaa172ac07a5ea2d58d55d3c9d53c3879cbbd13
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
index 6b48cff12cf2..53020450bd2b 100644
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index b8726293114d..99cd878a6ebc 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,4 +1,4 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
 EBUILD pygpgme-0.3-r1.ebuild 531 BLAKE2B 95cab4d72b72ad217b3b1986214bcb5d88f8ae3da0228612912dfbb91e750b5625c902bb6e6bb9fea8cb595159625abe22742d63d26abbd361eaf1046a152b61 SHA512 77e3857e7a98e45751dc4a6ce06610f7e5460893666a7147b20db357732f146f9a1f355984f2403ab709d7d7152fbb3192b9b40016f5fdf6036c89742bce2689
-EBUILD pygpgme-0.3-r2.ebuild 538 BLAKE2B cfa5910674ccea7146accef30eade13f263e78b126f0e3291ff8494be5c0257eb75e8407ddadb45cc4ad64a6d391513cacbc0abfa4a07c8c5f6f4c409e75ea02 SHA512 9ff4fff344ceff2b4395b8b611f5ce61db5bbcca3c49bbf5f698b717d3de24ff2cfba30bb47868290b89b4c661a6ae260c743d455f33e738b715007eaabe23de
+EBUILD pygpgme-0.3-r2.ebuild 537 BLAKE2B 5d71fb4fb48471efa3d5b2a171d2d06e4f6f8825bcc19e52e4857a3aa2d42944d86e4b2f3b6e31813ce5f2033a3ae0c18fd91076dfc36654ea55f4f01d9ec307 SHA512 a902af39d9643bf7b491cf18f9002044236b81dc7a358c70232e7841a3ac5a5cd376796cd534c06cb1423f0f9abb95ca6869ebe3b022016601bae32829666836
 MISC metadata.xml 550 BLAKE2B 93d93ed6170da174718a86d4f2afbe0f1b39d51fe49393ed45b0956ef4c55ee7b74d2376612dd3dd3fd839692bf80e6006cfc87cf68ccf155dea5b6e62cf744b SHA512 aa2f009654855d7bd18be6f2d7f7228bf4b7b532fded48d03173324d26394a1342f0392a373680364387c403210871675763c06e9bbc76e9837f620434dd4030
diff --git a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
index feeddfd94ea0..14125b27bc20 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index a2074a578aa9..b3765fb11aab 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -7,5 +7,5 @@ AUX pygtk-2.24.0-test-fail.patch 252 BLAKE2B 9d808e50d9e64f481cd8d83e4693a60f472
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
 EBUILD pygtk-2.24.0-r4.ebuild 2785 BLAKE2B 4336886560b94516354ebb9d4c3f346a946ab743a600e3877bbf72bfb618f64f3cdc33c25a60c6e6de8222e24df80f58bd797f482bf52ff42b3b97ecc34c9dd5 SHA512 c7c50cc52ff3767f538536591182c71aaf47e3355e08ba1061e5ff1124da7da066253c3a518da766fb39d4bf30ad09666393d9165740eca33af3e781df98da1c
-EBUILD pygtk-2.24.0-r5.ebuild 2731 BLAKE2B 0b0790045b9f8c033b6c8f77c8aa8baa2c2debeb9732b955b0181b955309c51bc941760b0aa326c54d1c936e83aef320fef9941bd2ff15773d686ddda399321c SHA512 46407f9ff92b3a91fe0087a8b74bfdce0ea272403867893e74112837e46ce7defcbf6289c76c706ba305b206d0d053ae9cb12a1b704105fa868133e6dbce1b94
+EBUILD pygtk-2.24.0-r5.ebuild 2730 BLAKE2B b6f738a026ffd6d07f641df93c056fb7adf85a1d38a8bae7a3c6d6569a862131ecf87d5963376ed59987aac2db01ecec33a4eb4d0c1a114660b4e656c632cc87 SHA512 f6337281a99898b0d484344b5a0698e51857af12a2037e82af2017ebb877cd95ed0cdeb488113277a5b540fa60e417dc0113706429ca1e2fdd1e8cfd2cd89a26
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
index 75f810067b23..eb77f4c41088 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/pygtk"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-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="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index e50302421b55..d536bfb0b466 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,3 @@
-AUX pylint-2.3.1-no-pytest-runner.patch 395 BLAKE2B 06d770f92d8772afa9febed3281e70f3aa08ea50b31bf3aaf87dca4acb0a7fabfdae6b5481648ccb7ad6db6f5f9eec29f2da13bbd9689aa080aebafd9aabef51 SHA512 3ae8024c82d426d841106ad43d165524de243d1c72ecf5883d39806f735bff87087db4ac109dc59a3a164e218e3b75647877fb56d52ef8ec387884da2e4b5404
-AUX pylint-2.3.1-sphinx-theme.patch 537 BLAKE2B 62f83fdaa8c1ec45f8ef7b03e7aafd85a00358ebcd906f098294356ec0dabf56e31e00a4336edaf4c1b7c5823a555de1aa3314f0f07ae3f729c20ae93e0d23ee SHA512 c5168423de4bcaf945b4d17cd766056f4f1a9c93cb082ea76df25f4335fda05118bf1309b8f622876625a15c0ccdfdb47a2daf2a9da66f87ab4047d0d2e3b656
 AUX pylint-2.4.4-no-pytest-runner.patch 345 BLAKE2B e11b2be3eb2721817d118bc161fd0fa6e7fc36febf1fffaa78f9c5f7810c9e316e59db2e28d07c161a53df34c8948083da5e11915eab18a45039d90e61e4ba28 SHA512 b5fd6fa2a902219515ecb733e338bb0d0389d1dedb947853111c7e7c9c0c83b80e595d854252a344bec6c5a3da3f1976c7b510910ba1fe199d977d70efaff5de
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 AUX pylint-2.4.4-tests.patch 522 BLAKE2B 1ec6a2c49a111a35f50f755b59e0c288e4fa801204b72a0f4f8a6b4ec54fbb35e0bedfcecfae329cf39022fca6c35c99a1b3130dbf63bc0fe5dd6ebcc3a42205 SHA512 d7a22c0f4f9adcef0a3bbeca0321c90c1ebdeee678ff5f2fbb5b404514e110f69ae294fb3bbdf2431e932326d7bdedbefc5fca5cdf145f8221061eae15ff92fd
diff --git a/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch
deleted file mode 100644
index 4caf59bb30ec..000000000000
--- a/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a7b5e413..841a1c0d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -169,7 +169,6 @@ def install(**kwargs):
-                  extras_require=extras_require,
-                  test_suite='test',
-                  python_requires='>=3.4.*',
--                 setup_requires=['pytest-runner'],
-                  tests_require=['pytest'],
-                  **kwargs)
- 
diff --git a/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch b/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch
deleted file mode 100644
index 9353a90957f3..000000000000
--- a/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-It's not worth introducing a new dependency for a mere sphinx theme...
-diff --git a/doc/conf.py b/doc/conf.py
-index ada9ec49..2bd66593 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -99,7 +99,7 @@ pygments_style = 'sphinx'
- 
- # The theme to use for HTML and HTML Help pages.  See the documentation for
- # a list of builtin themes.
--html_theme = 'python_docs_theme'
-+html_theme = 'nature'
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 9d2e8c332d7c..16b5052961e7 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,6 +1,6 @@
 AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
-EBUILD pypiserver-1.3.1-r1.ebuild 1105 BLAKE2B c5c1fc0b5b2cad1ee66e0286cde0f6f9d7b1130b4aab408388597309b0240c6e240a804b460e15a9de9676e74b65a58d2ab41797d45506502b751acc150b241a SHA512 e2cacd0306478965b2a692c45e2970af5d8e25c9504591aff8318f2c6b00d7efb9a55cbd971fead1029ef00109c338f01ef6d62b6939a819ed3f3948c96c211e
+EBUILD pypiserver-1.3.1-r1.ebuild 1110 BLAKE2B e403bad0f7cbec9f698509783fecefed3306064f1c51958891770b6eefdf7f79c314434c11e31fe4a3dea886f7c5b9b3247b694cf6e6f6de35992de7cdfdfa3b SHA512 9a35625332e2e1e33830912e339e22e2ec72bb958d9727a80c095e20f3513362b17b91f68f11c9322c931ed6ee52be73d7da3e2ab77b76a75236c641273b56f7
 EBUILD pypiserver-1.3.2.ebuild 1283 BLAKE2B 6bc8e51e1e9ae1977730dc835315e8a167618a40d13ca95bfc5952bdcfb224571cb48af2a6e81ff67d59a775bf83c525d937cfee33e6933f97838d5cea9699ce SHA512 db9f1a8b8653c58c4514e0579823f18440657d9a22eea27d8cbe812f118184fe89d806ece473550698ec56c53516908011d097784f5c97fb96992f5ff4169016
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
index cde7613ca754..3c550ec559af 100644
--- a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index bc6f6daa27d3..2ece90928fb7 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,7 +1,7 @@
 DIST pyproject2setuppy-4.tar.gz 7947 BLAKE2B 882aaf98c37560c9dff577cd7392830a0fc3a4bb9a1ed774037582c3c9bf2e74d15bc2fcb9fe1eea221dc65b9d0f8f6c9d677fca1a2045214440818712d7802e SHA512 1721ea0ba9bbd579af88543e2487863803eb002ba2eacd7db7b7dfad663a87a1f8248afff92964fedc0d5edffa92929dfb3e613f8ba0ec884ee98e44fb38544d
 DIST pyproject2setuppy-5.tar.gz 8314 BLAKE2B 7cb93fc0d427603adb8439d7549c276e8792d5a555f0ed229114e1083e6d741493938fc03507f60eb6bf9809a65d578099a20b1c779d817f396bceea418874ac SHA512 b32d9f5eac6df24c3eb10878c7cf7c2b7945471d2f221877572a98d1b06cd28d3a61ed250e3724619e1afbffe86f02e23452e7eee85bd702c0a64d32e36d0367
 DIST pyproject2setuppy-7.tar.gz 9274 BLAKE2B 5394543aeb7b615cfef5548b530d136887d81bff8c40dc343529d3e316e2f8851b82747d59dc9bceafdd7f2017695f523c75a8b376e033936708f76c64ebdd7d SHA512 22224a63acb0af5558b63e90aa2e96243c1ffc2ef9c114b2e20b8dbc5b84abc468879822d8d20f8dd2f7fdc2ce4a508b5f84e661831cf9e99e383d89fe2b63fa
-EBUILD pyproject2setuppy-4.ebuild 669 BLAKE2B cb4782795a5b614b67f8c8afc14ad8064d3a5d8cb50fc4c17f74669e72add6b00bd8024e5b0c3d24ef2b508f01cc5b53c3a1913e4da80701e3e534fe75b1f254 SHA512 2fec72adbb740c9f25492f53aebcf77d9b71bf36bebdf70b07d55728ec76df9dd12749257a6c54ead26dbd981c138fdc70b5f352dde0e3ca998135b9be3f1a73
+EBUILD pyproject2setuppy-4.ebuild 668 BLAKE2B 1a77f76c452c6d8b931fc2d671c6bc38cf43f38b3f809d2e831d39a8d2ce0e49d5bc310314bad1f1fc16aed8dba5a306a7e716a54e4696fb0d84bb163e58f229 SHA512 4fd52343a4a0b0755eacd32c2858f1494740adfbee4ff3c3c8e1b01659201d7d5dc6bce085be5b57d6dcba3bc05532e3ec42d602e57b18cc32082d82053dadaf
 EBUILD pyproject2setuppy-5.ebuild 673 BLAKE2B f710e85ba57a344c5b0ff22f7a2173ddfef9267d9ecf508822c765718c75651bba689fbbb85a479662062dc382c4abfb9b478ef441c7c77a0adccd0641a7e4a3 SHA512 a70728a7911c47a4241920c51caee7dec86bd7a1acec16da2cb1023f22e2317601f562daf0a3817f9f95ae809679ae376944e778f0ffe467b6e9bfe1256c8168
 EBUILD pyproject2setuppy-7.ebuild 673 BLAKE2B f710e85ba57a344c5b0ff22f7a2173ddfef9267d9ecf508822c765718c75651bba689fbbb85a479662062dc382c4abfb9b478ef441c7c77a0adccd0641a7e4a3 SHA512 a70728a7911c47a4241920c51caee7dec86bd7a1acec16da2cb1023f22e2317601f562daf0a3817f9f95ae809679ae376944e778f0ffe467b6e9bfe1256c8168
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
index af957bc2180e..bdba657b442b 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-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"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index c46bbd2cbb72..db7ab7937198 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -3,5 +3,5 @@ AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a62340001
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
 DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
 EBUILD pyqtgraph-0.10.0-r2.ebuild 1219 BLAKE2B 6eeeeb6d25de6d0d791b760569eceafb34b5a0fa65af24a100cf9540ae45e0d8df327787f80581ac31504f6be32b5695a03e0238c290cdef6b62774ab5ad03fd SHA512 b5742c766f27a517867fbbe1b1b95204c984636f52975a47a070f00c739e3b4c300d7c160bb1558fcc8865b72e6c64de05ab4007b859634c432ccf1b7df2bf39
-EBUILD pyqtgraph-0.11.0_rc0.ebuild 1074 BLAKE2B 210fd58f645c5803ca33701b3d529b3924a3302faf8f16076e26fc173d5fc4c38a70deec546b24f343bbf55a9c0d69c96a02803d48f44d0e60afd1ffc97e3c9c SHA512 f6ccb6c519aae5f2f943f91f0c813c6e398f6203a21faea3e76c7c4c49742b4afda86b8981b22afef012cecbf4bde490d7accc853bad0504e65686eab475628b
+EBUILD pyqtgraph-0.11.0_rc0.ebuild 1072 BLAKE2B f62759d444f186d3cab758d8df0539a70d90011eebcfc3e4bb892d5fb13fca6705b99390cda6ae6b9e07370d84355bd639e0f08687385b7ddc6ed25f79d4dc66 SHA512 6524de9e2864b59ebbcdc34cbed34e128e285b6861f96c8f0dd43e9a8956a1bb7e636e6c97813e61e57c820822fd2f82b69e83ce2e66209afdf3f8d59ca7b5d0
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
index f13ada12b645..2259d40e1ec3 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples opengl svg"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 3d2e548369e9..f4e1be85ceb5 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,3 +1,3 @@
 DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
-EBUILD pyte-0.8.0-r1.ebuild 791 BLAKE2B 4b4c216a437df69d55bbd28f8d972bdca963707f16fcce7f4e0e9c8dfeb1e4b166e85f529b7cf45b9ccdc485103a473852b100671c0b1bb85aac831950e94f2d SHA512 72f5154f696effd100bed560e9a7743f6da3b9a806a19f57f2ae197b08512eaf561088fbad93dd08a2ce37e131f0ac79d685675729a8d9f9443d80977b8584be
+EBUILD pyte-0.8.0-r1.ebuild 790 BLAKE2B 66bf21d23bcdec77740d43229fa4c31640ff8c9919df75f262ae60b235ceea25c776e7713216bf14d0d8408e61a0c0001bd74f0792febd506827b50456c74a27 SHA512 a84781dfaa5c64043b8551fa374017a188ec7d33abf5af5634b1b1ed39a208d211b6d630afa876cbbad7c1f35cc7d1aa38283a54fdc19ead37977ada48c3b9e4
 MISC metadata.xml 372 BLAKE2B 6e2290ce2905925561a7bb3bd42f754191dfa28b2bfe493d234e3944d9b80e1b7c28440105a95e0e31ba0d445979c235683c81b4ee4cec7930809a6ef6fb7cb4 SHA512 6ba189a1a43ff10537319bfdebf23046437a86dec5c6bb219e97076120b31e20aba0e4cdb8abe932c378d17c766ae2ae7a65d9538cf3926cb106bd20206901bc
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
index c3fd874882ba..8e31925771d9 100644
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ b/dev-python/pyte/pyte-0.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 79c67cb4a4ed..507b0c0146c0 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -4,5 +4,5 @@ DIST pytest-asyncio-0.11.0.tar.gz 14070 BLAKE2B a97cc52a013e126c7aa48b21e8fdfb69
 DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe5ef42075fa98f2f5ba28f78f16d81eadeb68b7dcd11a9f8170c1077c331c7abbb0fadc02863458ef03d238b399e6f37d SHA512 2e69bfff3f0b35cc82381b841229749d309967ce1d36972933f5bc6d5dff45934608310ed3fa1805dc38ab41bf913a881493c28d6d0e9be733b624cd2fda97d3
 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 812 BLAKE2B 3060f2e5526563b12e51bb3a77ae5a1ea68b0340698ff13311ca033e7bdc2a6089002b727d94e8fac48884a3e100ce0a40b68bbe6951b279cecc8607632e66ff SHA512 8358176edc410652224e3dacc282ab7d27701e3d698f58b88e89560272f5f2a79c15158b5f3b4effbe4ac0ae9f7b6be87a2cf0665f196f66dfe1a385fa6dd8bc
+EBUILD pytest-asyncio-0.12.0.ebuild 811 BLAKE2B 2564d7ccef3d6144c24b50a2e6a8e0eaeea33029028bcebb03ac71dd363fb4d747a281944e0fbdb13faef2fc9a2d139572412173987063f80e3bb4ea50582236 SHA512 ffc2090501953cf1a706b175599199d7fbf7e0602f4d4a6ae460527969483d7fcbe96a568b7c286face63b3d6269e05dc29e33f3c9f69399095ab43da5be8086
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
index 427e7177d872..1daf0d1960f4 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index a147207f4920..eac802551d9a 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 661 BLAKE2B dfc52486312e73c59d36ea21e5226926461f91eafc6e53b9baf61f5f878993a14bbf037cb33c71573abfd76cd7ade3549bbe94288d9afb2603a38ca1ca34ecab SHA512 2f7662f16b4d37a78c3c9b9bd21275f007a9307da4b547bc298276b8da857394b2669858a5e521d2503d055c6cad0dd68cd7b2a710171689f579c89bbefaf18a
+EBUILD pytest-expect-1.1.0-r1.ebuild 655 BLAKE2B 9651f2ef213169feb18b5ce5f499421f94da45badb20ea9ef7b8c45ce92da4a1439ab5cc960b0010919383ec463c8a457ce32ed34015090cd0d0545c22d5f340 SHA512 b7bab5a86cb108b1acf37872127e41f2b523c81997d7dc20827c8fe052085ec46f700491a8d390c362f7419da6ad0fff759e293acc6f9755773f8451a06a8a87
 EBUILD pytest-expect-1.1.0.ebuild 685 BLAKE2B 9774b9b955ae1d19d34979e9c8c1254ae2aa5b65f38d1e186f4f043a75f4679a2d19a0ec46b2a16ee38ca6e3b70a1a3635c46ad62ceb1388453e3f9c0eee65cd SHA512 84c2d74b5255fe18f7c9a33f32a750b8aaf76a85019ae8e752ea074d35b4b622b3eeb8d62ef9868919853c43027943f1ea7215d977a761d20d86ae50a41f0cfe
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index ef30899cfd96..f223507f9a9b 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 55c734652593..220d16840e49 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -5,5 +5,5 @@ DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f25
 DIST pytest-mock-3.1.0.tar.gz 25003 BLAKE2B 5f12bc664c6342912e0326bc4ac20c1e599f13c047964df3943ae5d31b8a3710406bc4d30bc2c2304c0fffefd0f49441644b667fdbf79426809c230e5b2ecc78 SHA512 6e970aeb1d4086df045a355e11969074e761fcdc3c8486e0405a4051cdf7c4425ae264e7005afe7afe5356f73061ad5f4cbad05b3ce2f55681a3e12ce1a6b671
 EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea359f538af1f710daf205956cba1a6216f51656659ca17f6e2d52b64922be3c74499cfc85bc64cc937f1b3e7faead73 SHA512 77b1c578805b102cc04bb9f58273cbb238c128e2708968a3d9f27ca727a347cf3dbabf4d7e6bf7bf47f3356daa3345f62ae516f90c7f807b39e8c0a7089ba868
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
-EBUILD pytest-mock-3.1.0.ebuild 1039 BLAKE2B 8038537b64d82bace524df12da32054d46fb53cf19e3c6208bb321e131de68f5764c76d7eb628a5a465f940aec24c16ab01db24110f7b4d9c5ce92bb7224005e SHA512 dac5dd8572962236515ba15320dc6d113dc51fbb0ac2dbe6021f01daa43dea888dabc0fc7d1eb6ea210b74f8040c3f8060c627b4a7e64d29a72f7f65aba84f80
+EBUILD pytest-mock-3.1.0.ebuild 1037 BLAKE2B 7b9e73b066465dd219a74842234fcf9bf88e90a4812dc5e5d9ac84e6fe6522535aa56d03898361b0f04b6f8eea599e6dbb37527e015d3fc3107e1e1e45f81f25 SHA512 722b8f56cdf9b8bad3357abe0d699d823ae6dfbc0548eea451c2b766d8b8282acfc42a395d073e8a2e9b032703c563a25be3bcd4dd206f8d55e27ef2c0fc9f04
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
index 145bc659f1e9..41bf079775f3 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.0.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=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 201e24f5af9d..09a92c0905c6 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -2,5 +2,5 @@ DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
 EBUILD pytest-shutil-1.2.11.ebuild 1043 BLAKE2B 05d5587a94e5e9c251ac56bad0b4654a67ea5c4c6d308681802a781e22f49eba9c317667373e7a7d0a200033fb1ac7c46068ebc4446630d97a75322fcbc882d7 SHA512 7b8a537af1125689ff9ae74ef81a5c2719ebad8b91dd6892b4100b48fefb74e6ee6484707fcdfebefed6c677363846a98cb59f55b46acb74afc8d491ece5f638
 EBUILD pytest-shutil-1.7.0-r1.ebuild 1468 BLAKE2B ad51e70f7ea2ddd907764582fa74c643ff77e6c7c12bd869e5913c6a8eb18c304f2b54b0c797bb562fe611abf3d4fd637a65e5b0e374e9dd9f6e1d0e593e2e44 SHA512 e4c8ec393f8aa60d4d6575e0dd68fad5fe92642a837b5e7db4493d3f3e918f96e1ca9e4d62e25b27442c257389dc18c4d3455c0b776fd105f695a6fd2ae30d63
-EBUILD pytest-shutil-1.7.0.ebuild 1333 BLAKE2B 2decf98eed73274e6b0b130f6f9f31e2957675686435066db9bda231fc07ba2d0920161a0705fb7dd1a291bebd4fe4edaaad9e1ffdcb32daa737b9c8bb80079a SHA512 1c8f6f3ee4d9b45a6e8e402bba1e7e8b79d141a1740dcfb680ee9ee0912356b1bec5ec39fbc0a479c1d7895d5e10a83a8cdbe62668a0428c916460fc1b853cee
+EBUILD pytest-shutil-1.7.0.ebuild 1327 BLAKE2B b2046b97e96a5d2404928dd8383d15a2744a103e238f376e078d9e4c2aa44c682845118f8515b4bc34144d578b1c7275e0cc7cc7b759337ed78c90497e9b9509 SHA512 e363e3b8f40b9cb26f217abc6d9c0e6b47d2e1d23cdbe00c49317059c8ef776229b9a00c3fe761bf1013452b3ddd822b744e6c513623758969099b9f17b28848
 MISC metadata.xml 705 BLAKE2B 8e2b41e3cd3bca68e2c3ac155895005e53c8bcb7c3174214362cbb998922d76737de63345e86b39b50ff179b675aa44d47ace1267c5cfbcdbe06d54b632ed79f SHA512 4089110c45e9136e3fa9b7053f458d1c50252b7caab16bd2621570ef9736bdc0799899ac24f14510b526401ae5ecc5d7595eff8be5a7f643b3d28251114d0c87
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
index cfb7dacf3f05..bb8f494cdc92 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index f16e3805b94d..0f3483369c4c 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -2,5 +2,5 @@ DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
 EBUILD pytest-virtualenv-1.2.11.ebuild 895 BLAKE2B 3a4bc62099267b8d5f9b89b615bc878c7f75e5dbb2be3ffc66d6c0530e483de5796c80e1c0b3abccfb77c7374f057b70ad89a927e4267a1e8a835f0aabab907f SHA512 386e6d536ee3621b2121eb11be99f4a293c2b709669e531d6a133d522e4eed71fc2353a283d74c21d39b622ab4458cbf1e9989c79fa97beb8260a4d4e5225d44
 EBUILD pytest-virtualenv-1.7.0-r1.ebuild 790 BLAKE2B 98e1c766064d94015630be0df4a49a9df33020a256663aab4cb3849247a947990a270fcd0450a239e04206c23882a82ab29563d51b1bdad8e944c5f7a7d799b6 SHA512 afc9f241d96891bc45616ef397515030a468d57cb30006a28e390f0f04fc00470db543d12c8b43cbf1e20fa657bcc748882bb380a1bc3c7fc8b8e6332ec1915c
-EBUILD pytest-virtualenv-1.7.0.ebuild 796 BLAKE2B f5249a680a77fe632e20ac17d830f8cc86738929996981af34a13c665a8e39c7fd901fd7ffb8299f5cc4e94c3c450c63a489b5c19d4007211d7ecdf81153c674 SHA512 1ca61616322a307044b9a867e93f249480ea34221eafb41c9945a5bbbdcec91f45f82601c7ea6b2e28159347772774d6e440af34b40a17436f905dc161e80c02
+EBUILD pytest-virtualenv-1.7.0.ebuild 790 BLAKE2B 569c5db90d75f988ef9f3e1304dd940223594b716be8650b6af2a3d4b1d4b980ebb23919ea8380bbad2b6fe7cee65cff5dd9b695ec2bd1dcdd48bd2a8b684501 SHA512 7cd24c4cbcfc6f113be762587e4a147167bdceb7e4a832f21a2d8ef9b903a63cefdd49384c033a7bfdc0cc9ae97b7b750167c1bf5cd6e2df7a58bdfc40bde53c
 MISC metadata.xml 679 BLAKE2B 1b48d29c49745469783c9bc7a8ce2e18648f94cc377eae50f2459e642a2c21373f7782ecc8cb3bcbf9bec448d2487f47528d45af6de18a741bc7d6cd0eb6b5aa SHA512 0d01c6c2a0b1644ff0755a5f8822075ef96055c54b721b651b3dfcbb3fdeff342469de1a5057c5b69eb281daed6d8763d8cce4dc7b8f5d1bcac449551dd92724
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
index 91d4ada65c45..1b683ab6dd86 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 3193dd802a0e..e7092692aa73 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -6,10 +6,12 @@ DIST pytest-4.6.10.tar.gz 951516 BLAKE2B f87d00c3d69990f39369ec6af8c4b88d8b7da9b
 DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
 DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60410afe6d01c480da4858628f6c8fd8774131c5bfaca3b3baf9936e3e4d607788b390d37f7aee90cb39c4ba15c SHA512 50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878
 DIST pytest-5.4.2.tar.gz 1020640 BLAKE2B e10ce7a2dbc1ff42ffbe02c3a9f72b4c829c5cc80ba9a50ae015d181c03916a807ee2b13d40e0d7590844f67f8b68e926c770d298fd839c3cf24d9daa4b4e1e7 SHA512 c92ffa613a02cee2580d690c24b76f16957082b138cf7c51d277b0fb5098fab2272ab73295e5e368cbd908026130a9185a35f8792054e36b7ade0a05f7f3f192
+DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 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.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
 EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
 EBUILD pytest-5.4.2.ebuild 1939 BLAKE2B 16d310ac7b29e3ef73dca7da61d958892affae3abb79c0f72c3a1facffcf1d3b96de83e49ef465cb56a03f1bb56ce373685b39c3bfd2cd562dee0c045ccd7a15 SHA512 54afb144b987ab11ce1c627499de66c7db5b81adb8f40744444b43fa888fcbeb93a3461d3b17364accda7b6aa72de336c3e2c0b0b512f545f7c70ef34c95d852
+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-5.4.3.ebuild b/dev-python/pytest/pytest-5.4.3.ebuild
new file mode 100644
index 000000000000..3453fa72eca5
--- /dev/null
+++ b/dev-python/pytest/pytest-5.4.3.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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
new file mode 100644
index 000000000000..4ceb0d55637a
--- /dev/null
+++ b/dev-python/python-dotenv/Manifest
@@ -0,0 +1,3 @@
+DIST python-dotenv-0.13.0.tar.gz 28679 BLAKE2B 068c4cb499956a14bb4c310d2c9a63f4c33b6621efd11c231eeea2808951530fa6e7bd5356973c19f7ba6f3693434ca46bfadd065c7369f95014389badb2a00c SHA512 a7e725fd0fcb262f240a8f9eb6cf9b73560d799a10ec946cf901f960cbfa972396ead1aca833808a1675ebaec0b89720c32b2fe957ef9805faa942b0df1a9608
+EBUILD python-dotenv-0.13.0.ebuild 670 BLAKE2B 19b2e6f076d519c7c08af127a772852f1b42beaf311ce6ab5ea9ea3acfabb55966d7a1448941b9061e293379b5cb9e64f0a7168a34c03a47caffa5e7ea8b224a SHA512 4c57e4f396b267dd5146d56c0f14a4b88c358c23202f6b7e0c32048a9f349def2c81d8084d5072d733ee36f28d9e8b06307b2ec3311e48a402ad369a59a19b62
+MISC metadata.xml 365 BLAKE2B be359f891f6469f9d650dd2d0ec29e0641b3313f8dd5132462a3385d557a6cc72aab5fbf59f416c98239973630f8fa9c6e7d926b6cde078bb6535de322c033b5 SHA512 7eb826c13ed20a90b7317fad1a4647a8b52baad287c0286c3b1005c7d0ffbc148d376c8e7c4e2cb55a9af66aba6169f9a680e0f4eb8e8ad3fb7e55fce01b4b8f
diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
new file mode 100644
index 000000000000..7f33f1c07d79
--- /dev/null
+++ b/dev-python/python-dotenv/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Gentoo Python Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
new file mode 100644
index 000000000000..19b23974b9e8
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.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
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"  # help fixing tests welcome, please get in touch
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 84c536ca56ef..82e714d7e70f 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,3 +1,3 @@
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
-EBUILD python-lzo-1.12-r1.ebuild 742 BLAKE2B 3481c38740136f1f0713dd304ca59ee052b7b9a92d2c67aaf2e0eeb9a4c5e8f259f2454c59ae10eced4791a58506d39fcdc05004141980fe46bc9a729944003f SHA512 a030edc91129a28c10c2e9ec6f982a7b621e71dab8d1e039b9b6c843e39c8c5611a4742b004748e21ed1044624c498611e29ead5c18c7bac07894147b85d0831
+EBUILD python-lzo-1.12-r1.ebuild 693 BLAKE2B 61918a94c5b1e1f632fa371655a81ba8413727434aab0e53ceae4bc4638b922753dabdd6b57ac041bb633036f581f4b6bdd17790ad58dd51e65276ad3d830f8a SHA512 e5d99a53ff84598027a765c74f01bf221f9cb33988acc5581cb40f0940c1a5e512abbca726b8340e64e29c61a8bb5e524ff58e2db1bd2694c69555efa5cfca88
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
index 4a7a1b29084b..8ff0146566c7 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 prefix
 
@@ -14,23 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="
-	dev-libs/lzo:2"
+RDEPEND="dev-libs/lzo:2"
+DEPEND="${RDEPEND}"
 
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
 
 src_prepare() {
-	distutils-r1_src_prepare
+	sed -i -e 's:test_version:_&:' tests/test.py || die
 	hprefixify setup.py
+	distutils-r1_src_prepare
 }
 
 python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
+	pytest -vv tests/test.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 1f8ee365ac8f..20f1c64951d9 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,5 +1,5 @@
 DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f
 DIST python-stdnum-1.13.tar.gz 893897 BLAKE2B e901a0b56d8ca4bcc25eade617af80bffce8f4b49a94dadefa7cf252edf567d01267256d3eaee77f01e41a99c0ffb26c80de1092f6437efdea2f115a9e997c80 SHA512 91bc476c0fec49627b772c43f031bcdfea044385256817d76a2fcff3aa76f26e85d308aab5262a682d54f67a1851907074b21d260e687f81c733326c40a0e0cf
 EBUILD python-stdnum-1.12.ebuild 629 BLAKE2B df37770bb3e45b1d3cd6512c0cc3ca4b9cd91ad3a16d01c4c4d0534bdb97214a62509aa2964bcec5aecab81819bbe5063e91a99dfddae716a84d77fb464443e4 SHA512 7ae58dffa8c80a4627738cf51e1990dfaccf96633faf314d4a63de8175bdd780213d474f62ab067040ad585958f6d5ef4b35e81d494bde572886c4aa5c142616
-EBUILD python-stdnum-1.13.ebuild 632 BLAKE2B f3a52a235d4ad72ea6cb46940f26cbba376ef4c3eee410e36c8959dc0677aa81f1c6ad3ac39b14894f2d8b24a30b0e7761922395960d05b153942f5785b8b7b2 SHA512 c092863bd231d2a030a3c1870accbc91b4d961b86767712ade339112cba5586ffb455a82cfa93e26d1cfaf7d4c5d1e9b7d746ec1bd727b25fb357e4ff82a3fa8
+EBUILD python-stdnum-1.13.ebuild 630 BLAKE2B f22b60593fd1345f9656648c2deb85367fcb557c19f70b3d44c0b4876b49b876f3661bb248f1132ee32bda1083c6c60cf77b6ae91b8077cfc2c3ffe94a13448b SHA512 fe989b0074421cebfaf65a10ba2effb5868f10a89a255ff93aeca32f42fc4040b00e34b44ac0c367df9c32979139919e57a7d6f7b5b951fab2c8903b0590da38
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.13.ebuild b/dev-python/python-stdnum/python-stdnum-1.13.ebuild
index b5adb936c630..0d8700d77754 100644
--- a/dev-python/python-stdnum/python-stdnum-1.13.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vies test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index b7b766264e8c..8e4afe512c3b 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1349 BLAKE2B f33d35db2be5aedba22adb0341a6e02c46b4f55e7753647723e289dac0599cb9ff0490abd92a0e990b57bda442cf78e0f1e844856bd532c955c57da8b11df220 SHA512 e8cf13f597b1624b8898f40846fda7c75ffc30a14f28bd168495c73ac1b0bcd420be04b80631696612d66e5234552dadbd69bdb44003d103bdc52e3c5ddc2867
-EBUILD python_orocos_kdl-9999.ebuild 1349 BLAKE2B f33d35db2be5aedba22adb0341a6e02c46b4f55e7753647723e289dac0599cb9ff0490abd92a0e990b57bda442cf78e0f1e844856bd532c955c57da8b11df220 SHA512 e8cf13f597b1624b8898f40846fda7c75ffc30a14f28bd168495c73ac1b0bcd420be04b80631696612d66e5234552dadbd69bdb44003d103bdc52e3c5ddc2867
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
+EBUILD python_orocos_kdl-9999.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index 7b2f41eea0d4..06e204006f9f 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 7b2f41eea0d4..06e204006f9f 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 472a7adbbacd..e9b7dd93d417 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,4 +1,3 @@
-AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 AUX pyzmq-19.0.0-tests.patch 6686 BLAKE2B 91ca18b17331f64448b151269c971ce4dec01b753f00623ea5570a2694b5e2dbbb457c420f22772e8471228f1042da656b06ca740f79f7d6b9ef0d18b8176317 SHA512 971ed65fb299f865edc96c7e138f65cecbed9de526ef10f412e4d81a53c4dc4d65512455bc2ca17c0bc24c09d7bfd7b79cc4acd08f93b517f42466e2b1490836
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1
diff --git a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch b/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch
deleted file mode 100644
index 66d0de75e38c..000000000000
--- a/dev-python/pyzmq/files/pyzmq-17.1.0-test_message.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable hanging test
-Bug: https://github.com/zeromq/pyzmq/issues/1202
-
-Patch by Marius Brehler <marbre@linux.sungazer.de>
---- pyzmq-17.1.0/zmq/tests/test_message.py
-+++ pyzmq-17.1.0/zmq/tests/test_message.py
-@@ -14,6 +14,7 @@ import time
- from pprint import pprint
- from unittest import TestCase
- 
-+import pytest
- import zmq
- from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY
- from zmq.utils.strtypes import unicode, bytes, b, u
-@@ -262,6 +263,7 @@ class TestFrame(BaseZMQTestCase):
-             self.assertEqual(s,r)
-         self.assertEqual(s, m.bytes)
-     
-+    @pytest.mark.skip("test sometimes hangs")
-     def test_buffer_numpy(self):
-         """test non-copying numpy array messages"""
-         try:
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 0f1328d23187..ab44e7050399 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
 DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
 DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
-EBUILD readme_renderer-25.0.ebuild 833 BLAKE2B b6086ea8e3005725db305877461bf23aed9c50f55ce333b6930aeff5763ea3d27cc5fdac9405ede7535af3175da733227ca8b26c7055400bf3663d54628c8684 SHA512 9c663b704b916d931d0ad0da53aee5b083b00b90b597d35d537aae408abe1738dc2bdc20799a1e63c66bd71b20947df954b5665b48881ecfa25290bcc4e8a34d
+EBUILD readme_renderer-25.0.ebuild 838 BLAKE2B bc78fd9eead45397bda6676c10ce44c131edaa0e1e0c2900f00ad1409518ee952ec77f8f0a253740d97fe22846ae2e813b3b07662d64dde40f3434a9e7f76271 SHA512 6497d3f5735c1a8cb334f2f5433782b6712446164422a26aab601b5f8a4b9c3ef9846d14c330226015124679d87c202a8d689e6b06f9e6934f59514e2f4118f8
 EBUILD readme_renderer-26.0.ebuild 837 BLAKE2B b90e575e2b6d01cef5d35dbdb6e2760ee10a70656bf5656734d2a76449de055652bb05ad48415c1ee5d527f4172a1dcba73f0ddc6c4889f09e2eb6b6a407472d SHA512 d85586ed4aeea9c33511c31c8588a381695b0c1a43f033b20bfeba8c5b709ddf827e3844cbb77c608ef7d3d5db4293ed1feaee956c2a11ec049badb40f0e4079
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
index bba087598141..742f1a80b007 100644
--- a/dev-python/readme_renderer/readme_renderer-25.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-25.0.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 ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index c875ffe24a4c..f35f70600929 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,4 +1,3 @@
-AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
 EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B 99f0a4cfe05110aae07cc2f37614331a31a0434d2210329c01bc3625e692c2b87e2ebaabfb1f614ebfa5bf1a561c2a0de84699d4c05baa877e59b03bcb9d80e7 SHA512 c086ec4cbc080d4e650dff189482d84cffbf3ad3a0cc7bcaa2cf95c09a8b78f70839dd414ce35fa7b5b35cc22e69927844cc07ca9d58384944f49c1ad950039f
diff --git a/dev-python/requests/files/requests-2.22.0-pytest-4.patch b/dev-python/requests/files/requests-2.22.0-pytest-4.patch
deleted file mode 100644
index 5b8ec34912d9..000000000000
--- a/dev-python/requests/files/requests-2.22.0-pytest-4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dc75b3ca0b4c95648eb07b92cb414394d99c13a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 8 Apr 2019 18:04:22 +0200
-Subject: [PATCH] Support pytest 4
-
-Fixes https://github.com/kennethreitz/requests/issues/5048
-
-See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
----
- setup.py            | 2 +-
- tests/test_utils.py | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 59b0b0efa..62c51494d 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -33,7 +33,8 @@ class TestSuperLen:
-         'stream, value', (
-             (StringIO.StringIO, 'Test'),
-             (BytesIO, b'Test'),
--            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
-+            pytest.param(cStringIO, 'Test',
-+                         marks=pytest.mark.skipif('cStringIO is None')),
-         ))
-     def test_io_streams(self, stream, value):
-         """Ensures that we properly deal with different kinds of IO streams."""
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index e0b2f28241a7..59ecf689c5f8 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,7 @@
 AUX responses-0.10.7-fix-cookies.patch 5131 BLAKE2B 48bf65ffb6c5cc1b2e1141aea27f0286df0959e61593a2798d76aae4fbb195fe1ce9801585553572a35db50ea1120e4841d6bd51e68461bd9e06b86af2fd2389 SHA512 1ad577f6dc4b8b708a35fc96675246397858f33f4a04be49606da0f25c9ec990f4e1ddc6fb9307f70e6a5e926aa92e5d66431c420ef5b76e73c51055e3ec0b7d
 AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1095a9b42636f5d7e428fc640eb9e0d5b3d0aeac8f2e128a3a1d32f30e1f376895708d294bfa6126687e79ce2ff97a SHA512 8230855b920eb75136e4158c0768ad249ba44933baa9f7b2dbef1e2fefea859bc67f65fd1601a11efe3d5a928b8f195ce6939aa0b659ea89ed09bf20cf106325
+DIST responses-0.10.14.tar.gz 24782 BLAKE2B 2c233ad41bfc1d9eeaaf84d2e8a98f5f808e39ffbb50c796aed6a3065827a0c33301c8d6ed1e7c4d88e6d0f7378796bdaba3816fd558f5797a725ea99835c54c SHA512 f7edf64d4e6d62fa7295b6ac95d60bc30adbf0b141d9624ed7ca03efe02790973aa8ebd3f93187d0fdb41e323c1d87184717b77bba2ea70a7ae25f4d9237314f
 DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
+EBUILD responses-0.10.14.ebuild 739 BLAKE2B 2c7a1151f094e88fcd3d64b64381c3c782e455135041b78f1f5dfe0de8cdf963cc923b21a37125354045ad9cd2185d7978c790da68603a547970f09f9f9a733f SHA512 3ef4cb00c3e871027f1ac8bd27d5ba377bd8e8875647adff7c12dbbf63cac59deb634b1a4e5f736ee92f945550b28b81326422e4d6ffd617cd908f06c0560a67
 EBUILD responses-0.10.7.ebuild 862 BLAKE2B 23eeb7d1780bf4224202b1c5d8b21d086ebc1a209e5080b2f23d26e7ebde9a85eb461ae690dbfa58b5c6fe04a62f911a52dc0b6166d3d073f45918b15e02fb42 SHA512 f23013dae38c96db5cf025a3b83910790f4f70b2f28ac491b1355ce01cbd5d6eb3c4adbbf6bfded90a69c17829f49a737d85c31b12e73de0d53fcd77910e91f6
 MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.10.14.ebuild b/dev-python/responses/responses-0.10.14.ebuild
new file mode 100644
index 000000000000..fc75493f1787
--- /dev/null
+++ b/dev-python/responses/responses-0.10.14.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="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/responses-0.10.7-tests.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index 29199efce22a..c7b06426af91 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 746 BLAKE2B edff40876d0e23c7d8d549cf9921ac0a61f925c4e48049339914bea351ad17601ecdbe13a25d6494c2ff2dd03c1d8c480c83540733c40427afd5fcc177ce0833 SHA512 60a1bf18bef0f877c17c5333db20787d001041965868a357305b40844ec9f6c755d0324050a0066ec77dfaec268c90841a0412b4407c49e2319b1e16e80f0901
+EBUILD rfc3339-validator-0.1.2.ebuild 740 BLAKE2B 9920ca5dfe20b496c8c8b6ec9c02e656b14adfd05f9b713ad70f0c032fd3a024232450971377a68b9c15dd9c9581f7d50f151425c852e8c4cd14e0a62dbd62dd SHA512 58fbe513828c77a70ea79a501d9c5e353af23238628fda641f998e84928a6bc88f1d3b5414dbc14a43b9738ddbfdacd2c5a4f9daf31d1a5b87d1c756c206b2b9
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 5c70c80fbbea..d9c3725ddd81 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.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"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 2c2ecb26b44c..d99421dad8c2 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 928 BLAKE2B 9eb06649a47976636baf1a5665fd91cd1539c6a27b9997b547bc52742eb73f2009f29c254c9803c21794d110a0ea929d37370c14c4b9b7c2e906339393eba15a SHA512 7b22a1c546cad668c5f705125d652ab2103937be30115d05ce9a56d0112c6db91521c52e46efb0d39bbf7772093284c98140a28b1f76dc84b364dbd86a324129
+EBUILD rfc3986-validator-0.1.1.ebuild 922 BLAKE2B 7e57902ee4bbd5c2378c791191f7ea8a92c4a278f4d936e2d4c95aa6d3e04256c53f7253776afc312a097bb3b200ad9c2c03cb4f8cba57c0e91d00d6f526d203 SHA512 714b19b2e6ea25b379c914c6836da6b5532c35b6163ef8c226647495e194e0c2008dc05d14c4f3ac1e04f2a4022585d3c052acc8ff8f76a3cc30bb2fe9c2bb12
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index fb75fbde146d..5f35e26df01b 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_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"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index d3159a31fea2..bad7e0130607 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -2,5 +2,5 @@ DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841
 DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
 EBUILD secretstorage-3.1.1-r1.ebuild 903 BLAKE2B 546b1d3c3acac3f012b8d3dd37d352248e22d22ba99bb7337dd31c2f5d13402d2ddd8ac52bc67e9f72f960d1b0af486ccb7d56da12efa4a2f29ff4027efce9d8 SHA512 398728c3bd906e7905211dc0b8eff7902947ebf123d971ebe6ee1dd9cb295f842571e72945f3873239fa705ab823e111c84d7f1c3b443218cefd4fa65553fb79
 EBUILD secretstorage-3.1.1.ebuild 1092 BLAKE2B 306a34a53d76d868ca010032bd6424158fa9775f7100e55eb2ec33acf53b3afebf76310c023eb55df64f4ab8b6a10495fad57a24ffb765496b3de7b4b9b1be72 SHA512 c123dd74c6f0ed3a29f6c0c165c4ca9a7a998de27ceae12cda2b14b7372c8be7aeb00933c2e5c96d8cacad04b85bbded7ffb1923af7849343669ed26a4473c95
-EBUILD secretstorage-3.1.2.ebuild 1140 BLAKE2B 619384eee4b894b955541f15d31f1fda2609bd488c51ba0195d49c2406e00cb43749bb94aaae69c4a54fe497fed90fd555185fe953b1fcf16e0c2db864db6ec1 SHA512 1fe2ef929cb414f593026d42501752a7468870eed35599b62bf21518bd14534a921e6af6e862cf18551ef71676688b1e3a4f2c08a211c7661970449ad646b375
+EBUILD secretstorage-3.1.2.ebuild 1146 BLAKE2B 4c654901e897ec1f95783071c0f6c79c30d80e28773d44bd4c77b912804b021e23741ccc0fd3e7e4a0e4da79a0536637f8008b04e61c5d2cef1e66c78e63ed0b SHA512 93c1da70864ab15d70a226ea5fc973dd5b2cf3f6c323000b0978e0bed2a65abe2776e7c21405a85007c03fa7aba706b129306e83721ae395a1f86dfef9fe14ff
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index 92683ae954bd..571eb1a98f0c 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 0707397c3a7a..8e6e7e9234fa 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
 EBUILD sexpdata-0.0.3-r1.ebuild 529 BLAKE2B ca53444c59cfabd72d86dd5b454adb7251608f062872ec7879093d7300c667f67e2d6b7a2d032975f00898adbc643b2fef81c4de1213dc19ae49f7e70d068780 SHA512 650600a9fafb5949e6ffe35791feec2fe81c40eaf20cccba60f24f03ce868a62c2a10ba97656a45da0324c0455e8b0da46e5e6f42469b5239184ceacccae046b
-MISC metadata.xml 333 BLAKE2B a8a6362ebe4adb9e742728296d865bb30bf0b588ecb38c877c3f715e50c6723924b713be56c5fc33214c7e690cb53a39e8857ed57339be94806c9e06acb95e21 SHA512 defc606cbec597ad18762272f9aeb6e9fa1a37fb6068720373a638a9a58c415a2a13849c037509cf8411fb3ab2ee0cce45c743b780eac80d4c85ee4eaee717df
+MISC metadata.xml 329 BLAKE2B fbb2f8210e6dd71fac93c2b9c2a99f21a59141fd805276c3de543f969b7bacbf65c4bd239136bdc280fb5eb298aee160193c28a65e2cadacabadd90c8dde7b9d SHA512 98e7efd62fd98efa6fe6fc373d438b8f5132b68787f2b958319d3c7b07b589adb94136762ff950a49adb27d21a780b8cfca54afb1ff30a7c486381d9a7b87e6d
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index 4c2e02398eb2..3dabd781b02c 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -5,7 +5,7 @@
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
 	</maintainer>
-  <upstream>
-    <remote-id type="github">tkf/sexpdata</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="github">tkf/sexpdata</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 0c26e60e2b3e..a47f02edc0d9 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-theme-0.1.5.tar.gz 11132 BLAKE2B e405d3a3ccc0d8568ecc42f8891eebe405d2d75cd47e60910f59ebc979da07362d3cbc20833412a462454b2703aa945f491e85c10b206a356545a13cbc07984a SHA512 106a77665d907c45db1fc2c23990eab61cc70f9f373ce7fe0d231f9744efe5dc7119606bcbdf558ceb038edd7e0cb955531fd74c496923038bcfd799bf67616c
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
 EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 562 BLAKE2B 262862ad29b9f6f856ebe82522823d8a632deba86e5b00f88868e8db1685d113edfcde385a87d7aaea0f2c14c0345a105c47c5576e6e32b993e2aeac9d2632a3 SHA512 3084fed85d481ad806b828679af3ee7d736a3e6d94786005ba4e1bed5894eaf482d53a14e7f176c7b78a9132384d6bb8587d1a7db491170d4ab264a757e6c18a
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 566 BLAKE2B fd6bd10110660c04fb35786437c36f8629c286fd4d53f552a724bfb4026214dd0a7b783924413547e8a39e03edaf11107639aedaded16038e78ef79536c26a9d SHA512 66cadf3b06d101e1355177e0080458ddb5a8bb7e464dc3cafce2e951c1edf5e42d4e190e3abdee5e3cb24a2357be200b6f24676dfc9497e8ac9ce9abe6db7993
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 564 BLAKE2B d30c02f298b2018a3b58c99e6d1a53f7f5a575ae52bb20ad530c9a989a76470db91a284c0b3fd6f87974249616cac1f9239afde855315dd9a1ce978edaa0678c SHA512 4db4d0f7cdd222f171aed012b540bcade9545203a444a5954cf7c6d24f3e1f7291c68db358a82dfa9d2bdd3c64f7dfd807e2ae55a2fc25850a1b2b4989d61d66
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 6bd7f2baa375..79b697213802 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index b1aebf605f87..106838dff09f 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,5 @@
 DIST stripe-2.43.0.tar.gz 211400 BLAKE2B 135371f793af291e1c43179bcb325a9eb84c3258d9013009f920077fbc783569b6384fa76dcf464aa9fdbe64a4a297d6c232f3719729a81e1d62c74b769ff5f7 SHA512 a91f4f268b5c533cdd378c3169cf6e29b11b3b79492cd8b01b21970459383d63fa726fb206aba111ef8e57c2b98eecd6ba3ef9fdb868efc2db69f0cba8f74554
 DIST stripe-2.46.0.tar.gz 218080 BLAKE2B 990535efd32b5ddfe166d5b6ad1cdcd966df53fe830a10938355cac10287542284a73f99332878225388a3c28ba431baf96fa4e6e745345c9fa02e64a7e33c0f SHA512 dbfa586cfe7897b32fe95b7230fca5ccb8a12b429982776ee8873878fb6b7284cbb924e8dc6031d59647cc6080115ad541fda02d320c091b6c1bb374679d2213
 EBUILD stripe-2.43.0.ebuild 2029 BLAKE2B 51966095057589fed71b98e1adefeec61bc968ad09ce1e99c75f4705d4ea266b0e7a9a808b36d3700c66b8dd3fe9f18bb2998ddcf56a68279a08140575614b4d SHA512 2e475ea7c089564bff6fd356c51da7808cf9a58a6ab1f40c5eb61adab7034fd2a9c253155061193a72a0df0d100a6e616504db822d4a2a8ac426d568a1f123ff
-EBUILD stripe-2.46.0.ebuild 2031 BLAKE2B eb5b52e4e0a108e9a1d8cb75cfc230612ced16a3145928b2e1a738a245f1dcf61aebda7dbcb3b098af539865e1de6237fc0c3dd973360a5f6170bdcb29b8f101 SHA512 9cecd6cf58b715ac08028a748f1619ebf1b1f67ffb477043a725a400b5dedf9c3708874de1fbcb83608fc69818cc698345fe6dd507a0d26617bd754adb1916f8
+EBUILD stripe-2.46.0.ebuild 2029 BLAKE2B c768e553dd74bcfcf2956c09a68f126b62145b70e6deef0539a1bc85b04d056ab1b66d56eb7ab86ecdd75e75e10e93888333dba780a9d43587c43f5179c0cb1a SHA512 0d0aee9f4dc7f5bac41ad0ae09f96c08cf578ea9532551ca5a0653a6a9e60ad99ab830413b5139b88dee8a06cefaca5ac4397b9729ddbd34599dafb42fbfce0a
 MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/stripe-2.46.0.ebuild b/dev-python/stripe/stripe-2.46.0.ebuild
index 16c31038e92a..f40ceeb643a3 100644
--- a/dev-python/stripe/stripe-2.46.0.ebuild
+++ b/dev-python/stripe/stripe-2.46.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/subprocess32/Manifest b/dev-python/subprocess32/Manifest
index e91f88f37548..0032e4e47508 100644
--- a/dev-python/subprocess32/Manifest
+++ b/dev-python/subprocess32/Manifest
@@ -1,4 +1,3 @@
-AUX subprocess32-3.2.7-sandbox-test-fix.patch 672 BLAKE2B fbc99c70cef17dd1a0e1e7f08952a63911802c3827a4e0c5859d65563e7308fd766bb88b689465c288375a40411b6875a9bdbefad108ba9162f4b9501e8beecf SHA512 cdfa5b9ee56df54c2d122624815e472f9dd13e101a8d221adb48d21b1f7cd0ff3187d69f91c0ed7f164ee69348ffedde22a1d32a101d1eade85d6882ad47b6d0
 DIST subprocess32-3.5.4.tar.gz 97373 BLAKE2B 712b6545684fc7908a24ffae94d0967e168773a3b52a0701828ee2741255919927d24972a3c0579dadb5b187a63429d2a24e089e535bd3c41d6f48adc27b1166 SHA512 c811bdb5842d9f5ed9e51df4d13ba39045fbe98ca6e90a2c8138e68e44c2a55a2f0f3eb3e77e26caa3f88c360584912b001a0ca37ba68ac6c946c68c7a37d29a
 EBUILD subprocess32-3.5.4.ebuild 575 BLAKE2B 04f7fc693c4e7d9f1c0a212dc2f365a634497b526f6f3c17bc4ff528016f762c107fc764e18a18ca01b81d767158198296797393930c8811ec4afc524a3e9a67 SHA512 abd51930a1917127578046230dfefcf66db642417702ccc4c252aa6d5623561b822ff93bf4643949417b85b60dc3a6cb316a29caf118a9135070b441542c816b
 MISC metadata.xml 393 BLAKE2B d08d7fa6dace5a9d27aa7c6ee6df3c925d6fabe4f8a8d8f3036fce842652ef468bd2cb0a1735f841622b395569be14a8353c17aec60276b8fa7f21be5e107cc5 SHA512 0c015bdd15a504432cc6b804c66384260d2cf0b77ffbdc8af36a82e31e2c6ecf6a62c2c4d156afbaf30afcadcb3f5fdedff70b73a4c2381b5bc7fedcb5f36d4a
diff --git a/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch b/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
deleted file mode 100644
index 50e4a511fc4b..000000000000
--- a/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test_subprocess32.py b/test_subprocess32.py
-index c312949..000f7d6 100644
---- a/test_subprocess32.py
-+++ b/test_subprocess32.py
-@@ -538,7 +538,8 @@ class ProcessTestCase(BaseTestCase):
-                 [sys.executable, "-c",
-                  'import os; '
-                  'print([k for k in os.environ.keys() '
--                 '       if ("VERSIONER" not in k and "__CF" not in k)])'],
-+                 '       if ("VERSIONER" not in k and "__CF" not in k and '
-+                 '           "LD_PRELOAD" not in k and "SANDBOX_" not in k)])'],
-                 stdout=subprocess.PIPE, env={})
-         try:
-             stdout, stderr = p.communicate()
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index eb630acb89d2..6d182b6511d9 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,4 +1,4 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 EBUILD termcolor-1.1.0-r1.ebuild 475 BLAKE2B 22cc3c6d5bfe233579be3f44a51f34567db13dcc68ada17b56ee28e162fd2adf25b92668f54ee51719e81801e5fabc2a0d43835e5f1eb341fc187578700fba17 SHA512 ae2cf2e300345dbb07220e333c881083d4daa88ae4a002fed9552c860bd8e1d214f04109f706a51b76e665178c8c8e14cad9897b2dd8536a569544413f99dd79
-EBUILD termcolor-1.1.0-r2.ebuild 518 BLAKE2B 9e9f7a027441fb6325969aa0e3ec726ce1ef05cb4846dcbb8c45a97ffdbecce8e97a0193a081474b1dfe4cf029857a566ec38c99ffb0822f028ba34587b024b7 SHA512 91f49d6bf37969f58891e113d46a816148ad2cef66c4b68eedafab92b6f7051e7acd1655c3879966b512a99b67e80513e648bba6d8a7fc889c81344bfbae080c
+EBUILD termcolor-1.1.0-r2.ebuild 512 BLAKE2B 6e1d2cd74bd1772f09c8669fe4e44f983b53faf2e811921e571857cc9e258e0b93302e067430f370c25bdf86f6611c4edf0cae8019558189d3212806c92d5a28 SHA512 54e73eebc597517885412d49c73562e0b8ed87319a8ff32eb518f109724178d3a18d6d4b7784bb2844a7093bc1127b319da3054e2d9fe8ec45a3d8bb5fd0fdb4
 MISC metadata.xml 443 BLAKE2B d66fa2b33b0f2a854f6293896d9f94905112f9b10cb7bf5f7c5e5d5b2e5523a86523ce83078f1f386f5781ce6cd5ab183e6f8241d72c88dd389760a1b126cde5 SHA512 029e70f455d0ccd6aabe54c2b96cb3c0857fac49d23ea28e0885ca30fff829d2de2f93345de7e1fd14b46eb065b278d8b3f7047156b52feedd7a07df2d162864
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 66df011a2aa2..e9a9592d2abc 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index f7fb0962a302..65fad3cbe30d 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -2,6 +2,6 @@ AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 EBUILD testpath-0.3.1.ebuild 1110 BLAKE2B cf610a2cc0a3b6f03e04fa6d5f36333b7253f8ac23ef4b3956fcb5d47dfcd18a62c9fc0e9ca863b64b66b4eb91ce8f7e23c8ac8daa00756c5cb741285d5c0c34 SHA512 adc56e47ba88f4e4275540ca2aca4c674a6ad6e61a491b8e2e523f52cf6fb45e5a7d56a9a661255490dfc5ff95e5ac44969748f27327688b057f550f759ec515
-EBUILD testpath-0.4.4-r1.ebuild 715 BLAKE2B d193acc3477fe979aa3ebde0f3c1d414d0009efecc0a23a93e7cda3d62257a9f93894142af5fd30458d97d8fd763c52259c2716d7710ed807ee2b09466494b1f SHA512 e579e6991712dd2d5e2eaee47f5daac5e259dc1fc34bcbebd15ba47fc6758718216159ea2332489b28cbf5002ce1e049f0b89879b9c0ac5bdd1f88c7ca09732b
+EBUILD testpath-0.4.4-r1.ebuild 712 BLAKE2B d9a0d7e4c1689633308c6b0800418bd43b97ab0844ee5a57e6fc182436cfae10c2dfe225cdba24626aaa27f26d4ad61b2d517738af6bed0c50921d11fab14c50 SHA512 339fffac953412fc56db961449e7d12261da8f6cf967157a68d0b2a13f232c782b0ec5aa2ed466d1d18b9b7f10a825bc2c9b2f1632b1815474b5f70bc87a2205
 EBUILD testpath-0.4.4.ebuild 896 BLAKE2B ad48594448f494d44922e12414d24a5930f8592d7f3df4ea90d4b00ac9a9aeef9db3b05dcda811a08c59b3b9e0f3eaf84cda85dc7b4dee03f3e57ae6e0e184a2 SHA512 734740462be1834f515151d6558c203e1f0f63be2e2545ef11937f845b29ce312e6df239f679dd859973f80ae746c45d161295db04084ed1e72df033530c9475
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index b0177a1d6669..785eb8270cb1 100644
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${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"
 
 DEPEND="
 	test? (
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 4bb1103879cd..703bc4bbe530 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 916 BLAKE2B e544e83eec507a80e788094750e699aae5c14bd1b94d9d4c8b8ab2416c4b5985a5e2b05e5084755746e2381060ab0a59f73f6dd221c02d81beb8ee7ac56e5fdf SHA512 3c6fb6d79077b8f1404232d530ed4dac5357912bd8f40aafc0f815bbd3ba914ac4e5acaee7350a4818f4a812286d2bd1418a1fd5bd1a34ff1022f9e1dcfa11bc
+EBUILD towncrier-19.2.0.ebuild 921 BLAKE2B 14d176c918a616af267ff8a2eee889f1c0da565e7c95635917bb9bc0f0c81242e144a4c1fb0c372c9d7b495c1e90c748337e6823f2aa3631acfedc9eb7b5395c SHA512 b8523784d3dfdc99a4252046177cfda3c4503e77a5525c63b3c740ea830e678343dc08d65b1079acdd2ed840bcc20d75d3f455d1578e91bc0a0ee833aac45139
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 301a982ff988..7c6b2b5c34e1 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 9780722fedd4..0a3e764fa9e4 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -4,10 +4,12 @@ DIST tqdm-4.33.0.tar.gz 121571 BLAKE2B f4ee73cfa710462e148f6034ac69144d845d216bd
 DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577fb18986e3153badd73a28352f807782759aa52ed082d7ee0c13dc5f850c1da563ee5892f6bf5e8f49c48c7ee SHA512 1c326d98130c79f614cea502723e4202baa57b7b4639e208133cb464785e4a8d4eaa9d262ea484246d45e5eb8f21994e7ecf3fd6ef0f4966f9049fc8013d7442
 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
 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 1352 BLAKE2B 252d0d5584770fddd243dba8750b8fd1208f006082ca320f4c9ec778712a9a55b5d77f0a1169557b8cbf848bdd28d4f05d40979d260f5cffa145c2995f685800 SHA512 e507e23c4a6bd7484db91648443e805f3a1cf0c0a1ea3e427fe348284ac2880a0a3bedd0c0e2f3bd28a556b4cced1daea717e14a864c2667ffe4ac50a8758558
+EBUILD tqdm-4.45.0.ebuild 1357 BLAKE2B 61a3712f9a48e6fdf639f3a93e98f45d8252fddf368a10047e29c88a8041db391d6a196642b82bb5afc8bea5329e0f178dbec286b0a7b3fce9fc075ff687e9f1 SHA512 6cc9c993115b72a3e91bc0cf135d67e166de30f538a503e2901b01648805012056d4326444ff56f4fc6469b61aa1fb9a3eaa856a64c268649235945e3efc8e9f
 EBUILD tqdm-4.46.0.ebuild 1377 BLAKE2B b108c107a6476f793e3ce16548deec4aec2c4a28d414c74fdaf386b2af275f1be87a2a3912598237915b56185ad1ec64d83b9bd0b9eeee7e279165e0e4592b25 SHA512 7a242de0e12d7a5e72eb551c13bc12ad2d36f0c5d88138e6e0c2db9018abbf4f59964ba1af17c315858f61f39fb91d3d241df0360ff9f10dd20ed0edfb7964b5
+EBUILD tqdm-4.46.1.ebuild 1333 BLAKE2B 73d52d1f1d6361229e073efef1f1b32f42c86bfb157d32390e4b771ccd7249c02f45080334b0e31791553192eef4808801bdd0300865bba4594a2fcad52b6ef5 SHA512 198935fef5bb0ae4d30611fa98554e80c4e9b397b688e4c283e3a1d0e181fb5e0e96e89c88f48010b2334ec98fa8a140d056a76e1d3746e90ef77e4f47184806
 EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
 MISC metadata.xml 702 BLAKE2B 9e1bee8f377d18a7fddbf5a7f061b4682e28d726c4e18fb79d243bc280f01fb04d4c7743ccb380142479c0f387892358dcb76d13f659809b508160bb31096d57 SHA512 1fec7bd9cfdfe79f99141c0af20bd5da2d2d36f90a159227f48cf8b3bc8c87940339274531d62fa9dd42da54162693e6a4c74fcbe267c25a32da9cba7745c6ba
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
index 2735812d4e34..6ec5bce83c37 100644
--- a/dev-python/tqdm/tqdm-4.45.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.45.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.46.1.ebuild b/dev-python/tqdm/tqdm-4.46.1.ebuild
new file mode 100644
index 000000000000..75999c0d5faf
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.46.1.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 ~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/tubes/Manifest b/dev-python/tubes/Manifest
new file mode 100644
index 000000000000..9e0784ef3fc3
--- /dev/null
+++ b/dev-python/tubes/Manifest
@@ -0,0 +1,3 @@
+DIST tubes-0.2.0.tar.gz 64284 BLAKE2B fb8e196a2e68998e5e63c7c5e001d4b8baffb049bb4bedc8f8eb44117ab6a699e54a0dc96071cea8eec7db7a49316a01f6c259d2e456443a1014d9d4fc25d007 SHA512 6039a3059b61f8a0c84d4e10bb47d9f2bb95505b0353cb0f1eefb6942f0ad0d88c9b02ff0d48ed0300d615d3e3203c5e884990cd6d006c2f1dbd18b88fcb2e9e
+EBUILD tubes-0.2.0.ebuild 715 BLAKE2B b631cf5a2bcc4e73bdfa04ae3f61c01c3ea17e2ea1a3b9943137b7e8c62457940558725f4519278868482691b7b1f2ac047bab766bad33d0e43e8d84b6af331f SHA512 5664bda610efce9bb61adeff8a67e531230804773d09767c1156f92ff58e06526edee13d97401552493674b1bee9a3bbe6c7e2e5d248260aef51a965eb981a2b
+MISC metadata.xml 894 BLAKE2B b6180631eee31ff627a9ec598c98db018c8445bed530477b2c40da412bc61cace8a22073b1b386965a8817c7b25a976b1ab535f31d99279813e4a4ea0a7b5fb5 SHA512 1ab12e51dc2a38646f3a8ff334e5833a0e1673664e9ba26bc8d9f7b0feb9b69d0b32ff232ea363d804483c18a1b23c9cd1a8dd02a18b7f796db80f383ff55c09
diff --git a/dev-python/tubes/metadata.xml b/dev-python/tubes/metadata.xml
new file mode 100644
index 000000000000..77d7b556b447
--- /dev/null
+++ b/dev-python/tubes/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>bolson@bolson.org</email>
+			<name>Brian Olson</name>
+		</maintainer>
+		<remote-id type="pypi">cbor</remote-id>
+		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+	</upstream>
+	<longdescription>This library provides encoding and decoding for the
+Concise Binary Object Representation (CBOR) (RFC 7049) serialization format.
+It is implemented in pure python with an optional C backend and is compatible
+with versions 2.7 through to 3.8.  On cPython>=3.3 cbor2 can use a built in C
+module for performance similar to how pickle wraps the _pickle C module in the
+Python Standard Library.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/tubes/tubes-0.2.0.ebuild b/dev-python/tubes/tubes-0.2.0.ebuild
new file mode 100644
index 000000000000..6e7b2f17ad58
--- /dev/null
+++ b/dev-python/tubes/tubes-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# 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="Flow control and backpressure for event-driven applications"
+HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
+SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 "
+
+DEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 8512873d1aac..2b53c12909f8 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -2,6 +2,6 @@ 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
-EBUILD twine-1.15.0.ebuild 1311 BLAKE2B 03f25a9e3ed056e4cac4a843fd12d3f24cc08a8c5aabd72e5b0cac99a6868bca5093acee1e1736453be1f6207ecf0b1b4a2ed8cd97fa04fe792c7f00d69a2d6c SHA512 12a92694ec713cfacf3a82031e4404ea949873899e63d92f91651bdc40b804245c887f99adf36e120ecd221c7626e8ce8a1f5068389f8b5c59f5f1c5af314b06
-EBUILD twine-3.1.1.ebuild 1812 BLAKE2B b1bcc69fbed0c49175b3a29224fe40ece22a7ccdf3de87cf9a4ce5cbaa9907d0924844ba1a760715e378a5702ba369dd89491459b3f46eeaa9ebee158b147422 SHA512 e658220a4769d954d196d74c2e3266b069745e3af4b1ad602dc3365b863674c358ebdbb61b7b260d353e969ad009e5dc575c5ae57c2f8042e49f0807a4e0fe97
+EBUILD twine-1.15.0.ebuild 1316 BLAKE2B f3caf2ad608b788cbf8c221a52e192d4df24441a9cc6bde46131a44a117bc0e2300e507769a79945ab5afdff9d3ed3bd3fe8afa9611fab50561b9efe2c3a72db SHA512 4f55f1e3e359064f151a5975d5d28f45eac932a87a79ef7cfc9aa6aeceb5b94ce47b7da177fd8b3f78fded784b64501061308bf02fdac3a71acd495982640f80
+EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index c7bfac3b60a4..aae10c3dab61 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~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/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild
index b6da9633595d..adef323d40d7 100644
--- a/dev-python/twine/twine-3.1.1.ebuild
+++ b/dev-python/twine/twine-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~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/twisted/Manifest b/dev-python/twisted/Manifest
index 413cdcf9f972..ca250b7e016f 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,12 +1,5 @@
-AUX test_main.patch 3035 BLAKE2B 849a8d5aa6014d8c62f2cb464265b2b0d2a2e11e58eb28803b06683e89acdf6ce8668b1b1beb36f1437684f26f57b94b840201f9f8aa3e34b37cf888e2cb6644 SHA512 8e85a2aeb934f9a85bce223e50bae62e63188b4a75f6ef9e67badd040a6018075e7c777683106cf160d65383351d2d6ce02d3bc9a57e434e6e120ac8b669b147
-AUX trial 485 BLAKE2B 5a8ac382860e3967b5cb2d3b30a3799d77525ad3010b19daf5bed693c5739149b4bef070790485585d1e0b13d0286e84196a3cea26d3646ecd8e36ed7f966eef SHA512 b6a58da5281e18306d558fd665acfff02e2478e4f692661a3ed0fc0b01e6e13794a8d2b56ac3f2790a0cdd83a882f37a247f5083ceaf6ed6686fb69bd87853ce
 AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
-AUX twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 427 BLAKE2B 0bf2c34f6dce2eed84782da7ce29ce4a76f6cca3f3b4b273c16c02fc75b22df3115deeca9c836916dc43ea88dc08e3e4c2f544c50164ee0c8fae491b4e54befb SHA512 d14b4941c3a13c59dfe0599a3eb73b9b0d5bde8e7c26033848ac920da8e8c63a0290d7f4d711cab16a17ba55a2e13830ab02bbd0db38f0757768cb973000064c
-AUX twisted-16.6.0-test-fixes.patch 10591 BLAKE2B 27729db1ce4b84ea66acfa12bfdf2232623fa6c607fb1a6e0b3cd8325c31343a4565568141d9e659204fce9a2156117db05027cc2b023e8099fdf9e394524df6 SHA512 5071ffe30d1911ab4eb301403542f34198cbb3e09137d6260125fa61f702a0ce10e5c11c7967c10841a9d1b62f2eaf44e04119182a108cfbb7046622ddbdbcf2
-AUX twisted-17.9.0-Fix-test-on-Python-363.patch 3490 BLAKE2B 421318533759dad2d4ad3f054fbfab7900362aa3b3ca0adc75fb42431272fcaa40fe85ab2a3417232d97d3389b380ae658ee5b475e087f3a6097e28dd2094111 SHA512 0ba6b68267418bee3b2cfb15937dab4d6d3291725dd7acc41f37e0c8d39218acc4e23cb704c292f62eea57a128a1fcee6899826601b6763f37800c4b83ad18a8
-AUX twisted-17.9.0-python-27-utf-8-fix.patch 1630 BLAKE2B c70f3223b66a9372e07df7a767937d77a07f91cafecb4a5d84452f57458516e3ef17e4d5862d6b9f003e0edce3391e282f5bfcaf57ff2029db3c499fc6e97262 SHA512 635c498ab0e612b7d7ab262c333f18408e22dbe95d86389e87da36f0c41cee90f25b4c1df626cb755932c970a9f12dc25ca67e3790bd9c15c8a4d8ee6f547956
-AUX twisted-18.4.0-Disable-writing-of-plugin-cache.patch 853 BLAKE2B f2f4f3906266199856056d4eae062aafaa8d5b574858bd494d6a51512ad3f27ee0d813de8a760fbd21bdf479fde0bb1c3e724e13bddceb0d3af83bb8ecb31aa6 SHA512 e27a61855523a64c27e7adfe8ec917fae60149b1bfe0fc555694dc4321669665116046baa8f293d75b4bf68ec19743850062132aa05fed5feab4f582cc75219c
 AUX twisted-19.10.0-py38-cgi.patch 1356 BLAKE2B d172448bd2807dc57ac2a905427f0a91fa93dd17a1e58ab64dc17fc02fe05a81cee4c08aa667c799720cde33877e4b72f8db8df3587d8d8d711988bb2e388128 SHA512 65629acfc2f6dd6686db715024209e9ff12b97d5190c4377e6d88222c85c1d2a1f3502a93801525ee1a0fc0357f2b28ba87db888ea64bccfbfdc74fdfb667f42
 AUX twisted-19.10.0-py38.patch 3997 BLAKE2B 26df585019d5e2aca4257c9a7840a973ee9e1f3dfce65c76b021b8d6ea07ed8c6abca237c11ce75b49994ea7ed95de587a433a6a6f3577cd6f2ddf243d40defd SHA512 bc6eb1b1bbb704fe30c4ef071f8d8e95faaad3089013d11765f30f4b6bdbb108b913b043c071d00c18b53655841cb1810286331c5318d4659ad7c90d90b9fb4e
 AUX twisted-19.10.0-py39-b64.patch 7022 BLAKE2B f59573231a70318aac1f383602725949f033e017c036ab204815816ef168ad122253e903ff577c1a055c12023d06dc49ebfcdecf693d9890476785653860a628 SHA512 5904bcf5eadcd53d038870d6868fec1a81d6327c31b7b2360987a69e6f4046e92e11b52260c53a2361687161a36a5b6f53b24906d404ebe25f86e5bdc11fc6dc
@@ -14,14 +7,9 @@ AUX twisted-20.3.0-py38-cgi.patch 8601 BLAKE2B 6eb76eaa1cfe10ba473a334bfd5e5a4c7
 AUX twisted-20.3.0-py38-hmac.patch 3484 BLAKE2B b89587da906517a621ba880eb6eb71cc2f397a7bcf7bcf065f79897626f821d965b2daa0d105af7e48c8c30fb79fb836c02db17058b5ac046ae92f9578899a62 SHA512 a6ed24994bf76a7e602144eed706c61cce531408db050dc2a497fb4131b5594f4d29ebd34c0d780b283460d130dfc88b19ad9cbe5436c0290b9b13eb35c9342b
 AUX twisted-20.3.0-py39-b64.patch 6747 BLAKE2B 1bb6960e5049f43b08e2ba7a56a16616e82f3b18290645b2f14bd15a199d3e1b2767e030a8295fc2d3f4a8a3d1a6e4a5d5d7d55a089da643c593b2a3df174119 SHA512 6f58dcecf07925d15a1373726e03da4083a0266ee6629089b30b0c8ab62bd007579942430989df2d550578067e2c2c542062dd20a38851794f6ef86e85aefb95
 AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e234c36941f0f7ecfdcfa8c14a6a7b5a433b9ff2a40c2ad870e46b3437210202cf0dc58e17c8d29ebf506c499780355cf60bdb SHA512 81f0b597a7b2609bae5f405388bccf759dd6b0295cf05e6ef2aee76d0f3ab4367a474704aab2753d101be2580d097f30d94acc529035bdb3c3ec43dd035fb733
-AUX utf8_overrides.patch 2288 BLAKE2B 450f921f6a07cd56d9311c15c9f2bf342ec82c807325ebb5b5c2fd61572d489ac7f1c8978892530016a343b7284c580def705127c57ce947a2698835e447b8ce SHA512 b495268282e0233c570655b2b3d42ecc90116b22c36cdec4ebf581ce1019abedb7ee301d860ec161b4b5e691d1b747ad45257966b5f510de8dcce8271021e7e8
-DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80727dd6d034e3f8a151f084eff5a3fc560f2eb9e76c452a14ec90b36d93e14d3bbb388010c3c5c01fd1c4d5ca16bb SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf
-DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b82cd035ba3329b3faaf950339a6653de697ba3873b37b22f9d7f8a66109694b80496917bf61e79c56eeb7e351ac87 SHA512 3733a6df0196ea580187da3576f5fd08f287437528a4e19813056d019cca213c61b62d879d80a12eef38661d3505ba33aac9a4fc956b19afa6da7d37a6465c83
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5783 BLAKE2B e6433d34015f3140e93ac698aaaaae9fa822de410debaa5bce42ffc5697e9c11ed0c3180ce8212703746addda39d9b0d4c30dbbef348fb821a65cc6e24d8701d SHA512 181151b8b2667f688fa08ce7aa97e2fc242c8dd168cc5498d17f6224ce18933406ddcf40a8c813a0631f4cd58e498c370d94371043c41d4b18aa44876677b979
-EBUILD twisted-18.4.0.ebuild 6270 BLAKE2B edbeb59373d55d728b255223dd7ca09043547c80513be779719704983508dd2be866e4fee90bb023f8817f95659291c262b4d037ba6609164a61d13dd660e5e4 SHA512 ae8aede1151acaa3f94553bdcefc25970e9026f4aef8a81c6a6f8f0a0e7d9c91283ff6eaf1aeb2ed8140021279ed3a985967fd6357b8ad239289604a9cc0a2a5
-EBUILD twisted-19.10.0.ebuild 5878 BLAKE2B 23231a9145a514d363600656ebc0ca2136b8be060559131fbdd9adb5235d1bd734383aca7a37e7c0befd005fce67723e55a288117a0e2273862055067f13af5f SHA512 14604830d9de35e8ea66334af5b0c9fc42a562b03d4b20425c579c654eff18047860e9cb100243c9884599fc5294b6018b3c77f54175bcb8c549aedfb0477a95
-EBUILD twisted-20.3.0.ebuild 5597 BLAKE2B 82a53fd33fed4406ded61e1ec3de95dc3f00ac313b35ee827ac5d840d97615ba86fbd07d26a125a00f79f54f466a51e5243e1f7062af0753e084be9a87ac6f24 SHA512 9c82340171a43fed2d0ab607657a0dd73012e605f5b746a20d78b724617249bd6a153b42ea860711f2991bdad05023e444c11131da8c4bc3f7e6cb61d97a97a7
+EBUILD twisted-19.10.0.ebuild 5789 BLAKE2B 33995700df1fa184e1612aed28c2a42b413c8b5454c13a5e28ede8aa1398394b1e78159b8cea5210f18cccc10a03943a001e46d440240d2d588bd8a5c77cf097 SHA512 1c5428786d6aab20ef667578dd66d05bc22c820105fd700e1e0b15a2620985f10ad71dae14f88ccb9ddee1f155934cba4d3d01e9b87990ce521eedf3d751b45c
+EBUILD twisted-20.3.0.ebuild 5596 BLAKE2B 9dcb2d8428d9fb97f1d84bad8fdb3e78b349a003cb1a5a2c62832ebc03c8906fa586f9e4b1e95d02c871c90cafad2721e6939f003f71f598954ba6200a948ad4 SHA512 77383ed93cf4fa6051d257e7b7506f5efe399a274d112c9be6fb2f377e799261e034d14e0f750d0023e926e816e96db485c074557de0c06b760e938d08d3fda9
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/files/test_main.patch b/dev-python/twisted/files/test_main.patch
deleted file mode 100644
index bfef40450d52..000000000000
--- a/dev-python/twisted/files/test_main.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2c3c28f5dbbd61bcfa5c548d1d423fffbaf2132d Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 09:32:18 -0700
-Subject: [PATCH] tests/test_main.py: Fix test_twisted to handle differntly
- sorted options
-
-Some systems retuned the usage with '__main__.py' instead of the command 'trial'
-So, substitute that out if it exists.
-The options returned via python can be a different sort order than is output via the
-command --help.  So break up the lines into a list and check equality, lines are neither
-missing or extra.
----
- src/twisted/test/test_main.py | 34 ++++++++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/test/test_main.py b/src/twisted/test/test_main.py
-index 572769018..b010a389e 100644
---- a/src/twisted/test/test_main.py
-+++ b/src/twisted/test/test_main.py
-@@ -18,6 +18,10 @@ from twisted.trial.unittest import TestCase
- 
- class MainTests(TestCase):
-     """Test that twisted scripts can be invoked as modules."""
-+    # this test just does not work correctly on Gentoo
-+    # the output has '__main__.py' instead of 'trial'
-+    # I have only been able to get 2.7 working correctly
-+    # with replacing the value with what is expected.
-     def test_twisted(self):
-         """Invoking python -m twisted should execute twist."""
-         cmd = sys.executable
-@@ -28,11 +32,37 @@ class MainTests(TestCase):
- 
-         def processEnded(ign):
-             f = p.outF
--            output = f.getvalue().replace(b'\r\n', b'\n')
-+            # Some systems may return __main__.py instead of the command name expected
-+            output = f.getvalue().replace(b'\r\n', b'\n').replace(b"__main__.py", b"trial")
- 
-             options = TwistOptions()
-             message = '{}\n'.format(options).encode('utf-8')
--            self.assertEqual(output, message)
-+            # NOTE: python may return the  options in a different order
-+            # than is output via the command --help option
-+            # so we must break up the text and compare that lines
-+            # are not missing or extra from what is expected
-+            a = output.split(b'\n')
-+            b = message.split(b'\n')
-+            extras = []
-+            missing = []
-+            equal_len = (len(a) == len(b))
-+            for i in a:
-+                if i not in b:
-+                    extras.append(i)
-+            for i in b:
-+                if i not in a:
-+                    missing.append(i)
-+
-+            self.assertTrue(equal_len,
-+                msg="Usage reported a different number of lines than expected")
-+            self.assertTrue(extras == [],
-+                msg="Usage returned these extra lines not expected: %s"
-+                    % '\n'.join(extras)
-+            )
-+            self.assertTrue(missing == [],
-+                msg="Usage was missing these expected lines: %s"
-+                    % '\n'.join(missing)
-+            )
-         return d.addCallback(processEnded)
- 
-     def test_twisted_import(self):
--- 
-2.12.1
-
diff --git a/dev-python/twisted/files/trial b/dev-python/twisted/files/trial
deleted file mode 100644
index 8da58861abf6..000000000000
--- a/dev-python/twisted/files/trial
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) Twisted Matrix Laboratories.
-# See LICENSE for details.
-import os, sys
-
-try:
-    import _preamble
-except ImportError:
-    try:
-        sys.exc_clear()
-    except AttributeError:
-        # exc_clear() (and the requirement for it) has been removed from Py3
-        pass
-
-# begin chdir armor
-sys.path[:] = map(os.path.abspath, sys.path)
-# end chdir armor
-
-sys.path.insert(0, os.path.abspath(os.getcwd()))
-
-from twisted.scripts.trial import run
-run()
diff --git a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index ed1a46840678..000000000000
--- a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/twisted/plugin.py
-+++ src/twisted/plugin.py
-@@ -180,7 +180,7 @@
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except:
diff --git a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch b/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
deleted file mode 100644
index 3ce04aa3f684..000000000000
--- a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From 91b6d8b5b9d602152fb7148c6e2921463b93a8a5 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 10:55:32 -0700
-Subject: [PATCH] twisted test overrides
-
----
- src/twisted/internet/test/test_gireactor.py |  3 ++-
- src/twisted/pair/test/test_ethernet.py      |  9 +++++++++
- src/twisted/pair/test/test_ip.py            |  8 ++++++++
- src/twisted/pair/test/test_rawudp.py        | 10 +++++++++-
- src/twisted/pair/test/test_tuntap.py        | 16 ++++++++++++++++
- src/twisted/python/test/test_dist3.py       |  2 ++
- src/twisted/test/test_ident.py              |  5 ++++-
- src/twisted/test/test_plugin.py             |  6 ++++++
- src/twisted/test/test_policies.py           |  5 +++++
- src/twisted/test/test_udp.py                |  6 ++++++
- 10 files changed, 67 insertions(+), 3 deletions(-)
-
-diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
-index 43147fdce..6333218e7 100644
---- a/src/twisted/internet/test/test_gireactor.py
-+++ b/src/twisted/internet/test/test_gireactor.py
-@@ -39,6 +39,7 @@ from twisted.python.compat import _PY3
- if gireactor is None:
-     skip = "gtk3/gi not importable"
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
- 
- 
- class GApplicationRegistrationTests(ReactorBuilder, TestCase):
-@@ -103,7 +104,7 @@ class GApplicationRegistrationTests(ReactorBuilder, TestCase):
- 
-         self.runReactor(app, reactor)
- 
--    if gtk3reactor is None:
-+    if gtk3reactor is None or EMERGE_TEST_OVERRIDE:
-         test_gtkApplicationActivate.skip = (
-             "Gtk unavailable (may require running with X11 DISPLAY env set)")
- 
-diff --git a/src/twisted/pair/test/test_ethernet.py b/src/twisted/pair/test/test_ethernet.py
-index a4c3a5d19..fe9c57151 100644
---- a/src/twisted/pair/test/test_ethernet.py
-+++ b/src/twisted/pair/test/test_ethernet.py
-@@ -1,11 +1,16 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
-+
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.python import components
- from twisted.pair import ethernet, raw
- from zope.interface import implementer
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- @implementer(raw.IRawPacketProtocol)
- class MyProtocol:
-@@ -221,3 +226,7 @@ class EthernetTests(unittest.TestCase):
-                 raise
-         else:
-             raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+
-+if EMERGE_TEST_OVERRIDE:
-+    EthernetTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_ip.py b/src/twisted/pair/test/test_ip.py
-index 0f192a357..0a99658ef 100644
---- a/src/twisted/pair/test/test_ip.py
-+++ b/src/twisted/pair/test/test_ip.py
-@@ -1,11 +1,16 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
-+
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.python import components
- from twisted.pair import ip, raw
- from zope import interface
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- @interface.implementer(raw.IRawDatagramProtocol)
- class MyProtocol:
-@@ -432,3 +437,6 @@ class IPTests(unittest.TestCase):
-                 raise
-         else:
-             raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+if EMERGE_TEST_OVERRIDE:
-+    IPTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_rawudp.py b/src/twisted/pair/test/test_rawudp.py
-index 15aae10f1..dade38618 100644
---- a/src/twisted/pair/test/test_rawudp.py
-+++ b/src/twisted/pair/test/test_rawudp.py
-@@ -1,12 +1,17 @@
- # Copyright (c) Twisted Matrix Laboratories.
- # See LICENSE for details.
--
- #
-+
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.internet import protocol
- from twisted.pair import rawudp
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
-+
- class MyProtocol(protocol.DatagramProtocol):
-     def __init__(self, expecting):
-         self.expecting = list(expecting)
-@@ -325,3 +330,6 @@ class RawUDPTests(unittest.TestCase):
-                 raise
-         else:
-             raise AssertionError('addProto must raise an exception for bad protocols')
-+
-+if EMERGE_TEST_OVERRIDE:
-+    RawUDPTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/pair/test/test_tuntap.py b/src/twisted/pair/test/test_tuntap.py
-index 5e2da6e0f..53e03a008 100644
---- a/src/twisted/pair/test/test_tuntap.py
-+++ b/src/twisted/pair/test/test_tuntap.py
-@@ -64,6 +64,7 @@ if platformSkip is None:
- else:
-     skip = platformSkip
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
- 
- 
- @implementer(IReactorFDSet)
-@@ -1417,3 +1418,18 @@ class RealIOSystemTests(IOSystemTestsMixin, SynchronousTestCase,
-     """
-     General L{_IInputOutputSystem} tests applied to L{_RealSystem}.
-     """
-+
-+if EMERGE_TEST_OVERRIDE:
-+    RealIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    MemoryIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TapTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunnelAddressEqualityTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunnelAddressTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TuntapPortTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    TunnelTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    FakeTapDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    FakeTapDeviceWithPITests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    FakeTunDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    RealDeviceWithProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
-+    RealDeviceWithoutProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
-diff --git a/src/twisted/python/test/test_dist3.py b/src/twisted/python/test/test_dist3.py
-index 3ce2bdd60..494674bc7 100644
---- a/src/twisted/python/test/test_dist3.py
-+++ b/src/twisted/python/test/test_dist3.py
-@@ -53,3 +53,5 @@ class ModulesToInstallTests(TestCase):
-         test_exist.skip = "Only on Python 2"
-     else:
-         test_notexist.skip = "Only on Python 3"
-+
-+ModulesToInstallTests.skip = "This is an upstream distribution test only"
-diff --git a/src/twisted/test/test_ident.py b/src/twisted/test/test_ident.py
-index d86b840e5..3cc40261f 100644
---- a/src/twisted/test/test_ident.py
-+++ b/src/twisted/test/test_ident.py
-@@ -12,7 +12,7 @@ from twisted.protocols import ident
- from twisted.python import failure
- from twisted.internet import error
- from twisted.internet import defer
--from twisted.python.compat import NativeStringIO
-+from twisted.python.compat import NativeStringIO, _PY3
- 
- from twisted.trial import unittest
- from twisted.test.proto_helpers import StringTransport
-@@ -216,6 +216,9 @@ class ProcMixinTests(unittest.TestCase):
-         """
-         L{ident.ProcServerMixin.lookup} uses the Linux TCP process table.
-         """
-+        if not _PY3:
-+            # test is broken in py2.7
-+            return
-         open_calls = []
- 
-         def mocked_open(*args, **kwargs):
-diff --git a/src/twisted/test/test_plugin.py b/src/twisted/test/test_plugin.py
-index a23caa72b..a6d61858c 100644
---- a/src/twisted/test/test_plugin.py
-+++ b/src/twisted/test/test_plugin.py
-@@ -29,6 +29,8 @@ else:
-         On python 2, import caches don't need to be invalidated.
-         """
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- 
- class ITestPlugin(Interface):
-@@ -327,6 +329,8 @@ class PluginTests(unittest.TestCase):
-         attainable, but an error should be logged to show that the cache
-         couldn't be updated.
-         """
-+        if EMERGE_TEST_OVERRIDE:
-+            return
-         # Generate the cache
-         plugin.getCache(self.module)
- 
-@@ -580,6 +584,8 @@ class DeveloperSetupTests(unittest.TestCase):
-         provide useful coverage on Windows due to the different meaning of
-         "read-only directory".
-         """
-+        if EMERGE_TEST_OVERRIDE:
-+            return
-         self.unlockSystem()
-         self.sysplug.child('newstuff.py').setContent(pluginFileContents('one'))
-         self.lockSystem()
-diff --git a/src/twisted/test/test_policies.py b/src/twisted/test/test_policies.py
-index 3d92633d6..c08809a66 100644
---- a/src/twisted/test/test_policies.py
-+++ b/src/twisted/test/test_policies.py
-@@ -7,6 +7,8 @@ Test code for policies.
- 
- from __future__ import division, absolute_import
- 
-+import os
-+
- from zope.interface import Interface, implementer, implementedBy
- 
- from twisted.python.compat import NativeStringIO
-@@ -23,6 +25,7 @@ try:
- except ImportError:
-     import __builtin__ as builtins
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
- 
- 
- class SimpleProtocol(protocol.Protocol):
-@@ -883,6 +886,8 @@ class LoggingFactoryTests(unittest.TestCase):
-         automatically opens a unique log file for that protocol and attaches
-         the logfile to the built protocol.
-         """
-+        if EMERGE_TEST_OVERRIDE:
-+            return
-         open_calls = []
-         open_rvalues = []
- 
-diff --git a/src/twisted/test/test_udp.py b/src/twisted/test/test_udp.py
-index 6cf4583b2..86b513704 100644
---- a/src/twisted/test/test_udp.py
-+++ b/src/twisted/test/test_udp.py
-@@ -8,6 +8,8 @@ Tests for implementations of L{IReactorUDP} and L{IReactorMulticast}.
- 
- from __future__ import division, absolute_import
- 
-+import os
-+
- from twisted.trial import unittest
- 
- from twisted.python.compat import intToBytes
-@@ -15,6 +17,8 @@ from twisted.internet.defer import Deferred, gatherResults, maybeDeferred
- from twisted.internet import protocol, reactor, error, defer, interfaces, udp
- from twisted.python import runtime
- 
-+EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
-+
- 
- class Mixin:
- 
-@@ -699,3 +703,5 @@ if not interfaces.IReactorUDP(reactor, None):
-     ReactorShutdownInteractionTests.skip = "This reactor does not support UDP"
- if not interfaces.IReactorMulticast(reactor, None):
-     MulticastTests.skip = "This reactor does not support multicast"
-+elif EMERGE_TEST_OVERRIDE:
-+    MulticastTests.skip = "This reactor test does not work via FEATURES=test emerge twisted"
--- 
-2.12.1
-
diff --git a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch b/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
deleted file mode 100644
index ea7a480abace..000000000000
--- a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From e58956fe12af7b41f6c1735ba7b14cba69e82a5e Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@FreeBSD.org>
-Date: Fri, 6 Oct 2017 02:47:55 -0700
-Subject: [PATCH] Fix test on Python 3.6.3
-
----
- src/twisted/test/test_sslverify.py | 53 +++++++++++++++++++++++++++++------------------------
- 1 file changed, 29 insertions(+), 24 deletions(-)
-
-diff --git a/src/twisted/test/test_sslverify.py b/src/twisted/test/test_sslverify.py
-index aca56f5..3fdc480 100644
---- a/src/twisted/test/test_sslverify.py
-+++ b/src/twisted/test/test_sslverify.py
-@@ -3052,28 +3052,33 @@ class SelectVerifyImplementationTests(unittest.SynchronousTestCase):
-             in self.flushWarnings()
-             if warning["category"] == UserWarning)
- 
--        if _PY3:
--            importError = (
--                "'import of 'service_identity' halted; None in sys.modules'")
--        else:
--            importError = "'No module named service_identity'"
--
--        expectedMessage = (
--            "You do not have a working installation of the "
--            "service_identity module: {message}.  Please install it from "
--            "<https://pypi.python.org/pypi/service_identity> "
--            "and make sure all of its dependencies are satisfied.  "
--            "Without the service_identity module, Twisted can perform only "
--            "rudimentary TLS client hostname verification.  Many valid "
--            "certificate/hostname mappings may be rejected.").format(
--                message=importError)
-+        importErrors =[
-+            # Python 3.6.3
-+            "'import of service_identity halted; None in sys.modules'",
-+            # Python 3
-+            "'import of 'service_identity' halted; None in sys.modules'",
-+            # Python 2
-+            "'No module named service_identity'"
-+        ]
- 
--        self.assertEqual(
--            (warning["message"], warning["filename"], warning["lineno"]),
--
--            # Make sure we're abusing the warning system to a sufficient
--            # degree: there is no filename or line number that makes sense for
--            # this warning to "blame" for the problem.  It is a system
--            # misconfiguration.  So the location information should be blank
--            # (or as blank as we can make it).
--            (expectedMessage, "", 0))
-+        expectedMessages = []
-+        for importError in importErrors:
-+            expectedMessages.append(
-+                "You do not have a working installation of the "
-+                "service_identity module: {message}.  Please install it from "
-+                "<https://pypi.python.org/pypi/service_identity> "
-+                "and make sure all of its dependencies are satisfied.  "
-+                "Without the service_identity module, Twisted can perform only"
-+                " rudimentary TLS client hostname verification.  Many valid "
-+                "certificate/hostname mappings may be rejected.".format(
-+                message=importError))
-+
-+        self.assertIn(warning["message"], expectedMessages)
-+
-+        # Make sure we're abusing the warning system to a sufficient
-+        # degree: there is no filename or line number that makes sense for
-+        # this warning to "blame" for the problem.  It is a system
-+        # misconfiguration.  So the location information should be blank
-+        # (or as blank as we can make it).
-+        self.assertEqual(warning["filename"], "")
-+        self.assertEqual(warning["lineno"], 0)
---
-libgit2 0.26.0
-
diff --git a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch b/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
deleted file mode 100644
index 7e3ec26bcfdb..000000000000
--- a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c7db4c055e92509e5c19a051cbebea53034994ba Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <bdolbec@gaikai.com>
-Date: Wed, 25 Oct 2017 14:39:57 -0700
-Subject: [PATCH] python-2.7 utf-8 fixes
-
----
- src/twisted/test/test_twistd.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
-index 3a9d337..4b0cf28 100644
---- a/src/twisted/test/test_twistd.py
-+++ b/src/twisted/test/test_twistd.py
-@@ -1902,8 +1902,12 @@ class DaemonizeTests(unittest.TestCase):
-         message is Unicode, the child encodes the message as ascii
-         with backslash Unicode code points.
-         """
-+        if sys.hexversion >= 0x3000000:
-+            reported_str = b'\u2022'
-+        else:
-+            reported_str = b'\xe2\x80\xa2'
-         self.assertErrorWritten(raised=u"\u2022",
--                                reported=b'1 RuntimeError: \\u2022')
-+                                reported=b'1 RuntimeError: ' + reported_str)
- 
- 
- 
-@@ -2003,9 +2007,15 @@ class DaemonizeTests(unittest.TestCase):
-         unicode and too long, it's truncated by the child, even if
-         this splits a unicode escape sequence.
-         """
-+        if sys.hexversion >= 0x3000000:
-+            reported_str = b'\\u2022'
-+            length = 14
-+        else:
-+            reported_str = b'\xe2\x80\xa2'
-+            length = 28
-         self.assertErrorWritten(
-             raised=u"\u2022" * 30,
--            reported=b'1 RuntimeError: ' + b'\\u2022' * 14,
-+            reported=b'1 RuntimeError: ' + reported_str * length,
-         )
- 
- 
---
-libgit2 0.26.0
-
diff --git a/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch b/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch
deleted file mode 100644
index 318304e58df3..000000000000
--- a/dev-python/twisted/files/twisted-18.4.0-Disable-writing-of-plugin-cache.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cac07e9ef273b065eeebbeeaa27155c8402a36e1 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 7 Jul 2018 11:37:23 -0700
-Subject: [PATCH] Disable writing of plugin cache
-
----
- src/twisted/plugin.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/plugin.py b/src/twisted/plugin.py
-index 82522ee..e5849d6 100644
---- a/src/twisted/plugin.py
-+++ b/src/twisted/plugin.py
-@@ -180,7 +180,7 @@ def getCache(module):
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except OSError as e:
---
-libgit2 0.26.4
-
diff --git a/dev-python/twisted/files/utf8_overrides.patch b/dev-python/twisted/files/utf8_overrides.patch
deleted file mode 100644
index 41f48cebfd84..000000000000
--- a/dev-python/twisted/files/utf8_overrides.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f8b2e95cc9bd1cbae565e1b4d576950961edc9a7 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 31 Mar 2017 09:40:16 -0700
-Subject: [PATCH] UTF8 test overrides:  The DaemonizeTests SafeStrTests tests
- may need to be run independantly
-
-Some other tests may leave python in a state that returns a different form of the b'\\u2022'
-bytestring (b'\xe2\x80\xa2') which causes the tests to fail.
-In StafeStrTests, the returned 't\\xfcst' != 't\xc3\xbcst' originally sent, but is just
-the unicode equivalent.
-
-This adds an environment override which can be used to skip these test during a full
-"trial twisted" run.  The DaemonizeTests, SafeStrTests can then be run independantly
-with a clean python interpreter.
----
- src/twisted/test/test_reflect.py | 6 ++++++
- src/twisted/test/test_twistd.py  | 3 +++
- 2 files changed, 9 insertions(+)
-
-diff --git a/src/twisted/test/test_reflect.py b/src/twisted/test/test_reflect.py
-index ff0c7fc9e..0c13b949b 100644
---- a/src/twisted/test/test_reflect.py
-+++ b/src/twisted/test/test_reflect.py
-@@ -19,6 +19,9 @@ from twisted.python.reflect import (
-     accumulateMethods, prefixedMethods, prefixedMethodNames,
-     addMethodNamesToDict, fullyQualifiedName)
- 
-+UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
-+
-+
- 
- class Base(object):
-     """
-@@ -553,6 +556,9 @@ class SafeStrTests(TestCase):
-         x = b't\xc3\xbcst'
-         self.assertEqual(reflect.safe_str(x), x)
- 
-+    if UTF8_OVERRIDES:
-+        test_workingUtf8_2.skip = "test_workingUtf8_2 requires to be run independantly of other tests"
-+
- 
-     def test_workingUtf8_3(self):
-         """
-diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
-index b74fe4a08..d55be16b9 100644
---- a/src/twisted/test/test_twistd.py
-+++ b/src/twisted/test/test_twistd.py
-@@ -78,6 +78,7 @@ if getattr(os, 'setuid', None) is None:
- else:
-     setuidSkip = None
- 
-+UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
- 
- 
- def patchUserDatabase(patch, user, uid, group, gid):
-@@ -1913,3 +1914,5 @@ class DaemonizeTests(unittest.TestCase):
- 
- if _twistd_unix is None:
-     DaemonizeTests.skip = "twistd unix support not available"
-+elif UTF8_OVERRIDES:
-+    DaemonizeTests.skip = "twistd.DaemonizeTests testing needs to be run separately"
--- 
-2.12.1
-
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
deleted file mode 100644
index 07002498ec45..000000000000
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6)
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic distutils-r1 versionator
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~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"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-		einfo "There are a few known python-2.7 errors due to some unicode issues"
-		einfo "which are different in Gentoo installed python-2.7"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
deleted file mode 100644
index 131a2e05578d..000000000000
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-# openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
-RDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# ${PN}-17.9.0-Fix-test-on-Python-363.patch"  <== version specific from upstream
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-18.4.0-Disable-writing-of-plugin-cache.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-	"${FILESDIR}/${PN}-17.9.0-python-27-utf-8-fix.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-
-		# Conch doesn't work with latest >=OpenSSH 7.6
-		#   - https://twistedmatrix.com/trac/ticket/9311
-		#   - https://twistedmatrix.com/trac/ticket/9515
-		rm src/twisted/conch/test/test_conch.py || die "rm src/twisted/conch/test/test_conch.py FAILED"
-		rm src/twisted/conch/test/test_cftp.py || die "rm src/twisted/conch/test/test_cftp.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 720e3b98f647..ed3222af413e 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -19,11 +19,11 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 S=${WORKDIR}/${TWISTED_P}
 
-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"
 SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
+IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -45,7 +45,6 @@ RDEPEND="
 		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
 	)
 	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
 	http2? (
 		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
 		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index e3f1f2c66aa6..a3fc5aa507b9 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 289ba3971046..801905a8cc17 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -6,6 +6,8 @@ AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664e
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 DIST ujson-2.0.3.tar.gz 7127432 BLAKE2B 09fc3bdd127e5b54cfb26ffe56eced194d7c4aaab5717a396e06317de26f34815d04cce2b67ccb0157474165bdbdc62f0171b9485d7083dc1c01aa7252afeb5a SHA512 2c1879c372745966a00e064559dbf615f282ef192cbdbb29243c48169fc5f6e9344eba29988a1de3b5b0d1fe7699fcd88373d6dbb2e3fb59b1e8ef12b8a0375d
+DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
 EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B 6ab2c9fc8d238905603795685517d7e7d8885311653acb0fc3dbeb329ac91f0a465315f25437d42fdca24627d8a1584becef51d61aab1af49eb85f28933124a1 SHA512 1f0e47f81964b8d7691863477836750ef7c9c44e900f94502c0498088fc5d2ff2e7770342273f1a2ea4356900741fef872c99bdc2636f247ee495ca4af269883
 EBUILD ujson-2.0.3.ebuild 583 BLAKE2B 24b7c4e57672c9700976bfe3dab1c3a99c6a5eaa81dbcdacc0ddaf46cf780b59b1ceb86097e453d35c54d9b1d605d07126a2af476c10475b95da45590a9d5cb9 SHA512 0d646f96fe82f4fd3e28ce4b0afe969a6035438f033290aad0a08905b4f800e20344df1d523a2bd86cc9fed5241d0a3b876389c8a1b09d16f8caa9ad4357a400
+EBUILD ujson-3.0.0.ebuild 586 BLAKE2B c2831dfc1d28110d0663520e21ef2ed24d517a498f9c7f4cb9b08c324c080bc061f9ff2d6db91864490aa5d9e5d4bc666c47d8a67c10cd55d2dd6c9153f3d9c6 SHA512 fbfd259739a30cec0f7108382a95b613f1c117f41875cb06430a3ce290dea14e0312bc448938821e8c7dd6d35b6d989dabc31a5dde3a93449d911b89139f272a
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-3.0.0.ebuild b/dev-python/ujson/ujson-3.0.0.ebuild
new file mode 100644
index 000000000000..5679fb2c3fc5
--- /dev/null
+++ b/dev-python/ujson/ujson-3.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 7f26fd0440b6..6581bf0291ee 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.6.ebuild 646 BLAKE2B 4663acb1a31332f7e155c350d3c6e798a86340ee91741048d59390d519310f5313b4ef6bf813129c8c5e5b98c7aeb9413ece66dadd4d163eacfd315932f26119 SHA512 72396455b1e299164ba5a092a64905e897b768bae1b10a14495acc4bdf6fa38dc67918bb84223a7792509338e670fa744d4a0523f5a8673b59cd724c13accad2
+EBUILD unittest-mixins-1.6.ebuild 645 BLAKE2B 00a2d40bde4b9f8fa3f7643cd9af1dd8d52b00770e798382c355319aa5909d6a7b1fd1e28803b330ffe4fb4c16f1c21f21d0dc017da8beef54fbeb36766c38ca SHA512 62e826e7fdd88f634a1872293776cbcc97a9a0b4f2a420946734ce7b1f64cc76ff576f28bc3886fae660ccdda250ba50381fc0795c0986a62ac06bffbdca013e
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index 5bd9912c7a00..0ebe18d0eefc 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index afda40c16c4b..b41363f331fe 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,3 @@
 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
-EBUILD urwid-2.1.0.ebuild 820 BLAKE2B 48073eac0b63673f33c55eeb2551badfc98889873bd8b12811c9ae76242900e4a4e89a2f0b55aedc786eb17dda846b8e46ea47ed6c1b685ffd2ab56367a6f93c SHA512 c56af9057dc7256305f81efd4e0fcd7c977a9d51d390394dbd6fd72e6e4d1e1f8a43cbbb3259ea2497aee1859e8df9f17ac963c203cbc553df4b69e84b80fa09
+EBUILD urwid-2.1.0.ebuild 995 BLAKE2B 7bff9a6384aa4b023435fe2b4f990e7cd5550fad6ee70b904f59352aaca405db45217c4c76def3c0f2d806bade01761e9bda77f1662abdaacb3fe0232e46c50b SHA512 164cb4a14f51d2a2de09f88071a95e6ee5203e04559ac882b16c72f3555b3e9be1d77bab9c2aed6c2956728cafd35887b922ed10e9e123e97c49061254dd8aea
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild
index 0239bc441784..abcbe910f5ec 100644
--- a/dev-python/urwid/urwid-2.1.0.ebuild
+++ b/dev-python/urwid/urwid-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -15,11 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
+IUSE="examples"
 
 distutils_enable_sphinx docs
 distutils_enable_tests setup.py
 
+src_prepare() {
+	# optional tests broken by modern tornado versions
+	sed -e 's:import tornado:&_broken:' \
+		-i urwid/tests/test_event_loops.py || die
+	distutils-r1_src_prepare
+}
+
 python_compile() {
 	if ! python_is_python3; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 4a0dde49fc75..cfc9d9fa74c1 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,4 +1,3 @@
-AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
 EBUILD vcrpy-4.0.2.ebuild 1385 BLAKE2B 8a68b9264d9992479b737b785c47ca2a88a0a5a12dcd451e4e219618db6e35bbe63311ca8bc06c442e96c31ef6d42c308a04c3e7e807219006040260afed13a8 SHA512 bcf086af212e9e1829c0fc031d813d97d6611abbf8535866c10ddd2fb01256a553b58f9c86e046cb3925f7ca1c319bf4be816022a65b0cfcb802bc1457494c4e
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch b/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
deleted file mode 100644
index a1f00aa77855..000000000000
--- a/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/unit/test_stubs.py b/tests/unit/test_stubs.py
-index 7eb0684..a4bc7a1 100644
---- a/tests/unit/test_stubs.py
-+++ b/tests/unit/test_stubs.py
-@@ -1,7 +1,7 @@
- from vcr.stubs import VCRHTTPSConnection
- from vcr.compat import mock
- from vcr.cassette import Cassette
--
-+import pytest
- 
- class TestVCRConnection(object):
- 
-@@ -11,6 +11,7 @@ class TestVCRConnection(object):
-         assert vcr_connection.real_connection.ssl_version == 'example_ssl_version'
- 
-     @mock.patch('vcr.cassette.Cassette.can_play_response_for', return_value=False)
-+    @pytest.mark.skip('requires network access')
-     def testing_connect(*args):
-         vcr_connection = VCRHTTPSConnection('www.google.com')
-         vcr_connection.cassette = Cassette('test', record_mode='all')
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index dd0b697935a7..d79094abfd7c 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -9,8 +9,8 @@ DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b482748
 DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
 DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
-EBUILD virtualenv-16.7.10.ebuild 1759 BLAKE2B 02e0850013b0f348d96d644ca18e2a767f5f42d24a1d3c6782721d89ffacd0953a47283971787395a941ab6f1e663c2fc445b3d25103309d0e03e54acc991cd6 SHA512 a0b598745a4a38934871e6b1af54b6bed04e04c4ea80afd41e5314dc6c716db20e8eef242a8508ece15a7f2f30f20c2554c398891b4167e45483457bf072ae31
+EBUILD virtualenv-16.7.10.ebuild 1764 BLAKE2B d3006a8462b7ecfd27c0ba82f239e95e39973103cfbdce218fe078ea53947352e1590b66a3e8704f764f173a55afbc44b71a207f86e906d241d3c12cd0e97fba SHA512 4bbe5a62aa6bc3613800ff01ec293043d8fe733043ca5fe55bfd02105855b5a53802ce8b0db0d289e002a3319dc323049ca282de70619cb82e1445ae6f807f16
 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 2572 BLAKE2B a958ef64efb2b6b6d6cc9dbe75be7ce22ec15df31c9bbbbb5ebe8720c9b68c9343dc027ceccc927904d115dfcb21888c06d8f7d0d1859ef12a0115b772e29228 SHA512 7d778731a60e7ddd464b8bdf9fba4e0928e97f6823381dbad7a1ef3b81a4eb06139a7fcfac77c6ae15153844e8e15b1e14b6d02a5acd42b9c8723d0d2274a7c5
+EBUILD virtualenv-20.0.21.ebuild 2584 BLAKE2B 33c18fd98b5c4bed447bf9f19356a7b76610944ecd8dd6bd517c9e633e3b01be9a123c601c12c43e0012f2261e42f666dfd6fbaecf0d0e37403f2e60cb1b21d9 SHA512 6b446821c72e68a964d17943483f42e49451df54b155beae8e8156ecdc7ce99e4307f18e52f8157f8a90bc2a71f3c26eded0ac400788106094ff1a33c7476b7e
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index e6c9099aef76..b26dbd53d0df 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
index e4dc397b7e22..bb82eb1ce8a8 100644
--- a/dev-python/virtualenv/virtualenv-20.0.21.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 139b7d22a966..027a3bcb1a7f 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,7 @@
 DIST waitress-1.3.1.tar.gz 167097 BLAKE2B fc1d0327720daf26c1c00eec6bc617613582325adf16eab9ba49c53029241c5975981cdf54340cc5b051cf8159f0c6e46029ad5c0477adf46b757c4487719130 SHA512 ccb871fc46bd560bff2ece706c826a3407750112cfb014378a06ee077f969814a5695d053665a4d975070944a9449efffd61daab11d03be3b06f1907a2ba0f5f
 DIST waitress-1.4.3.tar.gz 173767 BLAKE2B 4d64279c69403347c7048024b0c70f8192af5fd5ad32f873d66ddae53b011d1445fa2d8f6db0f98ab86bb92855c8882bca4903dbb3657bbe86e7cdbf6a9b67e6 SHA512 b4fd6d174fe63d83686708ffb83f61421e94cc6c6e9ebc7deeae93ea50a0c11ee523d4448e602ba03ade942912accb33d482c13a367d7dcba61ba6b4871bc3b4
+DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
 EBUILD waitress-1.3.1.ebuild 579 BLAKE2B d3b5bc9b454dae714b1dc0e602016a051c3b7f82ade431153fef929edabeb6abdcbac0ca87ca59452ad27d9d4c79099c3286d1d35db0a87e764b8c53f4cc4f14 SHA512 136f1fcd0acca762d447f5b33113f6adc33ac5ee64ab2fcaf13a8aabe0ada16ff5120414732f0fcfbbe31bcee6b95c6c69f58ac1dfad3a2cdc4c9f4aa0d9bbe2
 EBUILD waitress-1.4.3.ebuild 588 BLAKE2B e41b2263d51e7bf5cfc2c70a14a459926a827256faf62bbc364ed7ab6ce24393678ec8be8e05e0537e0ecb75f6db5e52c3bae329979b24e8b16f6c8319816ead SHA512 753ed289cd87d9cfac2f8fd2a3e60155b97c5428627c5bb9f15fa773bbcc984f7bd107941062fb22a6877226b2f775d8da41e253bee97a8460a5e2ddf9bd6863
+EBUILD waitress-1.4.4.ebuild 675 BLAKE2B bd805b7c524f6adfd12f42a0e0aa23a2dc81525aae8eb4db634651f45e967d25cc262234ed4c260b053e95b751fd7e654596e87c95bef0b815c4a7afac48a8c5 SHA512 3a1d942eef953301cd6f089ebc5642562f271c76bae6599bbd313f61593ce024a35faaac03d1e2d236ae9226c748f8bb32d216ec88203e949d8f06abd618aea7
 MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
new file mode 100644
index 000000000000..6ec338584415
--- /dev/null
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -0,0 +1,26 @@
+# 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,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
+	https://pypi.org/project/waitress/
+	https://github.com/Pylons/waitress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 3bc2dfb23eab..d103c540dc40 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,7 @@
+DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B f6fc6b9dd867a69139289fe6189f90fbc35897a63db1685da85960358141e5eed8391c1aba0cbb899b197056ae80141795090de7f73d821a1819b5c63361cc65 SHA512 3563a9686ce304350f33bbf4b16933cd0db5d6ab17676dfcc779b86cf9ddd06c42462ec40ad5c046cf4aa4b603aa477865de45daef05f9c6af3a441bcab16dbb
 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.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.2.ebuild b/dev-python/watchdog/watchdog-0.10.2.ebuild
new file mode 100644
index 000000000000..6420d472f83a
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.10.2.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 dbd39de501a3..c018e8d4a890 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,5 +1,7 @@
 DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ceedb3d05eeaf85f90c1157e21d00ee8cd0f715098bf65e5d699a40287ce08e235f2f1d22a73f6606f490a921d SHA512 b828450feb56b5c0e686f6922e777ab48d1336816a41ef4ef95f71c25a37ef492861634c16c788e1e4570d21bd4d45c990a18787860ba6043157c2781c78b65e
 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
 EBUILD wcwidth-0.1.8.ebuild 551 BLAKE2B 1d03df81db5ec03f284bb30d9e26722bdcbcc691c9d8af0ea705bc709dc11e7b17b8e72ae08669d0cf3537a9027feb656b62d297046caad28e3fa7a9f8956dbf SHA512 d1e11dfc2d0556a6823fb23c81e284b0bd1171a6ecb6b4d251965c507373c1df3974e79576652eda7b9dff5e108184aad64ebbae89c224cd4806fd623b319487
-EBUILD wcwidth-0.1.9.ebuild 562 BLAKE2B 8b0c1d9bb8cfd2d55b46af491a3768adb0fe1983f70d3cb419bc8e8f8f51c95e2212bba0f7e7986b3b24cbcb70dcccb0bd691174e98b05da46a14832b4169ec6 SHA512 977840e660008850826552c2313aaa7030d74d45b44d84ff63ca3181bb0d773a65274c664f7958f405ae81de38f03220861c17588d354c687ba0559c37b085fd
+EBUILD wcwidth-0.1.9.ebuild 558 BLAKE2B 4c865f5e1e810f41f3c2bb3fd144699c9f8436788cf633d674939ee5670474d289098662ab1d92bc9191d7f6ad3d4a0e84fdd9460d80e868953ad5c1a24fdb75 SHA512 ed6f3d1ad74d4f5e550d019be31d2e86b75b29a9ea710ae778728c0e6c5eb14a61856623a97439357ea175d7b6dc27f3d1fc385f402f3dfd8fd289e703eec512
+EBUILD wcwidth-0.2.2-r1.ebuild 920 BLAKE2B db6d3bf6acc5fb9c02b01816656ce095a10d0e77f15cbd6dba46d1c6265c5a6ba19d878439499d3ebb66a6451ddc4206694ea4d2ec5223a5f1b419eaa4c18a2f SHA512 f13a5e8a7e1b4f2da68bbb7eb5d55f58b1ebb73eca618b7926e324c712048df27414209c69673387b18e7fae58f90e847213305b20f71bb5d182257f2f394aa9
 MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/wcwidth-0.1.9.ebuild b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
index a39f60c13cfe..9107108501ba 100644
--- a/dev-python/wcwidth/wcwidth-0.1.9.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..42a66c084106
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,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
+
+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/wrapt/Manifest b/dev-python/wrapt/Manifest
index 96d23bef0c1c..fd1d0b6afeb3 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -2,5 +2,5 @@ AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944
 DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
 EBUILD wrapt-1.11.2-r1.ebuild 711 BLAKE2B a10d2574450e0b90382a0f5d518785492fe071dd93015ed1b760d6809bf221babee875b73218675be73d4e8bb32ba9513ec8b81a5573cf2760560db61596bed3 SHA512 4cabf49d48a79d852b920bfcd948cf5ad89dfbd1075f0eca224e893459fe28ed736499928b1fef83f3026002d23858c3373495196cb1b106144e2bbfa2ac961a
-EBUILD wrapt-1.12.1.ebuild 767 BLAKE2B 499e13e3dd48e2fbc4e98e75552e0d7f74863de4e89999cccbbeaa15247e53a95085827b77590fb1d42ad07d771b1214a7c4664a32a7cdf68bc47014667ab2c1 SHA512 b18e29f05fabb55dbf8f7812d0528af6d37a9f64b7b8970d6e794f07841c06071c31be0f52fca425b2cbacecc9e5981f73f64e68c680904d00f575bec77f25ae
+EBUILD wrapt-1.12.1.ebuild 773 BLAKE2B debb489dc37260573be7c5ddec7c03276ba9b5ff8f69e3ad4b816489e34b63753fb6ffc3e26b586ab88d38b33277262e150e08b0eb6fb1aba5f1f7622efdca7d SHA512 c29d7592cb02f39a0d38a1681f4c96e3cce41f74b51a5047c9272178073d987ec0aeb205f44c29e70aaf1dfb71f79b161a84d4223694661de0ff352695e0abad
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index 24fccc88aafa..477f6b207dc3 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 6bc94f6f2778..654ce41f6b90 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -9,5 +9,5 @@ DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e0
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 EBUILD wxpython-3.0.2.0.ebuild 4581 BLAKE2B 02226950f5f18aad9261b59c0310c88427cd91362d97c30e8226551ce038a42ce054092418a26a64f878cc3317a524d8ecf67135597fb0db1ca4ae00f6251aaa SHA512 c1edff5306233fd830b847a3c7475c5e7822b501ff117022ec572a02d1cbfcfc003e717705d3d5fd0cbdcea783e2471d47e98296b9d83a52eb9c83dd9b94231a
-EBUILD wxpython-4.0.7.ebuild 2267 BLAKE2B e450f866f7f000d56599fe61ded194159a5cf96e1dd496c6209f9938c8310e38dc016d42295ee55d04a108e3657c5ad8943e1d5d0a44c9409b3bb299f0ff7bd4 SHA512 6a60acc465c823c5e3b2755d7103372aa64191bdb6526e0d062ecd6b17455897e5a297b7e52ec46bf01ae769148f627cb62f52f9eb7e04b3134a4f20fd017626
+EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B 9f4492107d916e72b360a8408c703f12a8ae3e9e11041a9fe8541acc0f6a179be6cc4053452861cce50b71f710960c5c801e38968802750da369be3048a03251 SHA512 e354675d9312c41279bcb710f892eefaa120cfbb3f1c87a6f484e9b202658fcce8e9e8be3e75c0f7a2a31d7c1605b43107104117929815b45502357b0716b306
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 6d49fa8e3eba..32ae9484d2bb 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index b77882c20afd..e3163d07124e 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -2,5 +2,5 @@ AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd28
 DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
 DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
 EBUILD yappi-1.0.ebuild 547 BLAKE2B 7fa3320e99330cc4ff7066bae77435359576e14a428fedc22915904fcb14c82e72a445223456c8502c46fa140b9f32f51d8869d1128c94886b543f4993913cc0 SHA512 6c12e42115de68d28c74c09901983f59196cdd3b8267dbac446ea186d995630806bb37d38115d84df6325ef6d567858798b119d5dc038e17af965829f90465af
-EBUILD yappi-1.2.5.ebuild 941 BLAKE2B 67201bddbfa460cc18d7d3866672d3096cf0a25d2451ae0e01e7c507ea1b72394a514db1a8c6f715587f938965c7a4316929c7e7fe68b86457ba75b48928e390 SHA512 45f93d3753a741ba1691115992ef8e66f79e53921a84c2b3c2af57a3c11e691d12da8a22f5bc1303a00c4d30c66a3acaf51179fba6e0e5026999439dd541e4d8
+EBUILD yappi-1.2.5.ebuild 939 BLAKE2B 08cfb28fdb2b666e030a43cea0f72b10006cf2064ab54e71e037abe6abf9e5008fe32d1d45e5dd753bebaaff494257eaedabf2797fa6dad6e2c4550b80f5858f SHA512 78104f197454e42d7587a51d8f18b0d5621a2b520bc6c32a4dbacd98ea0aa5494c1480fc26d75e572abd4c59706ee8171a83bed1707a401e1394f718bfd9d63e
 MISC metadata.xml 488 BLAKE2B 2ac7151d74622eb9e76ce39ef336aa6c729b4249e781747916936fc88e0aac76d54626b8383c58cdb6661ef080b3ee37c8bab7eb00a4befac7b0523f5552afc2 SHA512 a85e098364030d565901db988e7848181b51db19d17eef2a97ab40ab4e318ccf03e2a72201ebe28ca56965c2327ebdf9e01f5230be9a46d4d273a08cb8473af3
diff --git a/dev-python/yappi/yappi-1.2.5.ebuild b/dev-python/yappi/yappi-1.2.5.ebuild
index 73dc4bffcff5..390429d7df2d 100644
--- a/dev-python/yappi/yappi-1.2.5.ebuild
+++ b/dev-python/yappi/yappi-1.2.5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/contextvars[${PYTHON_USEDEP}]
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index 4fd0174e3938..445d4fa0421e 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,4 +1,3 @@
-AUX yapsy-1.11.223-python36-tests.patch 919 BLAKE2B 51e27515c9e4a129a11aca1e9f37859e0e74386c499fd093e304a27e72d104733a66e643de5303e6ac18df6ad16b2de840025d255f062aa360e3ff18f94dae66 SHA512 aa345024f6afde87f9e3a64da87778f1bd620cd8490d1c564cf74f3a5821eb034d94cf5b464bf567725972122ba78a981cb2d120b3e0f35541a01ecd4f97170a
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
 EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B 3b85f97ecb5f30d09a0eb139492247aadc6cbab2c3f7eb4669728c1a88132cddee64ee403d8acc9e24f8386a7d85c742d548d45a6b50401391756460d4af7bbf SHA512 11effd4478830ccaa5b569ed2cc4dac5c4d54199f0b781fb467c4b3e6a794cbfcc0bf048e317a7f88c7b03f19b2b87e68498d32c59d145630affbd0c450c0ce7
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/files/yapsy-1.11.223-python36-tests.patch b/dev-python/yapsy/files/yapsy-1.11.223-python36-tests.patch
deleted file mode 100644
index 55b6b00873ba..000000000000
--- a/dev-python/yapsy/files/yapsy-1.11.223-python36-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b79ab28e430995cd64923bb93474b214bc38529b Mon Sep 17 00:00:00 2001
-From: Thibauld Nion <thibauld@tibonihoo.net>
-Date: Sun, 29 Jan 2017 18:31:06 +0100
-Subject: [PATCH] fix error on python 3.6
-
----
- test/test_ErrorInPlugin.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_ErrorInPlugin.py b/test/test_ErrorInPlugin.py
-index 171ce5d..9f22dcf 100644
---- a/test/test_ErrorInPlugin.py
-+++ b/test/test_ErrorInPlugin.py
-@@ -50,7 +50,7 @@ def errorMock(*args,**kwargs):
- 		self.assertEqual(len(callback_infos),1)
- 		self.assertTrue(isinstance(callback_infos[0].error,tuple))
- 		self.assertEqual(loadedPlugins[0],callback_infos[0])
--		self.assertEqual(callback_infos[0].error[0],ImportError)
-+		self.assertTrue(issubclass(callback_infos[0].error[0],ImportError))
- 		# check that the getCategories works
- 		self.assertEqual(len(spm.getCategories()),1)
- 		sole_category = spm.getCategories()[0]
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 4b31aa927893..3d8dbb83727f 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -3,5 +3,5 @@ AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 EBUILD yarl-1.3.0.ebuild 830 BLAKE2B cc31ea0ccab8787c7b0a4fc50c4c4859b70d4bbd2264ecd5fbb65d944b5be7f4a3d77416643b447d4d85da79225dace6af20d9244cedd0c913f43b06cdadab65 SHA512 81237147ffab8d8497bb5305a766d656725c9b0f2d168e6f42c5b713f8a3feb3080d61c91ff0e33da531c081fe4837900e3876e11c8490efb33a183d123b8663
-EBUILD yarl-1.4.2.ebuild 721 BLAKE2B 4a5f1748ce4110241f86e36a8c5132d6ae0035c1c005cc02207217a60f5f46153cd181adaea7bd32524815b89bbae096a7b7ac50125d38435689474134673ae9 SHA512 098421a7cc1b4ab0847ce890547b2d6f6ba83dc0cc2e267ef776bca2490b164eea1c3f4c9a1375806125d71d5d77e1fbad43a9f104850560a40fab5a40b550a6
+EBUILD yarl-1.4.2.ebuild 727 BLAKE2B b9256d903e30bc0de5f1c0bf193de0298308c7dc90c15dcadbdfe9292b69053e7cea9ab50ddc48fab9cbb3854008a08ac6a0e775b042aba5fb273131b2c77b80 SHA512 4a3e36be601f4deed9780d1afe451229c58cf35060152efeaec24a1ba9968845b8f2fc1fdcb262471c3fd21ddae1518f49341e28a2b47b5832c3f7330c26e00b
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index 7dccb02f6f4f..33d927f6403b 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 65bd583fbf0d..1bfdd2092cb3 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 5e8d84320a70..3612775582dd 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -3,7 +3,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 1339 BLAKE2B 1846924c0bfd47950c27d2f16cfb55d4b18dc20b7559eff9e4094d182ae8d78254b414e1c6ebe205e87dbff1c0121d326c57c74391d3d281fde3a7241e36173e SHA512 97a34992086cfbd8713c1eaf821dae7bf2e69849d5aca40e1fb11d9fdc7a923bddbfd1e0cf2ba41c0ef37ab0321b1c50c1f8e96caa98c94d3649646af05eb25f
-EBUILD qtdeclarative-5.14.2.ebuild 1188 BLAKE2B 8ac2d33ed385990e892dfaf8198d75875a77dee5ec493a41b02dd87a4fdf9fb347c50b635dbeb698e978d0283abbf07a0eb1071f4e05b7da44d5468f9f3eca50 SHA512 20f724f73cc3b57fc51cb228fa86170569d3df3eac0dba11e6b857d15d3e04a4ba8e52d96cc53c94e7d660bcb9f0c40cc95408ee27fa7cc300e195bebf759c75
+EBUILD qtdeclarative-5.14.2-r2.ebuild 1338 BLAKE2B 1cfe2dc4bb2dc7c9466c0cc2c69d272b3d4fd30be3035ab2999b9fd65f9453d855bab3a3bc79edb3d99038f30c380b1b26dbc7c8232c3f85f8c9142e73bee960 SHA512 f46b45e34b7ab08daa2466b6f5699055539a7901901082afb20d539fe8dedecc8978178f878f0e958612f27da759e448345ceb9e6174b71b6b23f437e6b103da
 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
index 0060347014c4..24d7551a2fd7 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.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/qtdeclarative/qtdeclarative-5.14.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
deleted file mode 100644
index 9a43f954fada..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
+++ /dev/null
@@ -1,53 +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
-"
-
-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-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9d88f1ce298e..2210a0abddb3 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 3cd25ca0bfcc..7c42f484eb97 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,3 +1,5 @@
 DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
+DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
 EBUILD coderay-1.1.2.ebuild 1359 BLAKE2B f3a61690a53eb8a154173e73f1b3e75e417b56284f9a52e7308934d8bcbb44826378f2a736c9c8204a1ebdc7db86dacbc6d7ea1cc6fa7bb9d52de187a6b18076 SHA512 94df2b72f6f343630d3cf10176a0f30395f77cb8d2b124b0abc6b96c9b64daef5b0b9ec91cc21ba4857fa2e4388aa1ba12091855f80e24a5def6cbe66878c45b
+EBUILD coderay-1.1.3.ebuild 1407 BLAKE2B 4761038b59909c2bca4f8e7502aeb0557f524ce302d59c5a343d7867ab2f1264f210fc0901a23868019b0a794d45527e83ded9456c60ba844e6da04da84f886a SHA512 63c44c2e79b20ad15d279e8b9497eeba8704bf94018449a118aad597a045aaa1fc832de1cbe4f0b23a544d099ae92452566844374dee775888d8e56596b58e6a
 MISC metadata.xml 342 BLAKE2B b907829065b996e9bf467150216ce92b7fa4bedef8dbe9b9d79a1ba6831c706c312ce0d1cbb418df6c5b43dad59509c132187637025d4c49e9b29e21fa68a107 SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f
diff --git a/dev-ruby/coderay/coderay-1.1.3.ebuild b/dev-ruby/coderay/coderay-1.1.3.ebuild
new file mode 100644
index 000000000000..8f6f8414aeb7
--- /dev/null
+++ b/dev-ruby/coderay/coderay-1.1.3.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 ruby27"
+
+# The test target also contains test:exe but that requires
+# shoulda-context which we do not have packaged yet.
+RUBY_FAKEGEM_TASK_TEST="test:functional test:units"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS README_INDEX.rdoc README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="coderay.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library for syntax highlighting"
+HOMEPAGE="http://coderay.rubychan.de/"
+SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+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=""
+
+# Redcloth is an optional but automagically tested dependency. This
+# requires redcloth-4.2.2. We don't depend on this version to make
+# bootstrapping rspec with new versions easier, since redcloth depends
+# on rake-compiler.
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/git ls-files/ s:^:#:' coderay.gemspec || die
+
+	# Fix failing tests for lazy evaluation in ruby26
+	sed -i -e 's/\.filter$/.filter.to_a/' test/unit/filter.rb || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index 248ab8f30055..578a61f31347 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,3 +1,5 @@
 DIST connection_pool-2.2.2.gem 13824 BLAKE2B 2f52bb3451dec5916d5797596f7bc3dbf39845321ee83736d679c433e96f154db852469b1f6d0d3b7c7f48262f7840087d89cdd40ece22b67a29c20ff77274dd SHA512 74cb64aa3f183ee4e41f438133f60581e9f99a1d5b5daf61607cff2329bfb1fbd8810d87c35d709418a22ad925049e3e9403a602107452414a67aee1c6eecfe9
+DIST connection_pool-2.2.3.gem 13824 BLAKE2B b74666181790e678793023413eedbd5b68836e6d480d79f6c12d512277a1917db0d400e08be98c098305ca065a12988bcac9d46f89b4c1380d758991490a540b SHA512 a5e54b11073723d5cf5150a47c38b37ef8e58e9adb056eeedc4427207ed1ae5d1844cab925bbbcc8a2a9dd3fe9373593ab735ce4de588b89db97800fb74757ac
 EBUILD connection_pool-2.2.2.ebuild 731 BLAKE2B 37ca896432e4aba932c2ee253636932b0dbf14d7bba7ba1646cb8778469e15254628b31e361d4f4fccd23c564e67fe22fdd5d4fbb1bd15b7de4be907eb8133dd SHA512 a9ad336e9ec89a980b630e499a58a0cf2ca318369c5b52b698202521cbcb09ac0cab2fd06e23ea78169d735a9c07a25e4cf062b268768f4d0acddecac59a61b7
+EBUILD connection_pool-2.2.3.ebuild 753 BLAKE2B 97d6521caf8a157ef90ab6c5b2253d734e9ca681c4ab6b0e45d20f9e41143ab8a3f5ebdf1da304e6261167f8b2cc24eff8cffe8b69d564d504cad546c769e026 SHA512 11606e8a00ede33872b5c8e8c22481e3e8dc93ff511e0ec749ec27ce1864818db7c0d99533a8527e672c95e167832d182bdcfbdc50934670142732f64d416d00
 MISC metadata.xml 349 BLAKE2B 7ffc13174f2f47522a66c48922952798d03fbbb15419d9a52e183c633b56d863e85fab4682420aa9fffeb16d474f52de30799489a99221f25438524dbc569303 SHA512 18245f101f862c5880a42121eac9947a22fac206823d85ba650f5766af334208a64f97e7ea44e298f4f3c1191eb6bbf0e37949974c737060dd66434e1963b41c
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.3.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.3.ebuild
new file mode 100644
index 000000000000..194ac6f8667a
--- /dev/null
+++ b/dev-ruby/connection_pool/connection_pool-2.2.3.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="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic connection pooling for Ruby"
+HOMEPAGE="https://github.com/mperham/connection_pool"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
+	sed -i -e '/\(bundler\|standard\)/ s:^:#:' Rakefile || die
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 1f77f4f7264e..fb48e84e8fcb 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,7 +1,9 @@
 DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f3aa699279a07cac0ecdee533f54ee1ab36f7ee2a5cc43d0ebb386b8b3285102d98ffd18fa297e2e1b882283 SHA512 86a6a95aa5d4f005eb457fbe26b38e7b8618899db3de3459f3a01128aa7c488a47e50d13aef05ae83519178c80f2f7ed0a0280147d7e30aace13bbab82871f30
 DIST ffi-git-1.12.1.tgz 158108 BLAKE2B e5685e94ef0c1a1f5a5443fac4d9934fc3613219f27d08c635bf346d1312f765d9bc9bb987e736fb373f715d84489e410e2e13280acc501607b1274a6a4a63be SHA512 172540f5827ed87afd56d0da08705d714ab7e4ad1297f9de774cb8792fb8fbb90f9e697e280f13c25c5c14dc73b8ba8150fe3dfd5f31e3c70c195357709ce13a
 DIST ffi-git-1.12.2.tgz 158344 BLAKE2B 903825d7a6d77e26be47ec7e7991253e1ba58b0f0049fd812f8c26dee6eb31c17388dd5f23270e84cf53c02ab3a73c79ecca870814e14993496d1ca0e99a5390 SHA512 2590ff3fd704334fe00de10ec5e08184c350feac36418e08680def0b4742c488f8168fa82759317e93cc3d7969af366254aeb157c84d07565e1804ba1678d119
+DIST ffi-git-1.13.0.tgz 161537 BLAKE2B 2d113bb31fbd65fdaa397d2477ba8bb66a76c7a01e2753c33b04b81a5175a25acd3495d41e38995ed8161daff25094e0a45ae4b5d6666c7508840c21e5ba5c45 SHA512 6e90d79b1e60b237c20aa3e863f97797a310d651a52df67957b6a8e1e577b0d800f4e0b6b3ec6da77776214ae6a0b855ac23f6f5b3f9439b549a043a3789627a
 EBUILD ffi-1.11.3.ebuild 1525 BLAKE2B 1216806b2cbdb7ac20f86f40bf4263710ca776ee0935d02ba7040b475c7f8305a90ba66fbcac081a6df9c158b5d79ec8794c4d0ca62555cb875daa82ba55e693 SHA512 15ec176c0e3424740d1838b99a4e302a3cdf4f912ec2816dae232bdc044376af50ddae2fa5f29a0883271731156b23b6f225f9f11a5ac7309c8596bfb3008c3d
 EBUILD ffi-1.12.1.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
 EBUILD ffi-1.12.2.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
+EBUILD ffi-1.13.0.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.13.0.ebuild b/dev-ruby/ffi/ffi-1.13.0.ebuild
new file mode 100644
index 000000000000..54f91d863ceb
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.13.0.ebuild
@@ -0,0 +1,63 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+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"
+
+RDEPEND+=" dev-libs/libffi:0="
+DEPEND+=" dev-libs/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index ea18a58ef6ca..80e8fd367ac0 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,7 +1,7 @@
 DIST flog-4.6.2.gem 26112 BLAKE2B ab15547c2bfa4b79e158a852ba76b6e69346397da6faaeb1b6ac558f3b380ea240de2e469ba90d23bfad93d11e62f3b119fc6613e0cec8a1d26964c25cdee2bb SHA512 d2bc8af809c5e7471daf455c53c9ee9cee39b4a058501e2d3a20e1412888e11fb786b6c5e19a93172bece80c1d03d21a608bff32e840f5c51e95b1ef40a88c01
 DIST flog-4.6.3.gem 26624 BLAKE2B 9ace4c2153a2320a18f9ca0a00cd312f772d7a3c35e46e96d2a3c21725c74c67adeb57d319a36941a26968be3e7904a5c319f91ba7a66b3e195d05de1fa9fa83 SHA512 fcb7f97b2aefd335a936a5bb72d733adb0cc51c46e011396f8e2d2fc695ee17719e97a9056600e20a0b22374f49ae2dbac13fa325b9072d8e41cbe36f109893e
 DIST flog-4.6.4.gem 26624 BLAKE2B 27090f9a47619b63c8c34e0d6992c1d0ff29193a7de3af839d72d5754c2b149f38c1c1e3caec981170c408123bc38e3fc3e38e87fb9a83818e1cb356d31070c3 SHA512 495601bfc560c2d18973234c41706aa07b76ea95bc3803f93fb16b42ae071b65fc9a1c36e8d4a9bfaf3c88a1167ab714f4bbc7a982b9e606aa799f8480a23f4d
-EBUILD flog-4.6.2.ebuild 644 BLAKE2B 475e9b27f24895b2d8c3104da994b96f63296cd3eeb909fb4675a92ff368bc222e6ce241d7af8d70715cd201c83469d8c4869db6f17f30abbb0993be52e0e280 SHA512 85369862bfd81a5b6940e43f383c37cfea28b356dc8df51c1c0f5df3de04325822e9c6811860201c27a4952501210cc153a16fa1ea684d34b503cfc139424df7
-EBUILD flog-4.6.3.ebuild 606 BLAKE2B acb1d6f9aaa86b1d69dd58e7d6a7a4190dc4f185930b708f639cdf6b900933f14242b757bbe0c98d29dbf27a6c370cd4db0dd3e97aa4ff81962bb69ece9f1f5f SHA512 fe9849586c984caa88b40941693f9e204f6e1916f24c9f64eb8b55603092d01977977e733dada94c996a5d746f6c8c935ccd70f155ba34fd9bb2572950f1815d
-EBUILD flog-4.6.4.ebuild 606 BLAKE2B acb1d6f9aaa86b1d69dd58e7d6a7a4190dc4f185930b708f639cdf6b900933f14242b757bbe0c98d29dbf27a6c370cd4db0dd3e97aa4ff81962bb69ece9f1f5f SHA512 fe9849586c984caa88b40941693f9e204f6e1916f24c9f64eb8b55603092d01977977e733dada94c996a5d746f6c8c935ccd70f155ba34fd9bb2572950f1815d
+EBUILD flog-4.6.2.ebuild 645 BLAKE2B 67e53ca9b4d35d0717e1b1e05097bf7dcccedfee4256e73bc2bf6c9bf200afce62356117aebf334fe4d75d91e3101179ac9dffc0545169d2c2e51e537c54c4da SHA512 0d72e9fbd4327e86fe09e87dcaa48e6e4ad54598b9b98b2a28349abfd097907be69bfcb9b20940acc473e75848b275978c5452836437165e94cfadfe48f95ec6
+EBUILD flog-4.6.3.ebuild 607 BLAKE2B f8e542dfc3cba0b807af3c6a67e3b1a8967d05720dba93d7611cef9aace379b890b39472f20cff0580cb21247dd8ce6a316a19395525a254b1a80ca62c8526ea SHA512 f92558e548665a69b4e578fd328e75612df4873f79e1379f03bd2610388898d10b7227edfda2d132a99e9b9177d1e06a8931b4651aa040ec2e1b7da15b2c98bc
+EBUILD flog-4.6.4.ebuild 607 BLAKE2B f8e542dfc3cba0b807af3c6a67e3b1a8967d05720dba93d7611cef9aace379b890b39472f20cff0580cb21247dd8ce6a316a19395525a254b1a80ca62c8526ea SHA512 f92558e548665a69b4e578fd328e75612df4873f79e1379f03bd2610388898d10b7227edfda2d132a99e9b9177d1e06a8931b4651aa040ec2e1b7da15b2c98bc
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/flog/flog-4.6.2.ebuild b/dev-ruby/flog/flog-4.6.2.ebuild
index bdd94967f56b..f62ae2fe9e27 100644
--- a/dev-ruby/flog/flog-4.6.2.ebuild
+++ b/dev-ruby/flog/flog-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="http://ruby.sadi.st/"
+HOMEPAGE="https://ruby.sadi.st/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/flog/flog-4.6.3.ebuild b/dev-ruby/flog/flog-4.6.3.ebuild
index f0a79db86623..75c17d704f75 100644
--- a/dev-ruby/flog/flog-4.6.3.ebuild
+++ b/dev-ruby/flog/flog-4.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=7
@@ -9,7 +9,7 @@ RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="http://ruby.sadi.st/"
+HOMEPAGE="https://ruby.sadi.st/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/flog/flog-4.6.4.ebuild b/dev-ruby/flog/flog-4.6.4.ebuild
index f0a79db86623..75c17d704f75 100644
--- a/dev-ruby/flog/flog-4.6.4.ebuild
+++ b/dev-ruby/flog/flog-4.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="http://ruby.sadi.st/"
+HOMEPAGE="https://ruby.sadi.st/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 5365b4017650..3be0af2796ed 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,7 +1,9 @@
 DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
 DIST net-http-persistent-3.0.1.gem 26112 BLAKE2B 987e7c690d1e08e6be490aaecbd42ec8dc95fe5d2dc3609313b5be301453e4a30a66486334419e2ce9af9bd08158c3b78600cd8364fc6f489529ca1657436ee3 SHA512 33f23c6d23a8d2e44c0268e720200e4e19ba50bbfb9268a3c7af653fbfff62e606f1d10b2ff35ea345f4f7c0456892a901753257da87e9a2bb329edd36030761
 DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
+DIST net-http-persistent-4.0.0.gem 30720 BLAKE2B 5955cd60c86ae74c1f9d3415bf0257542718fc83d2b82cbc6ce31b5013edd1c0c3202757ccaf23a33c70d90fcb04e6bdfd2cdddfb82a45733ae3d15a5c526301 SHA512 eccc6cacfdd1dfb99bd0dcb7fe1c13cb1c21eae0104357156888bd0a5b2ee0b0d8ed5687860670c2dc54ccc1cfc7a090592bee160458427f44c255c1b99938d2
 EBUILD net-http-persistent-3.0.0.ebuild 885 BLAKE2B 44e3fe84a567f1dbdbe72738316ca31f31f4cdf64a48cff8e16c745549f145cd92b1c9ea6bac1b80181c7b8ef266c59a9ab1701b8d2a5e7c7b7838c2ee50bb3f SHA512 62bbe74815653f897ceb91d99cc98c2e7c43367e849ecee37fee1869f7c8c115e85f11eb2c69f285a1c836d7ce71a217d283ff52cf1cce9feeed0730fbd9080a
 EBUILD net-http-persistent-3.0.1.ebuild 880 BLAKE2B d3ebe97c28eca4cb16c79c3a42bc5d9cf7fee838e9bbad243994ae03adf203e998b364cac5069f43ed1025dcc1cc2dd39696a9aeb7306746ffc27b06e172b02d SHA512 ca517a24b02f22a3d3125593c817bbf117eba85358b8ec55fe8f8599e231426a9f8778ab6b46b7515b9c6e68bd9d87bbdfb0e6de3d2381ad7fd2fdaec1c5f111
 EBUILD net-http-persistent-3.1.0.ebuild 880 BLAKE2B d3ebe97c28eca4cb16c79c3a42bc5d9cf7fee838e9bbad243994ae03adf203e998b364cac5069f43ed1025dcc1cc2dd39696a9aeb7306746ffc27b06e172b02d SHA512 ca517a24b02f22a3d3125593c817bbf117eba85358b8ec55fe8f8599e231426a9f8778ab6b46b7515b9c6e68bd9d87bbdfb0e6de3d2381ad7fd2fdaec1c5f111
+EBUILD net-http-persistent-4.0.0.ebuild 866 BLAKE2B d899e435510b67424d3274efe3bf1a0dd197c4f7e6293478f975169822e37fb5bd0014bd9b6de966c9f98ad75956e0e3fc45d6e46c1d717aeede014c0d43ab43 SHA512 4f84d15aa9af0f9aea9de299738024f5f06f8d9cf35a863232f4cc2e9355790f2e2cc1d553c1d42febc3ea61f4d51f64ac2900ae40888c089d734a578e0a68d6
 MISC metadata.xml 353 BLAKE2B 9c2503aa880a368eb25787d0020bba032b96ad047823434e630864c5569985cddc59fb8cfe458ce2ec7a278759f98c677d0413c70d65f20bf2b11df7c1114c0b SHA512 acff0618bb97cf903d61bf4149537876ba57037cf93c033f7a7c2165682d52216229f5d52166e648e313c7066c25bf3cd70925b5791ac8f77f4c43180555d420
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
new file mode 100644
index 000000000000..6aaaac32ee1a
--- /dev/null
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
+HOMEPAGE="https://github.com/drbrain/net-http-persistent"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/hoe dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# avoid test with implicit dependency on net-http-pipeline which
+	# fails and is not tested upstream
+	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index dc5d1bf437c9..d8fa8372f19b 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,3 @@
 DIST puppetdb-termini_6.10.0-1stretch_all.deb 21294 BLAKE2B dfe88c6a44eed3e8a0826fde8f6130d3d817acafa367415956587e44298c99c41fd7bdac709c1ab55dcc9dce165d2599a2f18f0e1fd058d717128c0dd3a6ae28 SHA512 da7bf41e43acc39a44655e4759a14c119e6c1665c01a8b0ad4d83767c65068e071fc8ff6af80810a20cf92508c55c9ccfa295e197c0f7c94ee70110ea4515aae
-DIST puppetdb-termini_6.9.1-1stretch_all.deb 21294 BLAKE2B 579181f4404e5b9dfbc444364c58402135ea68bef0fd3bff894976ee04f7d181699d2456d5ee6105707b765ee1842fac38af7e97f07621436164d79ff8c32a35 SHA512 62d3ac5b922eb3b3ba50f47a104dfb04ca8f3284b2474ed45cf609b21696fa01fa2eaecaa1c94d7b50ac22e8b187b4efc8e43d3cb7d66bf02554b1c03996b040
-EBUILD puppetdb-termini-6.10.0.ebuild 665 BLAKE2B 611933cbf3ad90f8e6f11c4b3460d9946519c30ff57b0132d0de9cfab7d243365ab4a3deb10643df19b79cb2bbef878347614e3798544f2494e75f786d8e934b SHA512 613eee0dfa30b09fe2659dd2775d8f1c0f334d5304d153d7965342c0dc610f1402b6e34b60078078d852d031e2b67cc8ef59d952c266caf10bda6dfa5eaa2603
-EBUILD puppetdb-termini-6.9.1.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
+EBUILD puppetdb-termini-6.10.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
index a7f2b53b2dde..7919b7b236e7 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.9.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.9.1.ebuild
deleted file mode 100644
index 7919b7b236e7..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.9.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="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
-	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index ba0e1ee20bad..af9f061c090f 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,3 +1,3 @@
 DIST sprockets-rails-3.2.1.tar.gz 108682 BLAKE2B 842ce4560c7537f12c3aa2c068da89d99b410c4ad27f44b69abeead90518a4d9bad92fe6a70406c2f52d1124857419e845e3a1468cddcdce8a534c5f1210c3a8 SHA512 2c108370dfbf945e912505e854cdaf799f08d4374aac57a33bfc298d6e9bbf136877978458f7a8f48e5d120f578d3c7a88d91c058c12f520dd10b8271f82c49b
-EBUILD sprockets-rails-3.2.1.ebuild 958 BLAKE2B 4ea2f0cd337e96dd4cbc1e0c2b32acba419603cd2ad8829891d10cdaa39b9f3b53eef80c6d50a280d20e38c1471d4b016e536506efca2e340f643046a8ed2587 SHA512 97ea60bda3a0f308ede8ca125b127cd27176112715b4558e72ae5e6404d1de37bdb73c20e61799826ffb1a8aefc3cd3b8d906694af287db2248d32f32a1023aa
+EBUILD sprockets-rails-3.2.1.ebuild 1005 BLAKE2B 0eacd0cdc317b93ed582ce7cb3365ff0dbb78c36184b3b2b78cb837e299d26c5c9563e1370c119553dc15ffba80b87a61b952eae97ef5b3067f20beca8dc81ed SHA512 05feac0068e6b4d2c9dd4ace8f0bfabe8ecae9721fc597cbb2aa6a060ca2dad93a2b9facc318fa520f4e4541106c400fa90d3a092e7c29a58c8bedcef376120e
 MISC metadata.xml 347 BLAKE2B 762b3943d802321b3eba7cb5bc4f47093dce9890fa79d7c8ec25aea5c352dfc4509718465d6791d7c194975b3a4c4653ed0d9be06e69b0cdef5aac1713d44412 SHA512 3eb588d32f48bb0f9e497c1d219314b2edfa33b48f245e35816fb34c46f0796b437d2064fed4c32315ee93fa6ed904be0a46fd136e820a3965a4240bd9db3c81
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
index 872fece3262a..9f10fcd57896 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-3.2.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
@@ -33,6 +33,8 @@ ruby_add_bdepend "
 	)"
 
 all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
 	# Help load correct rack version consistently
 	sed -i -e "3irequire 'action_controller'" test/test_helper.rb || die
 }
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index 375ad8117fa4..f961dcadc025 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,5 +1,5 @@
 DIST uglifier-4.1.20.tar.gz 200470 BLAKE2B 64cd5a7dffc0becd66003658db3a0870de6c379755bc3025334c5374061240de1493d877c9c638f7be0438fdef4f58813fe89c77413c4e0a8d489e35b431259e SHA512 9846612e00568b359672f6bce78302839b8b1f9d2bf607338bd299ed7c3c3e948a223903077eea419aed3f0bf47df8024531ddd7ca645df90203ba2d50d99992
 DIST uglifier-4.2.0.tar.gz 201913 BLAKE2B 90390308f116dc82fbf889b603b1ecd118adf9a6f541def408fe3229db02d78f3f7ba790822cc5524870317131260ad7f8c7191a69a9e158a43d9c3822fcc95f SHA512 869194db8fffdb7d243fc5639e0286d73dfa3ca9485efda760a9eb00424e6797f0bf7aa9f6c8f410daac556e01b6a1a1701300bc373eb492ea21d864494f8246
 EBUILD uglifier-4.1.20.ebuild 809 BLAKE2B 108c6811506bea95e2aa1bb86cd6eb230f24c890817d8ac08fb9540d05f887371db522236b248d89db97d9d2b04fee1642e26c7e1e25f0b4fcfe141bfc7406db SHA512 a325c8325b5bccb1d6c8af9c6531454c0ba2648bfe88293e0156b6fd08d83c2b0f2d3a9c1beafbcb3e813df449ca1b2b2977be16a897f4f67b1833d8f7c42072
-EBUILD uglifier-4.2.0.ebuild 770 BLAKE2B 1013bae1b5281590e8ded2f4f3911accc3ed47228d51827195ea238f62dde6eb36fd17de6e839e1cf025bcb0f7810dc4f260cc52a3844ac7b828db47c8048794 SHA512 f6337ad403e109ae51d78a9fd78da2e2d4d9d81cd7f995abfa2dd38e3e7fda35efb8804b17a3116527771c5643361525d6723323a6f711b9c21c338afaad864d
+EBUILD uglifier-4.2.0.ebuild 777 BLAKE2B 539f833503cdab1c3aae9b8d03ec7a53435c6ffd4bd2e8388c3aaff7f652ff6b1b681c67eb4cff805d1e9b93aa32ebb511770a6357929a8848bce7b6e9b1f34e SHA512 8d6027e97239ed6be00887208494bb6bfab1fe23ca36d8bca919d4c74ae9d7008564329b1b3d9b4544d437bc1b15593e1fb48d4f1ee1e0335abb68fa56a2e49f
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.2.0.ebuild b/dev-ruby/uglifier/uglifier-4.2.0.ebuild
index 0d8a2324de6c..9535966db86d 100644
--- a/dev-ruby/uglifier/uglifier-4.2.0.ebuild
+++ b/dev-ruby/uglifier/uglifier-4.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/websocket-extensions/Manifest b/dev-ruby/websocket-extensions/Manifest
index d41eee5e935e..7f98ae324837 100644
--- a/dev-ruby/websocket-extensions/Manifest
+++ b/dev-ruby/websocket-extensions/Manifest
@@ -1,5 +1,5 @@
-DIST websocket-extensions-0.1.3.tar.gz 9897 BLAKE2B 279045331c8901b643a41fe1a3c053ff9137b613b9e1bcd2fed5ec16afecc971aa8575515186e5b1236779680e2809fbdd2ffa8f4ee76ff0f191caa8f960fe6f SHA512 6cff75cbf2465a20061ad05d08ef15913b294c92bf91bb8a6c62dc0d7f4459a42979e15c1db6a1f38a5d3a10af8dc9b9f579b3e6e713ebfb3b1a718afa6f83e7
 DIST websocket-extensions-0.1.4.tar.gz 9666 BLAKE2B 21446168b3f7c4a52fe25ddffcaeb31bd1e8f2d8c459b19871cf15f03934b6e25793aa15baad639ec07a4eba399b16343b23889d05d417b83e097846e15e9d8c SHA512 928b3cdf66a6cb16a0a735ea8335b861af9dd8c4b6962a2a9132dd538d452c81dd683a7648e194bc81db4cd8b52f52203145c5c90475e00157315e46a09a53fa
-EBUILD websocket-extensions-0.1.3.ebuild 609 BLAKE2B e7a9ee7a666081a6517ef09342bee763d12737ea5215cb248b4c70ee944d7859e1a6f57526fda174c86518975f9d7f52169d6b9c67c823002b0427b1c9d6870e SHA512 500981dda67e1ec090d11a79df90e2ace94dd1aa7986204f34140baf3dc4921b6491e9b485415951584ab83fe8450f7228984e4ad0233fd776d2856f4850d83e
+DIST websocket-extensions-0.1.5.tar.gz 9784 BLAKE2B 0e7284363876568d62988f71faeec4105600f7f09748ab8256747e14c3ce361d4cbc6834b93142e363ed38b02012aabf79d1d9e0f29ca31532d2e6d069dfdff8 SHA512 660a7f03215ab3cfee1622bca5348780f8d665314f7ad2526e114a1ace169799457e1ff30303711819581202edda0539a622e20e91afe51d7b3fd571c1a7aab5
 EBUILD websocket-extensions-0.1.4.ebuild 609 BLAKE2B c92861f8b213563eda909ae994bde20ea7c09eff2cea92b895403c24e141fd03c9dda564843d0996901babadbe30c75a796815c087c05c855ec7b2dbeb130df8 SHA512 d2f18c58017a54faba7fc4d6694d3831bf2df05c58c12f9cf4367437962438975b4a1007b8f6d3662094b6ce9a4e12e0d27afc885a713cccd7f8a5f1830469d9
+EBUILD websocket-extensions-0.1.5.ebuild 638 BLAKE2B a4e109aec2bda240687ea50809802de99feb46d66e14089cca8438e8f5c664197112678e656add6acd4ba49eb3100a045255a76dc1088cfce2539814483c62cb SHA512 f693033d04f99aee0aa81ed8c790bfeb31f063f78638eb9566b87cdfb81b9c62b0a997b7c9a5de9ded3a25c9cf3544f693e1b8aa430d6617349a75d3668f9750
 MISC metadata.xml 356 BLAKE2B d54646b9fde8e8698cedb97ed90ce59a1f5bbd318dff97fae6dd635efa425cbba0ee2cc8d1b518e2aa6bf4a6bd31bcdd71004c091cae69765437c9f6face6f38 SHA512 a87f7468ae1610dc912186f7ead34494f4e472f0b1bc059ee3d254cb84e2657481269e2976f8218fcff2df0846d16a183bf1f5158ecf68b5e1c97f33345f4f7d
diff --git a/dev-ruby/websocket-extensions/websocket-extensions-0.1.3.ebuild b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5.ebuild
similarity index 75%
rename from dev-ruby/websocket-extensions/websocket-extensions-0.1.3.ebuild
rename to dev-ruby/websocket-extensions/websocket-extensions-0.1.5.ebuild
index be1e21f483a4..dab7a5a816b0 100644
--- a/dev-ruby/websocket-extensions/websocket-extensions-0.1.3.ebuild
+++ b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5.ebuild
@@ -1,14 +1,15 @@
-# 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"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
+RUBY_FAKEGEM_GEMSPEC="websocket-extensions.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Generic extension manager for WebSocket connections"
@@ -16,7 +17,7 @@ HOMEPAGE="https://github.com/faye/websocket-extensions-ruby"
 SRC_URI="https://github.com/faye/websocket-extensions-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="${PN}-ruby-${PV}"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fe000f8688c5..5f9597cd73ea 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
index d4f42b1e4d71..a19c26dbfe36 100644
--- a/dev-util/btyacc/Manifest
+++ b/dev-util/btyacc/Manifest
@@ -1,5 +1,5 @@
 AUX btyacc-3.0-includes.patch 175 BLAKE2B a0da73e29099239e97d8fd67edf2743720fc3e97946834319c249e9bb0dd1949c70b492d3ec3fffed32d992dddc7ed2cadbf7cb2280b7cc24c26b1f00854b46f SHA512 c0ba2cf5ca3575862a6c683cf5a9461cc7008e7c8662732ef64ba68f041e810aceb8f0f1b75becc8cd910c87c60dc830e8823b15986fedf345319bedb50e3dd4
 AUX btyacc-3.0-makefile.patch 535 BLAKE2B f5c7f893dcbe98c17dc74efc6310924518447ea4d719af3dc700daea72d0106e5217d69cfb82b498a81392c8f0a447c92afcfa10954f4b7418efa76de3382dc9 SHA512 54df54a45147a7ca5c76d0c6665a46210af170671ba04762e8de80c0269b0a1aa947c1be049aa8660f8b96d4ec204e639f2a810130676d69fc54fb28c929a190
 DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
-EBUILD btyacc-3.0-r3.ebuild 918 BLAKE2B 15f0536361ad5ac4f96a97090156503e1cd7703d81289c94152da01c25543a78b0784ed2763afc9e8df379251e803402c8e128181b62696bb4955d106b96959b SHA512 f5d2c02782319bc6814ad2fd47dcd00934974364f4700087dca1ae2c66f3a988f2a808d55c0f18ce7d8218e55fce3cf471f43fe2f86adf5cbcd3e6ff67935ca2
+EBUILD btyacc-3.0-r3.ebuild 920 BLAKE2B dddf3df47b5a41b6682b042d4c502393b90e7e43f822c2e9bb42427d019a394e225dc2af9b8aed32659ba472dee1416b7653139faca247e52dfd7b900d69312b SHA512 06006a7742f5c97c1befdf2a165ddd02981bbd8544bc48a535197b3dd9d24394e55f3b0d703e324052f8f4920632a93d7540a2cf7ea2383391935f849096c614
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/btyacc/btyacc-3.0-r3.ebuild b/dev-util/btyacc/btyacc-3.0-r3.ebuild
index e178a55e6cdf..e27bce30647f 100644
--- a/dev-util/btyacc/btyacc-3.0-r3.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ inherit toolchain-funcs
 
 MY_P="${PN}-3-0"
 DESCRIPTION="Backtracking YACC - modified from Berkeley YACC"
-HOMEPAGE="http://www.siber.com/btyacc"
-SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
+HOMEPAGE="https://www.siber.com/btyacc"
+SRC_URI="https://www.siber.com/btyacc/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
new file mode 100644
index 000000000000..1c7c7338f755
--- /dev/null
+++ b/dev-util/buildbot-badges/Manifest
@@ -0,0 +1,3 @@
+DIST buildbot-badges-2.8.0.tar.gz 3935 BLAKE2B d5cf4dff1ebcb752b3b82377912d0a6e811d7def94dcf9e6f339a810d67b7eafcc699f4abdf32618aa71f231165e31be57be1834c9d0a8bf40012e66c7f19245 SHA512 2653393de1fa3c6e98d744144190e7f7999cc1955f67467c70609ae6531f5b5f05adc4bc84cce9092deda374103266e24397080998c3d62635bf44dcb8650609
+EBUILD buildbot-badges-2.8.0.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.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.0.ebuild
new file mode 100644
index 000000000000..c59f1ad4227a
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_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-badges/metadata.xml b/dev-util/buildbot-badges/metadata.xml
new file mode 100644
index 000000000000..132bad705203
--- /dev/null
+++ b/dev-util/buildbot-badges/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Buildbot badges plugin produces an image in SVG or PNG format with
+		information about the last build for the given builder name. PNG
+		generation is based on the CAIRO SVG engine, it requires a bit more CPU
+		to generate.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>devel@buildbot.net</email>
+			<name>Developers List</name>
+		</maintainer>
+		<remote-id type="pypi">buildbot-grid-view</remote-id>
+		<remote-id type="github">buildbot/buildbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index bcad26953874..d05927420bb7 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,9 +1,5 @@
-DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e73260d826633553ed10ede6d66d112dfa8bcdc4f1bd376695ee0ee4a715f1fa3705329033044d9358731c0b807c54b40b4e32a04f565 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522
-DIST buildbot-console-view-1.1.2.tar.gz 640509 BLAKE2B 481b8049e606d47be8b171c24a210d6c95ce13ee4a4d46fd689ee836857e8d054f1799ce53de3931f820f02061cdd0c4a47686cd1724fe1c39ab33ca0f274d76 SHA512 23a14d3264802b2cf9a6a7cab0592c6391dc55a8805c17529c3279b129aaab1df97999ffd5fdc0927e7d5fb204e4114b4672018102381523599310cf7223950f
-DIST buildbot-console-view-1.3.0.tar.gz 640506 BLAKE2B bf68136edbe734514b662a580b9025626b6e0acd48f49ccee979c38d1a2eac13e8fd13bf4c9f62948694ed003de3ee6c44a9d734561a1b5ed4e1d9d330b39f3f SHA512 5b4fa27c8cca57df083c3044729bc6086086dabe819e215b02fe4fda0863b62658925433bbc90d9b38f4309af50b2312b3c9aaefff96a1f62b18d160ca66f205
 DIST buildbot-console-view-2.7.0.tar.gz 17939 BLAKE2B 1ea1848f0276bb7ef4adaf63dbe290ad5769689b15898682deed61e9797eb4945047dd26d492b118b75314621bf2777b77e992f1a3129e413c01c17b27b680c1 SHA512 22875fc4c3440892147db7c6ef1eba165a29f4ccd3583827394d0195c72dc8ec3d31940587e4da1f0133def074c72f87bc23bb210189a0e0d028c0be52368107
-EBUILD buildbot-console-view-0.9.12.ebuild 1151 BLAKE2B d0813409b11727bad84a411242f056d2cfa315f740a0225b58f5344d882b56e1778b67b3d0253723b5412a69112fe5205352a4280b34ed41e52572ae592bc8bb SHA512 5511982e4980d118b31e7a25326d7158efa1eaf9e30ac05252fc08f282641ba13489fc8157f04bb94bae37bfba9db3577aa4abbf9887bf57378508956363f26e
-EBUILD buildbot-console-view-1.1.2.ebuild 1151 BLAKE2B d0813409b11727bad84a411242f056d2cfa315f740a0225b58f5344d882b56e1778b67b3d0253723b5412a69112fe5205352a4280b34ed41e52572ae592bc8bb SHA512 5511982e4980d118b31e7a25326d7158efa1eaf9e30ac05252fc08f282641ba13489fc8157f04bb94bae37bfba9db3577aa4abbf9887bf57378508956363f26e
-EBUILD buildbot-console-view-1.3.0.ebuild 1151 BLAKE2B d0813409b11727bad84a411242f056d2cfa315f740a0225b58f5344d882b56e1778b67b3d0253723b5412a69112fe5205352a4280b34ed41e52572ae592bc8bb SHA512 5511982e4980d118b31e7a25326d7158efa1eaf9e30ac05252fc08f282641ba13489fc8157f04bb94bae37bfba9db3577aa4abbf9887bf57378508956363f26e
+DIST buildbot-console-view-2.8.0.tar.gz 18022 BLAKE2B 455ca2a1caed7d55a26d4b176cddf1a571f411dab191eda890698aa1d5150539c620ae90b2d1c5ab70cd47589466ca4534e2da1d1e73ab388761319f81434b39 SHA512 9344021b774f5cecf39384cff869ec0c9778630ec0015d654218ad03d83a18849e1b144dae74f7c85296efac6bbc767f387a1aa4b5271f3996c7e1b177f3b735
 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
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
deleted file mode 100644
index b78694b58091..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
deleted file mode 100644
index b78694b58091..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild
similarity index 50%
rename from dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
rename to dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild
index b78694b58091..461db8d8fd20 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
@@ -15,38 +14,23 @@ HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pyp
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
+KEYWORDS="~amd64"
 
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 "
 
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
 
 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 03970ab98439..ba24891079ad 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,9 +1,5 @@
-DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23abaddc414713c46e5544915d5564641a0534dfa9862f71d689c5df27a5f2a6ecbaa33c29ece5bc85e1c2d1f0a10b0f19273364699748f SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6
-DIST buildbot-grid-view-1.1.2.tar.gz 638848 BLAKE2B c99e79af105cf07a6540c71fb7e604bca144ec5d462f6a38c50b525b2ba7bf9640b8d1d4e36e0beb121eafb042fefb67a8adb8b91d2ed8fca4daf982712fae45 SHA512 c2dddab25d1da173ae22d811a9c3261eaec6ac76389829cb1cfaa8b976573d6f12208541dce4065d45512c4c984d9a1d4c72f6e151ec3365ba1dca356ad0288d
-DIST buildbot-grid-view-1.3.0.tar.gz 638845 BLAKE2B fb52b8fccbce298cbaf715feb1d785856e879f9e9fe63add83c3b0b51df93417ef8b355b33569956e055771bc75a4b6ea318bd7bbcd157bce01f972730468b62 SHA512 f82316743c10c4fd2a509a754808535606bdfd114b86e5796887d47845b4ef83677c7af830b9e4c531a9857249a8b2de8411b30f2f5b2a617a54244658e4a528
 DIST buildbot-grid-view-2.7.0.tar.gz 13342 BLAKE2B f37d7466d346c2db4083bdf0226f405fd48dec73306a91a24d77e38ef4f254bfd3a7b64604a5518f4fce5cd83c00ac4788626e06167cc6fc72f1dd4f31ab16b7 SHA512 a2ffa0ada87a2672b8839516bcf571ab8d884c953459b567fd87c8dbe1c65bdccc862d2bcfd4148f91959b1a942afabdacf98f37f2a0374393b57fe8c09aee04
-EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1120 BLAKE2B 7e8aa94b431619138e8a9868778b51b3048bb397082ba7c5647901e7ab23d7c8d5eed459582be1ae9b86b6588f2b3ad6bebb994c2d5d27dd29611655881978f2 SHA512 051c0d4d9717fcc337ed57d7ffc203785009bad76598fc50d157bb7ddfb0c8f96e8fb42205bae646aa247a0c62c2241a87e1b751e0e914541ae025b3882cebf9
-EBUILD buildbot-grid-view-1.1.2.ebuild 1116 BLAKE2B 89dc619bf4864378815f480186f9cdacca9a53faff1d61cb2d1ade34742e6eacdd311ed335b6cf121acdb815fda2e2d35f1e27025d19c9c6cbf7e884b6fe66ee SHA512 184864ec78acead7d6467e1397c1d7ce13b1eeba9f69b734f7457d1da9fe643146ab78b718d308017eb1583720942b7749826f90d9b170ca52b479bfd4a4e5d2
-EBUILD buildbot-grid-view-1.3.0.ebuild 1116 BLAKE2B 89dc619bf4864378815f480186f9cdacca9a53faff1d61cb2d1ade34742e6eacdd311ed335b6cf121acdb815fda2e2d35f1e27025d19c9c6cbf7e884b6fe66ee SHA512 184864ec78acead7d6467e1397c1d7ce13b1eeba9f69b734f7457d1da9fe643146ab78b718d308017eb1583720942b7749826f90d9b170ca52b479bfd4a4e5d2
+DIST buildbot-grid-view-2.8.0.tar.gz 13399 BLAKE2B bfecb49fb3f6b0a9b6147625f6214f2b4c3dd76ebb2698af3e49526d0a6a1241ddf519fa8d612c37e5f12f8c11f673db2a2aa4558bd503834ea3f167d880f631 SHA512 2466130b2227de378a005c0cd6086de3d58c96339bd4f662b3da78ee275cc24dad82388b5f7798a20bb921d76e01a69802dca14feff6213677a89a279e93245f
 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
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
deleted file mode 100644
index f78bf0f289cc..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	=dev-util/buildbot-0.9.12*[${PYTHON_USEDEP}]
-	=dev-util/buildbot-www-0.9.12*[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
deleted file mode 100644
index 1c040e8d6fc8..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
deleted file mode 100644
index 1c040e8d6fc8..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-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="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.ebuild
new file mode 100644
index 000000000000..d598731012b9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.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 69ac96af9a36..7ea7e3b261c3 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,10 +1,6 @@
 AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLAKE2B c3b72b0a2c1a5afeb69d76b14d91292a45e827d28c82a7975d4a4e73fdcab66a87445aaa621593f98bdd34eb99dd564b9fdf015655906cf53b8f581a00377f97 SHA512 3d2d0e0d4049f623deca4ba050d873761f63fa4cb24cf4c83c52dd7c0f3eec483b6e76353a72b1ee3b0e3a64c54d8174620a3ff93ccdd1474d746d6309b5ae6a
-DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
-DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff SHA512 11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5
-DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7bf3382eab571090d68db23b476e2fb959deaf249e6d4f2f3b44cf453c407dd0fd39e54a4e5a3d41462b125c573505 SHA512 b8e53de24cd41e31417a4259396fa080c7dad48b5ad2b15d5c9de9eb3fb35196a84f48ba589e8a077382e8a14d760f6148056bbe30972f0542512404e8efbefb
 DIST buildbot-pkg-2.7.0.tar.gz 4754 BLAKE2B 568c59e9ba60fb2a221794ea7cba44d0a1fb1f4e41368dfcc9199208733fdacb8052a90b64368e8cf5bd906c02ff2d4fddd65dfe4ea117566f176924d4dec621 SHA512 9a6b67dbee28ed352671c2da3b14a416761f49bee2e77cf7f55936cbd4556e5509a420c13c7d4d88756e01de8e1268e08b43fa48ac0cf6a00dbff8566042a33b
-EBUILD buildbot-pkg-0.9.12.ebuild 1051 BLAKE2B a295298e0771cb5a82f0107ac3d30bfa7cf67b502320c71b15717a2518d505832e15d58af7f70b01862790d2b4f3f839cfa2b642d84ce2c1e16bee808fa78b7c SHA512 9615f3dc91bbea15a1f36ce8243b6acb80db72b5ca137b5b3a758026b5920231349e7890bee30869be1bd0f4558d13a7b208ed77c1b705770d357149826a30df
-EBUILD buildbot-pkg-1.1.2.ebuild 1141 BLAKE2B 8718d9771220d3d21749cd536f0f0f863a630819ea22632ed4d0837bccb3d240be140a3b01ab2bd76f1ca7fd663936e7f2604893eba1b0bc34742ccbcaf9c142 SHA512 48866e49fdfcd741993375af80d182e022d871ec04b7c5473614c854f6979276367ee0990fa4b140bb721b9b6066357c158d9430c49f0c7d0ac6def84a0ccd70
-EBUILD buildbot-pkg-1.3.0.ebuild 1141 BLAKE2B 8718d9771220d3d21749cd536f0f0f863a630819ea22632ed4d0837bccb3d240be140a3b01ab2bd76f1ca7fd663936e7f2604893eba1b0bc34742ccbcaf9c142 SHA512 48866e49fdfcd741993375af80d182e022d871ec04b7c5473614c854f6979276367ee0990fa4b140bb721b9b6066357c158d9430c49f0c7d0ac6def84a0ccd70
+DIST buildbot-pkg-2.8.0.tar.gz 4768 BLAKE2B c07e7a46681319ebf2d5bdc1a2228218d9b48378cb877277b1e9c88285f4ac4246eea4cea8018d652b8beba01587ccd9c5e25464645f283ba7e8400c7a8efbe4 SHA512 962b1b8c56d15ad3b40148d2802630b34f808d7699747e8c97c9a5f48c7b4cdf6762c4994da4fb1a495ae9fa9fa1e1ee2d5076b4eaeb593f9c2090d2329c03cc
 EBUILD buildbot-pkg-2.7.0.ebuild 870 BLAKE2B 4e53bd1ed3e5d0700da2d572dd291212076bc0f647ad1713a04e30816e137790ad918b615670230da705edeae4c99e442096690ca29a11e99776438d401561cb SHA512 f7dcf812c9fd1c2ed17999c7309852c25dd6d85d8a5f9122196d2a346feb6c5e1a196cbec4a9f5cda3efe2b6f0ddc18fd425eb50dea3f74ac67eb7249fcf2de1
+EBUILD buildbot-pkg-2.8.0.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
deleted file mode 100644
index 2b270c46a06a..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
deleted file mode 100644
index 2b270c46a06a..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
similarity index 51%
rename from dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
rename to dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
index 818b08480561..24f94f8cc0d5 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
 inherit distutils-r1
 
 MY_PV="${PV/_p/.post}"
@@ -15,31 +14,14 @@ 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/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
+KEYWORDS="~amd64"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
 
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
 S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 18b11ab3bbea..8536f3785f6c 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,9 +1,5 @@
-DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149fe7f4a1f03f2c2593b89908fb0a8d748c32779b01b8d87327ec9a54e02561a40d273f03f46a8581cf224c333f1bbb3e14ba22a56ef SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99
-DIST buildbot-waterfall-view-1.1.2.tar.gz 713898 BLAKE2B 0873ca7d44a9da7ad260032a8153c45e864c605c79cbd826d4f5cb306dbcdcd1fd1e89fe59df57decdcd9ce94330d80ed20d8d7d95b4dc93d6d7cdf6340eb30f SHA512 cc14894281b712fe479ea19116948f69fb43a4cc8c7a0f159fcf97eed0c36a11cc967a0663042f34f64cc4d65468c58eb4398d66fb0d125cde6dec9ef7fc7e08
-DIST buildbot-waterfall-view-1.3.0.tar.gz 713879 BLAKE2B 42e838bfb5925850cfa679727a8f53a5a71c4b6ce9ad26b010480ba16e421f5eda0228d94f7efabb74f3493f868ef61274338f31e0ba6afa1fba4a3b533ac5d5 SHA512 4b8403f9f68ddc6fc980649cf26625834c6a271705e0b8396ab7c2fd739929c2878557df945a1d9c5411985b79f8b43d3fca2c7f74769e9e832b1a7c166f8a3f
 DIST buildbot-waterfall-view-2.7.0.tar.gz 191009 BLAKE2B 1730bc7caef0aa405ea0adf0585ec50f94b162286daa14755b6070af22d417a9a1b756ade226ac9950d7c0f9eed96c22817ba71cce5b6bb9a344c4dbed989c09 SHA512 7327766532062dc5dd09b210914af9d0e1ecffa6a0d94917cfff93274627f5896552fe191003f1895208702f83670f202b4fc735d0d9161c9efa3419dc46b12b
-EBUILD buildbot-waterfall-view-0.9.12.ebuild 1155 BLAKE2B b281f339d91148b1914a1a29b23e3de8c45cd60a73e648d0a88feb56c4b5d562e2a2522651dfa3e98baa3f231b28ac0180f139e26c115540323c8753926dc398 SHA512 d006570cfef39e9278cfb36441f09ba2caf658dd848b597805d8fa9a684e911776a28003682904e01eb2abb1549427a8c5362f14470e25859a508c8ee851fcec
-EBUILD buildbot-waterfall-view-1.1.2.ebuild 1155 BLAKE2B b281f339d91148b1914a1a29b23e3de8c45cd60a73e648d0a88feb56c4b5d562e2a2522651dfa3e98baa3f231b28ac0180f139e26c115540323c8753926dc398 SHA512 d006570cfef39e9278cfb36441f09ba2caf658dd848b597805d8fa9a684e911776a28003682904e01eb2abb1549427a8c5362f14470e25859a508c8ee851fcec
-EBUILD buildbot-waterfall-view-1.3.0.ebuild 1155 BLAKE2B b281f339d91148b1914a1a29b23e3de8c45cd60a73e648d0a88feb56c4b5d562e2a2522651dfa3e98baa3f231b28ac0180f139e26c115540323c8753926dc398 SHA512 d006570cfef39e9278cfb36441f09ba2caf658dd848b597805d8fa9a684e911776a28003682904e01eb2abb1549427a8c5362f14470e25859a508c8ee851fcec
+DIST buildbot-waterfall-view-2.8.0.tar.gz 190508 BLAKE2B 3f406648c44d4717872056a5e4c048bcf50b9c2865427052a920c530ab3da1dfb622513fc12676d60a0553408310a233b591591b447ebe990bae539209fbffe6 SHA512 93b455fcfdb28e32267b77c6a379e59de063bcbd244225cab589b16e688d31184505de0645330ae8d3033014df124f3fb5803d3f0f2b6c941c49727716c820c0
 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
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
deleted file mode 100644
index a41c9f0edf71..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
deleted file mode 100644
index a41c9f0edf71..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
deleted file mode 100644
index a41c9f0edf71..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild
new file mode 100644
index 000000000000..8e4b9cc0d871
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_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 3918d6df92c3..59e8c07ad904 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,13 +1,9 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
-DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
-DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7
-DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2
 DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db
-EBUILD buildbot-worker-0.9.12.ebuild 4818 BLAKE2B b685b7deeb4fe497dac792fb308f334f8652462b4a16966700e5ad5dc676281e533e9be7e59f62cd70d7904b698d32961fd480aaa03460fad38c33e00a1857ec SHA512 632c8e4b67585278f26776d7f3501b741102b68471f7c0ffc01dc3e1da092fa04ae631ccd6215747bc2e82f6b88acafe7cf7c86a88841c928a712301c0ee42f6
-EBUILD buildbot-worker-1.1.2.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
-EBUILD buildbot-worker-1.3.0.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
+DIST buildbot-worker-2.8.0.tar.gz 102605 BLAKE2B 4cd6d8755803d7649acaf1b45e6632a7a9bddd8a58590a8caa73f686584fedf62d98911a9e148e5a6f34c99b8551cd80c2acbd03fc4f892300cad89a4f68e0b8 SHA512 62f3a72ed7d7ca724b667528e55673c20382ed95abc898dc43e43c5e09bc1d8116eeb2791145097a9b9f7ab2d38a90d974dfbbf5697d8c045a630632ece8512e
 EBUILD buildbot-worker-2.7.0.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
-EBUILD buildbot-worker-9999.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
+EBUILD buildbot-worker-2.8.0.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-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
deleted file mode 100644
index 2fc5d7a0f231..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user 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/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
-
-pkg_setup() {
-	enewuser buildbot
-
-	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."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-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 "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. 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 "${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}"
-	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-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
deleted file mode 100644
index a8ac9da44f52..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user 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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	enewuser buildbot
-
-	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."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-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 "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. 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 "${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}"
-	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-worker/buildbot-worker-1.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild
similarity index 80%
rename from dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
rename to dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild
index a8ac9da44f52..3bd934a50342 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild
@@ -1,35 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
+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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
+KEYWORDS="~amd64"
+
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+RDEPEND="
+	acct-user/buildbot
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
+	!<dev-util/buildbot-1.0.0
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -39,25 +36,18 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
 
 pkg_setup() {
-	enewuser buildbot
-
 	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.
+		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
 		The scripts can	run as a different user if desired."
 }
 
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	distutils-r1_python_install_all
@@ -78,8 +68,8 @@ pkg_postinst() {
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		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."
@@ -117,7 +107,7 @@ pkg_config() {
 	if [[ ! -d "${instance_path}" ]]; then
 		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
 	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	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}" \
@@ -125,6 +115,8 @@ pkg_config() {
 
 	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"
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index be5258cd9984..68c35436d35e 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
+inherit git-r3
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
@@ -16,15 +16,11 @@ HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pyp
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
+KEYWORDS=""
+
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -41,8 +37,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
+S="${S}/worker"
 
 pkg_setup() {
 	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 22c7f8dc8135..379ef7c13230 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,9 +1,5 @@
-DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13c07958c203440ef875bc4a79be6b894d0cf4dc457423528b7ea34c830511a5ef5d7f645fde2f71ac08578e1de32687c8b1ae2864491 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d
-DIST buildbot-wsgi-dashboards-1.1.2.tar.gz 626825 BLAKE2B 396fa858cafd6dc3958c37ea2e9e685357de2185ce0b73d946d3eb2e99472339e176de1b49d821337535904c521e8dbaa662217c568306e7b2d889d11fdeb5ed SHA512 1eee2a38b525145e50812dff421613291f6b0b6a80a531b54383d771393d2a12c1c7840e2dabf7949918ac3f31ce5f6bd9514c08dee8fe5900c99438e63d4ee2
-DIST buildbot-wsgi-dashboards-1.3.0.tar.gz 626828 BLAKE2B 9c44bca995a1849246c71cdf8ecca1a72ffdca9fb8e99db4e05dc529e0b188b85f45078c0f961c03eeb688fae08975dc438ba7c85bfcd3bebcc14a0d56a69f67 SHA512 97885bb26eb03c40b8424063333a9bbc80b5111ce82c79e0ca466f2f820622df43c6913b6b6f4f9ead2a47e09496ff9442df4a6a9a34041f6b9a127544413330
 DIST buildbot-wsgi-dashboards-2.7.0.tar.gz 5573 BLAKE2B e50576da2a86c3f63435c6ca721c0756e1bbe004e82a750d4f0a03799cde4b6c8db7a5199842ce46a835614ccfb588b4eca20035988f54c7d1b6dc9c43f31823 SHA512 018a103fd53f6c3fdca418a46d8576c6b1fd35c05b1cd2ef2dc2c8d30540fbf1528501369246c49d64cfc2d795bcb528fb672f0536a0239f64b87616c50c18c9
-EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1160 BLAKE2B 8b11516a18c7ab3e00965878abb996b9f6e25726af62b9d7c6124efe2fa9891b5b5001d6c2a4cddb682eb996abcd92e767390decdc63302991c1f4b4d4ac0caa SHA512 8fdf990e134ec41009326fc97784097d6bf277c2d850738f1c883a880d41bbb22ce165fb4b71a8ccce11afe9fca6e72941556f5edefeb91b49652422227b1c28
-EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1160 BLAKE2B 513b4f9caeb71b2b538d7b1bb7e4460b0c5dbd7fc59d2a9ded597fb72576c43a5ac458f4a3721ed6eb8d36786957c74e528df0cfe22adabb39d52c98b4c280d9 SHA512 ac771c690204607251b7f3dbdcd21439660a78c04744403fa7492619ab9074418d4810cd9c967845eddd5d328a54e145c940c829374d25850fb3457b507dae38
-EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1160 BLAKE2B 513b4f9caeb71b2b538d7b1bb7e4460b0c5dbd7fc59d2a9ded597fb72576c43a5ac458f4a3721ed6eb8d36786957c74e528df0cfe22adabb39d52c98b4c280d9 SHA512 ac771c690204607251b7f3dbdcd21439660a78c04744403fa7492619ab9074418d4810cd9c967845eddd5d328a54e145c940c829374d25850fb3457b507dae38
+DIST buildbot-wsgi-dashboards-2.8.0.tar.gz 5576 BLAKE2B cad5d728ab7811b6e5f0750dd4e74ad25ac92c72a8e5f58beed0c19ba38de1599f5f5977c087acfbf2a138e41aa927ded54fd7ff9f1719de46560e814bb3320a SHA512 98217a351b0d441ab346d385b8b72333d100c33f40812f2c248a893a31e9ca157cc9e19048ed5a6e49283bdd9dd15ddbf5f16fd9e47ec5a63fedc959a93f1a33
 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
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
deleted file mode 100644
index 2cb6c6384660..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
deleted file mode 100644
index fdac2604e41f..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-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="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild
similarity index 54%
rename from dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
rename to dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild
index fdac2604e41f..f124a0ef5c54 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
@@ -15,19 +14,12 @@ HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pyp
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64"
 
 RDEPEND=""
 
@@ -38,14 +30,3 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 3f055c708bbc..07eac37f87fa 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,9 +1,5 @@
-DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1e295898c432da5c8915e36156f2f934fd065c8075dd55f68da7bc29a567c1ef276bc415df38911aff7c33de46fa7942 SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a
-DIST buildbot-www-1.1.2.tar.gz 718705 BLAKE2B 009ae0dc07693f9eee4e3982ccbecb32d64e7d27e374f539cd541a5f80d9b9bf798e8836502cd26a5477b0ee842dbfae2308608fa3320e682afd0bcda2f89f1e SHA512 e4a0f7aee5e38d0522d39c819d4b9865966e020fd89b156e79807417fd7f82d497fbceafcc8a89e5beb6def1f42e4bfc595053581cbe2634520ad2c806ce3968
-DIST buildbot-www-1.3.0.tar.gz 717517 BLAKE2B 57b0ed7ef46fecb242562a0f93e234985c9cc0ea55d273c1c5de74753f6ea83d25d5017515afb6ad4b7bff4f80cdfb9a6daf937c5cd133c017c9bd6fa9d6d7ee SHA512 e01d1d3528ab1f29ff136321b25f45b01733a4f23cd9d637c9e3290b5301a8ac3dc545decb178c1332e58dc3e11065ef73df49fbb46fca6068acabdd40a8bff1
 DIST buildbot-www-2.7.0.tar.gz 3173804 BLAKE2B ac51e6b8c6860dfd98647cacd5a300099bee19b64bb796e8643fab149c96604bb63a565a25eea51dbdc458128cd4c431efbf46069f2ee0adf5f835992d860e5f SHA512 530c2e3926dbec743b9dbc3ed38ba32c421ee265dc5ff48618748a547b0e8da4d7064e6afa379a8187ec189f8031c1e24b99576d276bc5eab4ad1c6a5bc27a84
-EBUILD buildbot-www-0.9.12.ebuild 1192 BLAKE2B 6b602e9ba06ca4f6db2645b30ad8379d30abdc47eb189ae16dbe33e241bec0b79eb0788be5dd64ded5898af8d106f2ab8c603c6bdd32fa02519e44ffca69ab8f SHA512 438b1c81a9449f841e7c1037ab5dddce11912c27028d247927dd2a9ac8ac99534254bdcfa539ba46809a6436ac04cef3f72b9a1d9d95f51bab5465ab4c6a1af4
-EBUILD buildbot-www-1.1.2.ebuild 1192 BLAKE2B 6b602e9ba06ca4f6db2645b30ad8379d30abdc47eb189ae16dbe33e241bec0b79eb0788be5dd64ded5898af8d106f2ab8c603c6bdd32fa02519e44ffca69ab8f SHA512 438b1c81a9449f841e7c1037ab5dddce11912c27028d247927dd2a9ac8ac99534254bdcfa539ba46809a6436ac04cef3f72b9a1d9d95f51bab5465ab4c6a1af4
-EBUILD buildbot-www-1.3.0.ebuild 1192 BLAKE2B 6b602e9ba06ca4f6db2645b30ad8379d30abdc47eb189ae16dbe33e241bec0b79eb0788be5dd64ded5898af8d106f2ab8c603c6bdd32fa02519e44ffca69ab8f SHA512 438b1c81a9449f841e7c1037ab5dddce11912c27028d247927dd2a9ac8ac99534254bdcfa539ba46809a6436ac04cef3f72b9a1d9d95f51bab5465ab4c6a1af4
+DIST buildbot-www-2.8.0.tar.gz 3174211 BLAKE2B 32463f0456ba3fbc5eefd067bcffc4021e1b1dbe95d3a68b1a52c1657317c883a49c6b5baa0696f1bc90c7a519406eb6a4b0797e9c48f28d021cbd4480d80ff9 SHA512 916fe250f14bcc2cfdfe6d54d426c523b6a093e13ec60be65b93e3dcad2bf919d091b9b4ecd797e0d616c8bb6cd02974ee9d66931031d8e614740bb9f816fb16
 EBUILD buildbot-www-2.7.0.ebuild 898 BLAKE2B 208e8a8b89a9373a60e34502f08b81b6cd3a3bf93b5fa96b23eeb31b54ffe2a7b68cc22a57400d05688af492658d3141718b4e71a4bc355cf75998d13a22c5f5 SHA512 003cfc4e9a053e4ad986adceba39272293f67a8852658988a0987cf919206e672de274e8aad439b40163cf64480df5bd47e1bfaadb2b849901907a9d38350c54
+EBUILD buildbot-www-2.8.0.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
deleted file mode 100644
index 196516c17f9f..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
deleted file mode 100644
index 196516c17f9f..000000000000
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
deleted file mode 100644
index 196516c17f9f..000000000000
--- a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-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}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.0.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.0.ebuild
new file mode 100644
index 000000000000..c5f7aebcb28c
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.8.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_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 da1edce16e6e..70add3bebb21 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,18 +1,17 @@
 AUX Add-gentoo-to-the-VERSION_ID-check-exclusion.patch 1137 BLAKE2B 0ced9724aafd4511542248846364011fc022b06016a329225c3203e4e932db0932d60ece526b095b60a30acfce0e700d8bfedaccf8d30c75b3c38a9e85b51814 SHA512 6e774541b8b2b229eb29171f78a46cd93f6c01056d410e0423ca757f5e5b956a4e29bb4a7b0c38d281e3afe126423e65bde8e367657fb663cb01ebc8c6f2c622
 AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
+AUX buildbot-2.8.0.fakedb.patch 358 BLAKE2B ad4066e76acd5ab17c487c7d56f388fb6d0d4fc147656fb7c3df36519e93a11d1f7f97cfb3c7e16c299d92a83fe71b24bb45d8ffaab106ca8d2b711d8f7802fe SHA512 1a3389cf5de1a43294a5eefe967246fd52d796627b92b2d6ab28de4b3394786945743cf76fbda1699e8291ed639fe2f7616db13b16fb369554798793cb5ecd81
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
 AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
+AUX pypugjs-2.8.0.patch 3633 BLAKE2B de243262e4631e7ce3b3208d4f3acc7c7857375c4e938809d18ed65c1dcd2aa8abbdf0339fe278a329bc734220a21cf85f772b81e0284d42cf3c66599902a0e1 SHA512 c847026d0658d61ac617b7471a09fc0ae4f70fdf82bd1c79d460c0dfc9beb060081073b260aed2cdb5f2092746146dbe12787589f311bce6857a2769ccfa1e13
 AUX pypugjs.patch 3631 BLAKE2B 168c865da59c947a00f4025108ff9fdedba55a9ce3a588e7fbe3f77d10dc88434baf8690edc4e5318d87c7823a551f2d796fd47b42cb0facb8cddfa29f6354bb SHA512 1ea242249f44ed1ea958e2771ce14f7cbeac6bbaec4e7bf803a38e2e386d604efbfe1158bbb0151d29a8891f55142ca0a0191063051f2ec56c3c3f053ccb2d8e
-DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
-DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
-DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830
 DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669
-EBUILD buildbot-0.9.12-r1.ebuild 6444 BLAKE2B ceacfcbc66a0fb1e927cacbd456ef023145c475ff42ff64eaa603e1db295bec38cb7939bf577410234f16e3a851c2a41d99863f4efdced715e7d2ebdd015e3ed SHA512 8857547742c7ebe0f8fd5a5919a0e1cb5fcfd34cc35f6fd5c56f7305fd2db9bc72e5d805077ae3f041dd1b16d8825c69cd0062c6dd181db5d781512269266f10
-EBUILD buildbot-1.1.2.ebuild 6558 BLAKE2B c20fe0973f6cec4336f3d60a2c94f71ccae7cc5cc819549bc0e84f748f307d4e2e0bc5dd864a612b6dfd4ae9b3ab3f7ca9693e407dca414882ecb1d20e15078a SHA512 477c80abc713c6e62754fae6f071eeb0401f719a72c491a3a5932be8364ccc80fb2c1fc47c8093f558974a00151b8db3bfa34f3c4a088dec75d5d59ff4e6e63a
-EBUILD buildbot-1.3.0.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9
+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
 EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
-EBUILD buildbot-9999.ebuild 7696 BLAKE2B 6998175d60b79660f0493080732f8fd445d11ffa38873399ad50fc05e9973201345846c05375f8d182afe3a267f562dfe862e146aa89da37437aa744e944fcde SHA512 f77d99e0733af692bf4237babfbe6a4abefdb281c116a1e6113261b441bc9bec993bcce0d79208a0a8a05bee6b5a832335e635afa2513d15239c3514d92c5649
+EBUILD buildbot-2.8.0.ebuild 7458 BLAKE2B 5c5c805eb70bb4eccd7f7283951a6e0c39d0bec01b79866ff8bebcee043ce086faae455feffc722a82373390092edb3a79a0cbc522111fb2b160aec0fdce13f7 SHA512 36ce0b760b6b7705fb8ea1149c1580529bfce1ae1d9ea07ece8b8aa642439f3726ddf79f35e9494b531b533bf0fe98e82d018409f658ba696efb54ea73e91754
+EBUILD buildbot-9999.ebuild 7329 BLAKE2B f53e6293558eae28a68340d8a44bcff355f0498396f350548d6362bd87098da7b0e8279fa9e241ac99a4021b6963264e1905fab3c12e6d00f9124755e256c878 SHA512 e7de2a20e0c287e3646ed1161f34272319ac676e2c90649310dff28a46d026dca2c4ed8dc727ee6d876c925c2586afab8aec261496070602cb9a9c59e61bac2e
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
deleted file mode 100644
index c56a3675fcf9..000000000000
--- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=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/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[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${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-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-PATCHES=(
-	"${FILESDIR}/Remove-distro-version-test.patch"
-)
-
-pkg_setup() {
-	enewuser buildbot
-
-	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_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	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
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-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 "${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}"
-	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/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
deleted file mode 100644
index 38a9ae82e1e8..000000000000
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user 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/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=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/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[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${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-worker-${PV}[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Remove-distro-version-test.patch"
-	)
-fi
-
-pkg_setup() {
-	enewuser buildbot
-
-	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_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	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
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-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 "${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}"
-	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/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-2.8.0.ebuild
similarity index 81%
rename from dev-util/buildbot/buildbot-1.3.0.ebuild
rename to dev-util/buildbot/buildbot-2.8.0.ebuild
index d59c41b23e9b..1de7b0513a29 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-2.8.0.ebuild
@@ -1,34 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
+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/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+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"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-fi
+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}]
@@ -38,12 +36,13 @@ RDEPEND="
 	>=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[${PYTHON_USEDEP}]
+		<dev-python/idna-2.9[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
 	)
 	irc? (
@@ -51,46 +50,51 @@ RDEPEND="
 	)
 	docker? (
 		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	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-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	)
 	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${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-python/docker-py-2.2.0[${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}
-[[ ${PV} == *9999 ]] && S=${S}/master
 
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Remove-distro-version-test.patch"
-	)
-fi
+PATCHES=(
+		"${FILESDIR}/pypugjs-2.8.0.patch"
+		"${FILESDIR}/buildbot-2.8.0.fakedb.patch"
+)
 
-pkg_setup() {
-	enewuser buildbot
+distutils_enable_tests setup.py
 
+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.
@@ -115,7 +119,7 @@ src_install() {
 	doman docs/buildbot.1
 
 	if use doc; then
-		dohtml -r docs/_build/html/
+		HTML_DOCS=( docs/_build/html/ )
 		# TODO: install man pages
 	fi
 
@@ -133,12 +137,6 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 
@@ -194,7 +192,7 @@ pkg_config() {
 		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 "${instance_path}" || die "Setting permissions for 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}" \
@@ -202,6 +200,8 @@ pkg_config() {
 
 	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"
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 35a2e69c15ec..25ce6693e4eb 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
+inherit git-r3
 inherit readme.gentoo-r1 systemd distutils-r1
 
 MY_PV="${PV/_p/.post}"
@@ -21,11 +21,7 @@ HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pyp
 
 LICENSE="GPL-2"
 SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-fi
+KEYWORDS=""
 
 IUSE="crypt doc docker examples irc test"
 RESTRICT="!test? ( test )"
@@ -79,9 +75,9 @@ DEPEND="${RDEPEND}
 		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}]
+		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
+		dev-util/buildbot-worker[${PYTHON_USEDEP}]
+		dev-util/buildbot-www[${PYTHON_USEDEP}]
 		crypt? (
 			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
 			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
@@ -89,17 +85,8 @@ DEPEND="${RDEPEND}
 			dev-python/service_identity[${PYTHON_USEDEP}]
 		)
 	)"
-#		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
 
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch"
-		"${FILESDIR}/pypugjs.patch"
-	)
-fi
+S=${S}/master
 
 distutils_enable_tests setup.py
 
diff --git a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch
new file mode 100644
index 000000000000..2ce217b0d2e4
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch
@@ -0,0 +1,10 @@
+--- a/setup.py	2020-06-01 15:14:03.169026527 -0700
++++ b/setup.py	2020-06-01 15:17:38.619177059 -0700
+@@ -194,6 +194,7 @@
+         "buildbot.test",
+         "buildbot.test.util",
+         "buildbot.test.fake",
++        "buildbot.test.fakedb",
+         "buildbot.test.fuzz",
+         "buildbot.test.integration",
+         "buildbot.test.integration.interop",
diff --git a/dev-util/buildbot/files/pypugjs-2.8.0.patch b/dev-util/buildbot/files/pypugjs-2.8.0.patch
new file mode 100644
index 000000000000..d34c6fac1af8
--- /dev/null
+++ b/dev-util/buildbot/files/pypugjs-2.8.0.patch
@@ -0,0 +1,83 @@
+From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sat, 25 Apr 2020 11:53:06 -0700
+Subject: [PATCH] Initial pyjade port to pypugjs
+
+---
+ common/code_spelling_ignore_words.txt        |  1 +
+ master/buildbot/test/unit/test_www_config.py |  8 ++++----
+ master/buildbot/www/config.py                | 10 +++++-----
+ master/docs/manual/configuration/www.rst     | 10 ++++++----
+ master/docs/spelling_wordlist.txt            |  2 +-
+ master/setup.py                              |  4 ++--
+ requirements-ci.txt                          |  2 +-
+ 7 files changed, 20 insertions(+), 17 deletions(-)
+
+diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py
+index 23a108e..a8c24ec 100644
+--- a/buildbot/test/unit/test_www_config.py
++++ b/buildbot/test/unit/test_www_config.py
+@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
+     def test_parseCustomTemplateDir(self):
+         exp = {'views/builds.html': '<div>\n</div>'}
+         try:
+-            # we make the test work if pyjade is present or note
+-            # It is better than just skip if pyjade is not there
+-            import pyjade  # pylint: disable=import-outside-toplevel
+-            [pyjade]
++            # we make the test work if pypugjs is present or note
++            # It is better than just skip if pypugjs is not there
++            import pypugjs  # pylint: disable=import-outside-toplevel
++            [pypugjs]
+             exp.update({'plugin/views/plugin.html':
+                         '<div class="myclass"><pre>this is customized</pre></div>'})
+         except ImportError:
+diff --git a/buildbot/www/config.py b/buildbot/www/config.py
+index a021299..50bae4d 100644
+--- config.py	2020-02-27 13:34:10.000000000 -0800
++++ config2.py	2020-05-11 17:26:44.587026761 -0700
+@@ -61,11 +61,11 @@
+         res = {}
+         allowed_ext = [".html"]
+         try:
+-            import pyjade   # pylint: disable=import-outside-toplevel
++            import pypugjs   # pylint: disable=import-outside-toplevel
+             allowed_ext.append(".jade")
+         except ImportError:  # pragma: no cover
+-            log.msg("pyjade not installed. Ignoring .jade files from {}".format(template_dir))
++            log.msg("pypugjs not installed. Ignoring .jade files from {}".format(template_dir))
+-            pyjade = None
++            pypugjs = None
+         for root, dirs, files in os.walk(template_dir):
+             if root == template_dir:
+                 template_name = posixpath.join("views", "%s.html")
+@@ -86,9 +86,9 @@
+                 elif ext == ".jade":
+                     with open(fn) as f:
+                         jade = f.read()
+-                        parser = pyjade.parser.Parser(jade)
++                        parser = pypugjs.parser.Parser(jade)
+                         block = parser.parse()
+-                        compiler = pyjade.ext.html.Compiler(
++                        compiler = pypugjs.ext.html.Compiler(
+                             block, pretty=False)
+                         html = compiler.compile()
+                 res[template_name % (basename,)] = html
+diff --git a/setup.py b/master/setup.py
+index 8fca506..1f32a74 100755
+--- a/setup.py
++++ b/setup.py
+@@ -490,8 +490,8 @@ test_deps = [
+     # http client libraries
+     'treq',
+     'txrequests',
+-    # pyjade required for custom templates tests
+-    'pyjade',
++    # pypugjs required for custom templates tests
++    'pypugjs',
+     # boto3 and moto required for running EC2 tests
+     'boto3',
+     'moto',
+--
+libgit2 0.99.0
+
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index 3214e38a6c2c..06c49c419713 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,5 +1,3 @@
-DIST crash-7.2.7.tar.gz 32249495 BLAKE2B 410f851afc8b4f5a4685985b58236efb6f88ae82465dbe553c8f2133cc5ca14013dc8e0efd242b3fb1b8fdd6cf0de85fabb5308252306e8c9831f9f9eb6ad56e SHA512 14e0c5842b752faa7f2c5667517c9cb214a172cea5b779df5cd38feec6472eb6fd6508346c1c4eec02d4565fd6dade270e851ebf571e778023f32ac7f82836b7
 DIST crash-7.2.8.tar.gz 32253097 BLAKE2B 26a8a07749cb62947053992ba761b541ba5d06f0f3bf67312d8228c9d851f51edf1201e732574f7f2f2768d6087324b8dd1f843ea47916bd9f95e514df967589 SHA512 3269760a50b49f25af0e1c43d60432e603036793aa542f8ccfb0b8019376da45afa7c053d3860ae2130b6471f3ac72cff78f1096e9ffa8c6f1d34afb52208e70
-EBUILD crash-7.2.7.ebuild 510 BLAKE2B 9889ba6e360fe4dcef061d967d777268aef964086b3a0d381043c45b822eb7b093a7d778c444c8b7fd4a53867ba47c899fae586f175afcc7a54fb508be285dd8 SHA512 f9cdb3f60fcec48accd88a54e5880355a6862722ea1b6c16fd036abc48493e171397036cbf63abe3d387addf59281a736eff08105d36e63dc47be0eac9815218
-EBUILD crash-7.2.8.ebuild 510 BLAKE2B a5e8d5434a23353541a323ab0584e70d14ed59f14a9d9840d5ea2771aba4c752503fd7e3719ab820dceec3a9f5eb767cfab627e969b4741bc90a61689d3b19c6 SHA512 981d4638e4e454005a8025b47714d42b26ef952cc417376ac9af9047980cbf751689aa194ac669d12837a6c76a0182ad579b1fa6fd17b0d5a500afeb79095ae1
+EBUILD crash-7.2.8-r1.ebuild 726 BLAKE2B fabf144cafa8db8a85471125ff2453ff15fa6eacda32c0d95559ff9b06848b14f02d24b4510878668c2d261906be26f284bcb5ebb2a9d5e83000abf2ec7c90f7 SHA512 dfa2ef151656aa2488bf4f836efa377cdd2c73b3ec1839156f4e34057a96f4449f187b9095be313bc73ca44b49f4ee674888a407a545eb5686592bd9bbce904e
 MISC metadata.xml 640 BLAKE2B 65450e02ac8c60f56fa7e82bc8b20f3d6b36bae290ad891265f9cd19ac405bf8452a5712e2c83c85c6635e4bc75f396c1b7976a7b7341efee3a8475f720d6c15 SHA512 c131b6f87a36deff7f2bc599000a692315f016774d0e87aa186c1ebe660ef85da04f2c3e5b89afa90473a65acf40f493d9434d677a621c9e77a0ae8ae81ed0da
diff --git a/dev-util/crash/crash-7.2.7.ebuild b/dev-util/crash/crash-7.2.7.ebuild
deleted file mode 100644
index d9bbae491a70..000000000000
--- a/dev-util/crash/crash-7.2.7.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-# there is no "make test" target, but there is a test.c so the automatic
-# make rules catch it and tests fail
-RESTRICT="test"
diff --git a/dev-util/crash/crash-7.2.8.ebuild b/dev-util/crash/crash-7.2.8-r1.ebuild
similarity index 70%
rename from dev-util/crash/crash-7.2.8.ebuild
rename to dev-util/crash/crash-7.2.8-r1.ebuild
index 47cd7b835092..45bbff515903 100644
--- a/dev-util/crash/crash-7.2.8.ebuild
+++ b/dev-util/crash/crash-7.2.8-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="7"
 
+inherit toolchain-funcs
+
 DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
 HOMEPAGE="https://people.redhat.com/anderson/"
 SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
@@ -14,3 +16,15 @@ IUSE=""
 # there is no "make test" target, but there is a test.c so the automatic
 # make rules catch it and tests fail
 RESTRICT="test"
+
+src_prepare() {
+	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index b07cccfb4425..c14ba7d64a0b 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -2,5 +2,5 @@ AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f9
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
 DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
 EBUILD dogtail-0.9.10.ebuild 1464 BLAKE2B 707006fbb69cedd095772958addd16c2a39c4e97aa259cf893184f9bb33470626b2862cc1e0c39844b1e041d6f2333f198106909d66977e160c6acc472d0bcd0 SHA512 9c36d94b486edaf956b0f5c103de2f8dc7670ed50f2782290a98166402c4d6aecff567100b691cf20a1d1695c936f66a8e44281992ed0de3ac92d508a17dec28
-EBUILD dogtail-0.9.11.ebuild 1343 BLAKE2B 54fb400662d250fefb0d9a65c26c0aae462eff92426b902b9f0ab297f50576ed4528f11e220f66d04bbcde728f4114d025cce1ecba1402a6458bfe94b9d13b0a SHA512 fe016869b89499ca65e9c621099487713e8906bb89a18421a7dbe1e908670981d07b47b2d5ff6cc90b8fb3154938cc1c2fe22b55af92eddb5a51574c262767e7
+EBUILD dogtail-0.9.11.ebuild 1342 BLAKE2B 782b061825d37ba33672b2ee1810b2b10e71435ed5eca7de897a76bb595b7ffe9fe1bcf101f0706b5186cb5b06d6dc8c4f1e8096659c7edafe114b643da98df4 SHA512 c34317e66974162f30ccfb0bfa53b9a1e36954e19c3aff25496a68b63cf6050db8c50155108f68e576596fa6230a986dd5a6f6126e7ac4121a89de4c2bc291df
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
index 8e4dd8f9d949..b04c186e096f 100644
--- a/dev-util/dogtail/dogtail-0.9.11.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9aec8b8efd2c..234bdd94bae5 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -6,6 +6,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
 EBUILD gdbus-codegen-2.60.7.ebuild 2015 BLAKE2B 2753c57ee4842a4ca3867e041d1767ababce6f569a0214a8f04df6963783ac297ccbac768a08b82cb9ea6ca9e9ba609b36b6ac818b311ef8a998d927648815b8 SHA512 a6771f6323bfc1e0fb7d117e940b5b48f02170861c337c24ca1cac0a13e1fca0200257d484ad7e22e46c19ee1b3b3c38469b4a0be5dd6b4b7379a8fb11c4827c
 EBUILD gdbus-codegen-2.62.5.ebuild 2052 BLAKE2B 4448c882cdb2b9673d18f7d5ee4c16e1a390fda6c84b0424c2eaf9f0a57b7f91078f7ba162c78f81f5c7fcc8c8ee3dfbedadadc98c8fe394312ebb37342990f1 SHA512 de6f2070c3ba0082ad0c1ccff51afd65e55d84447cc1a1dc9f0bed85596baeb2417598967c2357702825c2c7e0606752d98529cb98cc6a63a6ef493967e28a72
-EBUILD gdbus-codegen-2.62.6.ebuild 2045 BLAKE2B 844e47647c455dab33c9b53da960f80add565402e1e2a4cd53eaa0611174a203828fe1c2467a2e0461652870fa3093f8d1f8342e26d4d4f39f530541cf294d1a SHA512 2acd048c09776d1c19ee99e58f12ebfaee4460f4746de5d0f91bd87e4e615264805f45881e0646eff0a967efcc962e7805c06a23e1d836258a97e1653c33a15e
+EBUILD gdbus-codegen-2.62.6.ebuild 2044 BLAKE2B baede17993bbb3c89b25c52b52f33c39315698c831ceec45796bbff0d58f6d45cd702049b04368f7f512e43b2370e6c2582c6b6323c2b9c1086adf855c4604e9 SHA512 918513f6ecd8060fa92bf5fe1fd581d0a068c59a5fd84d6b3d28e46a6a12d59afe84681345e34fa8750652603f2dc611d5b8d7e181519c335f035297b0f984ef
 EBUILD gdbus-codegen-2.64.3.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
index 89edf673c366..15b556ac9383 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 30b0e19066e1..4968cf8d3ab7 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
 EBUILD glib-utils-2.60.7.ebuild 2390 BLAKE2B 1b5593fbfae292b25bf6131c5535f9133dff55d3e63089f5074c78bd8736e510220f277720c081ac7767ffff85e2393da4a8e0e127b13821e5f7fc5bd7d6c24b SHA512 3783dc9671c78d5aeab4fde397ac82654d63875b98e59bfd10cf0fe58fe392c76ebb2ef6d52cca9cdcdba84f600d6627912fdf2e2f7dd5b52b840fe67df199d3
 EBUILD glib-utils-2.62.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
-EBUILD glib-utils-2.62.6.ebuild 2392 BLAKE2B 64c91335e69aeb9a55aac916ff86a677f65aff8117eb589cc91a57c8917b5faf911cca5ad13dfc9c491f303f950c814e5c23651e36e4ad7519448e416ea7f13c SHA512 f7859638ad2563f1f95660135712788d6ca57983b20185204e81f6eca5f463205232710305760368a57fba6daf16cb8e32e48f3579b5ae586674e526e9ddba13
+EBUILD glib-utils-2.62.6.ebuild 2391 BLAKE2B b9a3b411db59990f439821ade51d07ffcb02cf3ff1cf899aafd392cb099ab34731a2918f62696e66e0d280883c7839dc0ac5deda1dd4b8e236180b129aa218de SHA512 908d771d53c4c669d3ad87f99ece433a1ba1cc213321a7d8120cbac9042cef6ea65fd5464bd6208f6458fe088fe13ef0ef1e86ebe42e72ccb261f7e92f570498
 EBUILD glib-utils-2.64.3.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
index 0e766bd21e33..609fe81551e7 100644
--- a/dev-util/glib-utils/glib-utils-2.62.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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"
+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"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index 3880a815de4c..339b84b92fed 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-am-1.25-r1.ebuild 1227 BLAKE2B ace0d550c2ebb0ff35b80242ba3dba196f0b0045d04b1584ca2b9832da02bf2c7c34d57cb82d98815ae1442824de9f8a9fda030f4826a2753264e498a3ad48cb SHA512 b43e74b4da2f9fc31ae02c117e1fba1d8d9ef809888a37a5b1d7d193009862d5b39ad5735d9ca8283ae7bf5e8258eb1c67ddb44b05bc216cc03ba4d8e752e97b
-EBUILD gtk-doc-am-1.32.ebuild 848 BLAKE2B 54f6b0d416abb0573fd665757f0c30578b7fefbeeb307cb758e557334e5673a39bedbc6f7afb5b22a9d5a98b4726f767496105923a3e1c4d72039daf79e2db7d SHA512 0bbddf1a302f8a73661da98f1b645d65b25d9710772562593a9c70efb1a6f51141d88766af51671d7f167c71874891d5066b8c4a79551b477b2fc14e8031d3c7
+EBUILD gtk-doc-am-1.32.ebuild 847 BLAKE2B 50f13a21898fbb610c2b49d8a251b42727fb811ff9b7d6292287abd36691635c22f27c3058dc4c648f35c18a7ab68f66867fff96cad1c7779320ca41f20fb83c SHA512 af2ea2e2b6be1ccf98780ab501e51e5f063d8bc8b65e01644c4ea2665c27a98dc58ce01a45c33d292534b27eeab7fee6eb7f47891a3ac255e0791775cb3365f4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index ffbbd4eae186..870d89ca37a0 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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=""
 DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 6378ec29232a..3076d09d4d71 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.25-r1.ebuild 2764 BLAKE2B c038d0737340ecc172d6bf11977b98ab45c22cfb36c412548c67f89e6b9fe09727a59100160bf9ff885b8e0453b84de9707cb6ed77cfb248ff6ce6bb6b585077 SHA512 95ac0021363d8b8bc6e0d9309f2d9c56d8ada1c8ba88ab75cad0f8ebfba66bebf5131745327867325dfbb66368f559e6f74c5e722083bbb21422c6c9ace4fef6
-EBUILD gtk-doc-1.32-r1.ebuild 2343 BLAKE2B 3b2278c291ea70adec84e6da9573e29f74e95eb2442f03c3e3d202534a4df7455be8a0b8cb292f71690f8b22f3a336186b468a7ad37dd67cf11bcf179cdc037f SHA512 2d5e8bf973576949952eb522e9a9a116447520b14f220fc62bcd526e54d6864eb30d3be19c06eaa0e6c5c89b41e638904a02d1dd87fedffa6be914c2f0e628ad
+EBUILD gtk-doc-1.32-r1.ebuild 2342 BLAKE2B d3917cf04b2fa85922bc50e658718c312a1cb5507527e0e4fd469332659cbd0ceef5762ae9cda04034f43788cea6609c66cab3a793bf79e2c3817aaad71c2c38 SHA512 77d48aa5b08502540fe9b08122559a5754571cf36454cd0fa17b01cb30e72141fb71fe5292ba33e5a758628863c38e3e78ded08d81bdeaa374e1874949ef11d2
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
index 0a487526542d..492342a831e7 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 9eaba4b9107c..8b1bf54b94ff 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-5.4.6.tar.xz 1046776 BLAKE2B b69539971ed666c7887e1aed0998da59c887000c785e965d2220e829e485f46c28e12e04b3c084681dd2a96dae1d4d5fa73bd2501359de8960f8bca0e64a1968 SHA512 6711dd9034054ce2bfd684d7fabb3349436a4a8ae0924b8a6ae56a8b39aa83d4501fec389cb73d3c4c20abcfcf8c5f7dd04f63e059b987adc7991806c7eee252
-DIST kdev-php-5.5.1.tar.xz 1060604 BLAKE2B 8c426b91d816291ac6cfb539dc157aa6eb8d61fe91c9d8a70f1e242b18a189e4dea83dfedf72cf62683f18a98d098e5df7197b71e74a698e56f31ad0497391dd SHA512 4f00292cc05014afe126027f44bbee1cee321bda20ece5c650e8b734fed99b84b4bc9cb56d0c789a5ff322d2820acfb013b2ec9a605fc4a0d60216333c6123e0
+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.1.ebuild 1239 BLAKE2B 3b5d44fc31da740ff5043c38251e67daf7cd061415502f3ad2ee423148ce5b47c6a6361e2bc44797230bb721fc610f7c07dc040757523a17dd41cc668185ea3e SHA512 795ed215b6749694961c4ce157a791149274bb8ab927105a63428bde8680efe8165a3d212d38f3852887a1a3d2c3c10ad2e03d4959e28c70fe66a17103ee3471
+EBUILD kdevelop-php-5.5.2.ebuild 1239 BLAKE2B 6526b2b49468286947a82f4b9162a78c703156adc092d072d13942358ef06291fcc099d88bff7ebecf2a824f534d259bdd7ab34550e6a958ade58cd759087a11 SHA512 378dac28bdb17e0a93465bd2b2ed66f91eabdf98ed09899786207d455d261d26de2ce0f4b2c5ef771dd97ee0424d716cb786ed00f5760440dac48db91ee6608b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.5.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
similarity index 100%
rename from dev-util/kdevelop-php/kdevelop-php-5.5.1.ebuild
rename to dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
index c5e4f236e045..dc3b73a1d4d4 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.5.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
@@ -12,13 +12,13 @@ QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.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=""
@@ -27,6 +27,10 @@ BDEPEND="
 	test? ( dev-util/kdevelop:5[test] )
 "
 DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -37,10 +41,6 @@ DEPEND="
 	>=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}"
 
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 89763a6dc3fa..76f0db35d199 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
-DIST kdev-python-5.5.1.tar.xz 1076108 BLAKE2B 9e6552cc6b4ef0c554a178bc384f903e25a5309727008a0f8de2b49d1d93da8b22241d08c811213b306f60795cdb94d489c4b20665f28fd51e17f953c34a2c3e SHA512 e690e6f0ff681e65a1ffad2b376b48baf3e17b003e368afcda54e19a19b6e72ec58c9d77c2e1e7976d84e2a9d9cfdf3406537444502a25eea752ccedba6a1e8a
+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.1.ebuild 1250 BLAKE2B 823a7361173f2f68962153521e765004ca8a0455839b0017adbfe3ec17dde7713d97477327022e3204335b94a8720a84e56058b041c29f49ec335cfca3328bf1 SHA512 444f7c15ba3dde15d287387631e2ec292294fa79f883b795682375f1f2a4a73c7d522a6de22d5dcf7f30f937449dedf5a2cc88684404eefd61e3787e50cd6dee
+EBUILD kdevelop-python-5.5.2.ebuild 1250 BLAKE2B dafd8b490d526fd076d91ec16dfd94fad989036b1e937bb8ac6fb8bd559044ebfde9dbd4787e3d44e3e58acfad7507baa75cce1f00b8d44c82cbabf5585929e7 SHA512 b6cb5a50cb1b4239b27aba1fc5936f6dea6a5cbe9835f770d436963b225b2a0e69cbae323d860f9479dac61a2a4141d252f95d9842dfd2ac1b98564e001be1c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
similarity index 100%
rename from dev-util/kdevelop-python/kdevelop-python-5.5.1.ebuild
rename to dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
index 577b80aedb68..37e1f1fdb0f2 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.5.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
@@ -10,13 +10,13 @@ KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org python-single-r1
 
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
 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=""
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index f60df6fa7ee9..a78e7e1fc748 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
-DIST kdevelop-5.5.1.tar.xz 7055180 BLAKE2B 1060ca3ecec61afdcbe421e1ae8f1e1ec21727a467154f51ec17fa36e70ad46eaf315743ad5e59011ec821e5459ef86dcee30a1da7673bae6d0531af2f7d5b1e SHA512 5255365280d0a27b998f5f7b850ee11995b03585409c152c27572a169f5b3d0f60b3d694f6e7009ebd7a2abc17e7f8e3ae1faad9d41f437be574ffa1953d530e
+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.1.ebuild 4370 BLAKE2B d56ca83e4142f558dd38315d8ef7ae70e38c60c590ec8f0e4853bc7a8a24e8628d3390e8f1eed674389c302495e8c788eda8478f33266296d0cc302c7f4788f6 SHA512 f4b63c880279f2b5b766ffe41b690539ed4fcc9cb06a326cf2dd314d0e8f3e9822e0129df752875763186d8a7cb28757c556b7d63dba41e70aba258f6e162254
+EBUILD kdevelop-5.5.2.ebuild 4361 BLAKE2B a27a2360ed1c627321a10e67fb0fa502c00277c00c6f008799e61b732651610b12c9a0fc16e6db311d0be5e0134f138e157d16e824bbabe442e6abd0be8aaa8b SHA512 bf02f90de84c5ffb66b3ba1767e5eb5efcac047c8cbcb90638a4e3368772dc290ee3a21593f9cb956aeeefb1caf4d9bf35c2155c7172d9ed15e92fc9f8ae161c
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.5.1.ebuild b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
similarity index 98%
rename from dev-util/kdevelop/kdevelop-5.5.1.ebuild
rename to dev-util/kdevelop/kdevelop-5.5.2.ebuild
index 8a1b38d4f27b..8318287c0609 100644
--- a/dev-util/kdevelop/kdevelop-5.5.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
@@ -11,13 +11,13 @@ VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	KEYWORDS="~amd64 ~arm64 ~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/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
@@ -33,6 +33,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -62,9 +63,8 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
-	kde-apps/libkomparediff2:5
 	>=sys-devel/clang-6.0:=
-	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5= )
+	gdbui? ( kde-plasma/libksysguard:5= )
 	hex? ( app-editors/okteta:5 )
 	plasma? (
 		>=kde-frameworks/krunner-${KFMIN}:5
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
index 323539bd6bfe..f45f5bd2b10b 100644
--- a/dev-util/molecule-core/Manifest
+++ b/dev-util/molecule-core/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
-EBUILD molecule-core-1.0.2-r1.ebuild 587 BLAKE2B 7eb94ada47663c32ef6b97955e61c900e4119b0979e69ac7117fcebff9eac8c46812cee8b4e18871ddb1fd784c9afb42698238b5df76ef828a57f8b82281997a SHA512 ed6a96bf55ab5c6e4f3c5a396012a0636792ea6b7b0c8a944c72cd398cba1a62162495023f4d3c39982024ae8f5142bf209a44c341be4677847d7c71aca90436
+EBUILD molecule-core-1.0.2-r1.ebuild 588 BLAKE2B fbb11c547883fab0e5b66436b9344f68b00dd82fa0bdbd69053e4bdd7a0e3e85b141ad1dc06ac145f4974ed3513820b30bb172a2b812ed0a2ab280b6274d625c SHA512 b5e910632e4949a9bb5865761267cd2968d5fb4de786e9fda2b2df6bfd424fe2f52017e83313377e3e5e72edd24b8ce4dfba398fafd185b87e8e85239bdfaa1e
 MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
index 1173884ce372..c524412e7975 100644
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit python-r1
 
 DESCRIPTION="Sabayon distro-agnostic images build tool"
-HOMEPAGE="http://www.sabayon.org"
+HOMEPAGE="https://www.sabayon.org"
 SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index 8db1926f40ab..6dde50ed858b 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
-EBUILD molecule-plugins-1.0.3.ebuild 642 BLAKE2B 4867aaa2107dcb5f0cd482ccee8d7e789005a274fb9eac3f5ae56dc99d257994a41994b8273434baaffb4b864f397e08712043ba2530e296cbd47cb2d220f5d4 SHA512 1f36da7f422e8d83b487229f3ce5d8dbc66214efda6141403676865217098737a6d13d11ac641e8ba1f155802af7ad970ba558ee1129ac07281754d8894abdd1
+EBUILD molecule-plugins-1.0.3.ebuild 643 BLAKE2B 5355e2e32816444421092998bc55c57a741c1c7322e923c0d03ffc9688a174ff14800ceb7edb96629a89526a9462183c3bdfc08672f92551448518196a3aedfc SHA512 1fba908f98ea65de1eda99615e729e9da9a7e9994a1e1244d4a35d13efc2a1b81353a8445e1e8dbaccb6a79a5e7c57142e4122a7fc913f05afd825f8fcb74724
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
index b5a6cb0905f5..6227d3cb8fba 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit python-r1
 
 DESCRIPTION="A set of base plugins for Molecule"
-HOMEPAGE="http://www.sabayon.org"
+HOMEPAGE="https://www.sabayon.org"
 SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-util/molecule/Manifest b/dev-util/molecule/Manifest
index 9ddf6fcca51d..9d005a507453 100644
--- a/dev-util/molecule/Manifest
+++ b/dev-util/molecule/Manifest
@@ -1,2 +1,2 @@
-EBUILD molecule-2.ebuild 412 BLAKE2B db88d5bcca6b3b2958722af3bca51337bb835a3f840d8c18449ec236fde57507eb15c5a743ef79d4bf04ccd95d1281e30c24526f27a2f1134b0a414ea1d762b1 SHA512 c8151d3c5311d4684ac6407591666cf175d9007f7a9c9f7dd741104f48602c1ddc50262c139ab60aa4374d2688def5d711afe12c01a43cc1df68bc5099888ca0
+EBUILD molecule-2.ebuild 410 BLAKE2B 92beb523963a2b0de5294e9c8fff1b7bbb5d6b526511c83fe54e6560ce767a85a089f19c946be86b286ec40f97b982ade5231c5788ba8a3bb1d01b972a96c16c SHA512 463dbc7047516789646336c04396bc1a8779bf84300919857336c3f88669e7a6afb6b69233b1a7c00f6dc7faa8a8ba29fb9beb66707e551b6b6163f598d40d28
 MISC metadata.xml 346 BLAKE2B 830af22619d9811dc4fe57284341e78745cadff972125d644a02453a2b4dda0ca787d7826a1f7b029b1b66f1242b49a561b1d9bca83b491ab4b1440904657761 SHA512 375fa961d0458d6e8ee556a76fcd9396b9b415880af196592b27aaffd02f5c68f8a8a8b2fe4a8346b2fb18aa94b2c0c2e806ff221f9f3a80fa8cc0700a8c4a5b
diff --git a/dev-util/molecule/molecule-2.ebuild b/dev-util/molecule/molecule-2.ebuild
index d03edd9c576b..65f34e44ba35 100644
--- a/dev-util/molecule/molecule-2.ebuild
+++ b/dev-util/molecule/molecule-2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Meta package for dev-util/molecule-core and dev-util/molecule-plugins"
-HOMEPAGE="http://www.sabayon.org"
+HOMEPAGE="https://www.sabayon.org"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 760392388140..91c2122f74b6 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -6,6 +6,7 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
 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-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
 DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
@@ -14,4 +15,5 @@ EBUILD perf-4.14.33-r1.ebuild 5059 BLAKE2B 3bae91131eb7c24b152dbeac414057d1e5ba0
 EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138
 EBUILD perf-5.4.20.ebuild 6651 BLAKE2B e1a091114d71ba1c01f838b8d5ff372e2adad012769b973a2e79d662f6c5f6ed6fd97b2f7be880bfc57fbb99c549c487a084bf2450a935dc34ef22725268047a SHA512 e14917b4e051d3734fa515f3dbf61a2fe2cfdbe5b3aed29b9ce3b05e70609a13276d5f8fd0522f0b4addca16abdd986fb70b16d2b51f1204d02df848b64e6138
 EBUILD perf-5.6.14.ebuild 6406 BLAKE2B 81ae8af3e1380ed33baf0260b6151280ce7eba072c5d2e12d379a4af7de3a394286a28781367317f7e61c3f4dc053d43df501e5df5e28981beec94e3f216849d SHA512 5a4013d3ba171c99c2454ab59e5ee4f603ecd2c5b8f46675eb41005554fcf0ce8abba103cff836febef9c8e12c19e3bebfdb20ea553de468b6de1a33fae6a75e
+EBUILD perf-5.7.ebuild 6406 BLAKE2B 81ae8af3e1380ed33baf0260b6151280ce7eba072c5d2e12d379a4af7de3a394286a28781367317f7e61c3f4dc053d43df501e5df5e28981beec94e3f216849d SHA512 5a4013d3ba171c99c2454ab59e5ee4f603ecd2c5b8f46675eb41005554fcf0ce8abba103cff836febef9c8e12c19e3bebfdb20ea553de468b6de1a33fae6a75e
 MISC metadata.xml 1355 BLAKE2B adf93b8b750786b9c181b5f4b4477883a365a07201da711d9ea535321d45b9c656397c46bd5f64a740d83e8acf4f2fea837a5a1eac754e9aa9f09692fe1d4d2b SHA512 3e489bb5b3556255d68bcffb3d7a377951da0470ea8e0a89dbc952d0029083fba7f7fd3c6f8a725bfa44c6e4d51871e2376b251f44a4295302be167d55dffb9f
diff --git a/dev-util/perf/perf-5.7.ebuild b/dev-util/perf/perf-5.7.ebuild
new file mode 100644
index 000000000000..afc8951d08d5
--- /dev/null
+++ b/dev-util/perf/perf-5.7.ebuild
@@ -0,0 +1,236 @@
+# 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 bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-2)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	crypt? ( dev-libs/openssl:0= )
+	clang? (
+		<sys-devel/clang-10:*
+		<sys-devel/llvm-10:*
+	)
+	demangle? ( sys-libs/binutils-libs:= )
+	gtk? ( x11-libs/gtk+:2 )
+	java? ( virtual/jre:* )
+	lzma? ( app-arch/xz-utils )
+	numa? ( sys-process/numactl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	slang? ( sys-libs/slang )
+	systemtap? ( dev-util/systemtap )
+	unwind? ( sys-libs/libunwind )
+	zlib? ( sys-libs/zlib )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.19
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	java? ( virtual/jdk )
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+	local paths=(
+		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+		scripts include lib "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${WORKDIR}"/${P}.patch
+		popd || die
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		"${S}"/Makefile.perf || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+
+	# Fix shebang to use python from prefix
+	if [[ -n "${EPREFIX}" ]]; then
+		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
+	fi
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+
+	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+	local arch=$(tc-arch-kernel)
+	local java_dir
+	use java && java_dir="/etc/java-config-2/current-system-vm"
+	# FIXME: NO_CORESIGHT
+	# FIXME: NO_LIBBABELTRACE
+	emake V=1 VF=1 \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		ARCH="${arch}" \
+		JDIR="${java_dir}" \
+		LIBCLANGLLVM=$(usex clang 1 "") \
+		NO_AUXTRACE="" \
+		NO_BACKTRACE="" \
+		NO_CORESIGHT=1 \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		NO_JVMTI=$(puse java) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBBABELTRACE=1 \
+		NO_LIBBIONIC=1 \
+		NO_LIBBPF="" \
+		NO_LIBCRYPTO=$(puse crypt) \
+		NO_LIBDW_DWARF_UNWIND="" \
+		NO_LIBELF="" \
+		NO_LIBNUMA=$(puse numa) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_SDT=$(puse systemtap) \
+		NO_SLANG=$(puse slang) \
+		NO_LZMA=$(puse lzma) \
+		NO_ZLIB= \
+		WERROR=0 \
+		LIBDIR="/usr/libexec/perf-core" \
+		"$@"
+}
+
+src_compile() {
+	# test-clang.bin not build with g++
+	if use clang; then
+		pushd "${S_K}/tools/build/feature/" || die
+		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+		popd
+	fi
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	_install_python_ext() {
+		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+	}
+
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+	if use python; then
+		python_foreach_impl _install_python_ext
+	fi
+
+	rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+	if use gtk; then
+		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
+	fi
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		HTML_DOCS="Documentation/*.html" einstalldocs
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 0de6f4817210..aacf1b464133 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,7 +1,7 @@
-AUX plan9port-builderr.patch 936 BLAKE2B 7cf8a229fdf33823522d8de0bf465a7065d74078d5f16391b21c6a2c0de4f6764e07a50680ed21038205d27fa6e2e550ababd24e7e37d76a024d568e22494f61 SHA512 d95e6c5b4b75d54167721f7250288b8640945ebeb10ff346e989a4690828bb8448e46cbcf30d5e35c27d094680b2995ca04b8106c4dce083260f605fc2024d84
-AUX plan9port-cflags.patch 328 BLAKE2B 2f96d9b44760655807cfe845193fe8bca3faf2eb6b1bf3c024c554da4cc90c4dd41454d20ea4c7b065fe2351c9f51cf01dc7437597e619232233c9cedcb3e02c SHA512 281b236893cc1efde75d7fc5160168c8602a5eff27229f9b0e2b1284ac36cf73fdbd22f2ae4d3776556f7b881ad63f4dd68d56628942ca6e84abca12b93616bc
-AUX plan9port-freebsd-10.patch 265 BLAKE2B 0a942f899bd05d3ad671134a3277a5bf8e41bf2fc7ab8c11a8be9cd27a2c334a85a44e583d36efb1253347f0877171cf82094f18a2e9a4251df9ca8259a5ff74 SHA512 69c8d4ee824afb453bd4ebc8ba9af3e73c37fd31e40d92ae62685a9a6916571ed16e8f3eee8aff32e2db96177439fa34e52bba8d7c52a296328ae1d9d3767c19
-AUX plan9port-noexecstack.patch 984 BLAKE2B 5e7dc7b084096b3b49eda81e244dc16849fe7fb66bc17b15fcba2d35aec63067eb75dff73ea74bad02878e50353ba145ba101ade8e086434a5be2568c416df02 SHA512 160f0a793345603c4c905e65a6fa4a25b1a1c1084f0eadd4ada49ba5b6efc48b975031d14926fdfc2bd48d2e3860c987da449d9d9973038ab510f42528383da8
-DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851 BLAKE2B 89e2a8dcdf650cc3640ef0ba496f1c22e74831fda2e4a51cf8419c496da5a480a10324eb295369e9192defbd3c6411ea351bba1c6bdec5d72bc4ee397da58114 SHA512 3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099
-EBUILD plan9port-20140306-r4.ebuild 3536 BLAKE2B 257db122e1fbd1939aa60dd640cccd5c461792dddd05fa168b6b89e4813c5089781fd6c5c4ebe45131ac25112cf86fcf459905ed379d928b5a3f3d14f30efb5f SHA512 290a3824ee3aaaa2a813f2e703b16851988126e1d7c1636552767529fb9bcbc01edf86851d6869f1000df71bb8ce8a0fa34af807810c6dd87702e6a9e711685f
+AUX plan9port-builderr.patch 882 BLAKE2B 1526bad2833a416cfb214f047f2f14bda89ca82293fa45c02e8165a4ee6050adccea91e2ac2e4d898b6c5b2005afddc82373f16939fe392b141bf664c5afea84 SHA512 38d071d37683f6408f948ee5dea2772ea988945da80c349cdf1731641010d7bff391468c9d4e65507a2a545d3d02a899ade4ea68ac476664e39bb68e587e4940
+AUX plan9port-cflags.patch 312 BLAKE2B d09a4bb70451beb0cb6de05be37c6d68334d51f4db882debde4e3f3accf3aec25054ad5411a3c7289df6b556f59c1a729005f1c21247545158879c429462843d SHA512 29c4419bbc36330b322541b625bbe9131ed14d01008ba2ab2865a175918506de1e96a2b078246d1d6b6bc48537f90f74b1a72b223d74dc73d13cb7cf63d33c58
+AUX plan9port-noexecstack.patch 951 BLAKE2B 76df9fda4dc0124be25dd562ed804f6be75438c426a4e50b86e5806f34624f30a51ad30dd403a4a7ffd0829bc658cd307ed4c148de299016a1bf767011e6889e SHA512 1cb3defd59c3dd86474e23cc5b0ac397f645ab5a0b476a7f3532bee62bf5d2ffb1996945baed755e7cd61060bf8713b227c67472ca0f1a45ceab9aa82c524883
+DIST plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz 23445647 BLAKE2B 4cb0f08fc404c5618c4be0d7e5710e6a8a32fbe010d28a879b1f9575118256492a3ed2b9b744c35dbbb6c6deae405c05fd7b6606254fb94fc2b40b3a8d14fa71 SHA512 4d9f6ce66d3eebb311cbbb0ec27c01d99cc0e19c6ac8a1c511ff00070c085a349b637048cd0066240af975e90f527388dbeba58f4591bf7dcaa673ee5564430f
+EBUILD plan9port-0_pre20200526.ebuild 3497 BLAKE2B 572e4e4354f4caa1b8ee64defafbdb97e93904b03d4d902d8bc5bb3d7b7b814d998d32e95e3298f57156cdca770a35251f6c1706d035ac6393406e690f57c922 SHA512 317f1de1ec6e17cd084fe930e38d8fa84ee03a6fd5b73c3e4c5b81fa8c4b9de2fac525ff40da8050350d7719f74b34b01a943d86bd5bd338b25500af4ad51a86
+EBUILD plan9port-9999.ebuild 3347 BLAKE2B b26dd95b59ee9603a7506a25e15ac949c986c00c03b558832adcfff0365dfd32d2bccb54deb0e1bce1e1b779ee4535a36f450125e08181628cf2787606542527 SHA512 70f79b52d1d3ca4bcf665eb07e30c9d236167c67da51538c046e2474faea585fd48227b8ad57a875995e212913ed983444b28b0690521b4f0f693ea03e78dc31
 MISC metadata.xml 485 BLAKE2B 562cc265d88d43f48e39421d1ee8be547b74741a6ef9fa4ac6c46ae9fe19d8f1745b71439d21a95370eae39cd0ad5b87b710be375f4141510f6510fa5a721186 SHA512 655f45ad6e519ef7d350fd5df2ad4bb77e08730d80f3da2fc4572522d162279af23e82a79df55b2952135c8348565e1d706c38b1576ec2fd7e68a422deddf068
diff --git a/dev-util/plan9port/files/plan9port-builderr.patch b/dev-util/plan9port/files/plan9port-builderr.patch
index 266f10c4b9d5..b1f3d1275ce8 100644
--- a/dev-util/plan9port/files/plan9port-builderr.patch
+++ b/dev-util/plan9port/files/plan9port-builderr.patch
@@ -4,15 +4,15 @@ By default, the plan9port INSTALL script doesn't report build error,
 which can result in a mostly broken build begin installed.
 --- a/INSTALL
 +++ b/INSTALL
-@@ -41,7 +41,6 @@ echo " "
- echo "* Resetting $PLAN9/config"
- rm -f config
+@@ -65,7 +65,6 @@
+ 	;;
+ esac
  
 -(
- echo "* Compiler version:"
- 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/	/'
- 
-@@ -134,7 +133,7 @@ if $dobuild; then
+ if [ `uname` = SunOS ]; then
+ 	# On Solaris x86, uname -p cannot be trusted.
+ 	echo "* Running on Solaris: checking architecture..."
+@@ -159,7 +158,7 @@
  		echo "* Warning: not all binaries built successfully."
  	fi
  	echo "* Installing everything in $PLAN9/bin..."
@@ -21,7 +21,7 @@ which can result in a mostly broken build begin installed.
  	if [ ! -x $PLAN9/bin/cleanname -o ! -x $PLAN9/bin/acme -o ! -x $PLAN9/bin/sam ]; then
  		echo " "
  		echo "* Warning: not all binaries built successfully."
-@@ -182,5 +181,4 @@ if $doinstall; then
+@@ -211,5 +210,4 @@
  	echo "	PLAN9=$PLAN9 export PLAN9"
  	echo '	PATH=$PATH:$PLAN9/bin export PATH'
  fi
diff --git a/dev-util/plan9port/files/plan9port-cflags.patch b/dev-util/plan9port/files/plan9port-cflags.patch
index c2d2ed6defe5..74bd60518d08 100644
--- a/dev-util/plan9port/files/plan9port-cflags.patch
+++ b/dev-util/plan9port/files/plan9port-cflags.patch
@@ -5,10 +5,10 @@ This allows the plan9port build to inherit cflags from the environment.
 (This patch must be applied after plan9port-noexecstack.patch)
 --- a/src/mkhdr
 +++ b/src/mkhdr
-@@ -28,8 +28,6 @@ LD=9l
+@@ -11,8 +11,6 @@
+ LD=9l
  AS=9a
  AR=9ar
- INSTALL=install
 -CFLAGS=
 -LDFLAGS=
  AFLAGS=--noexecstack
diff --git a/dev-util/plan9port/files/plan9port-freebsd-10.patch b/dev-util/plan9port/files/plan9port-freebsd-10.patch
deleted file mode 100644
index cc46dc6f4509..000000000000
--- a/dev-util/plan9port/files/plan9port-freebsd-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bin/9l	2015-12-09 19:12:50.000000000 +0000
-+++ b/bin/9l	2015-12-09 19:13:00.000000000 +0000
-@@ -19,7 +19,7 @@ case "$tag" in
- 	5.2.*)
- 		extralibs="$extralibs -lkse"
- 		;;
--	[5-9].*)
-+	[5-9].*|10.*)
- 		extralibs="$extralibs -lpthread"
- 		;;
- 	esac
diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch
index fb4f19f21fc5..aff60d07a989 100644
--- a/dev-util/plan9port/files/plan9port-noexecstack.patch
+++ b/dev-util/plan9port/files/plan9port-noexecstack.patch
@@ -22,7 +22,7 @@ Patch by Andy Spencer
  test -f $PLAN9/config && . $PLAN9/config
  
  aflags=""
-@@ -17,5 +12,16 @@ Darwin-*x86_64*)
+@@ -17,5 +12,16 @@
  	;;
  esac
  
@@ -43,8 +43,8 @@ Patch by Andy Spencer
 +exec as $aflags $opts -o $dst $src
 --- a/src/mkhdr
 +++ b/src/mkhdr
-@@ -30,7 +30,7 @@ AR=9ar
- INSTALL=install
+@@ -13,7 +13,7 @@
+ AR=9ar
  CFLAGS=
  LDFLAGS=
 -AFLAGS=
diff --git a/dev-util/plan9port/plan9port-0_pre20200526.ebuild b/dev-util/plan9port/plan9port-0_pre20200526.ebuild
new file mode 100644
index 000000000000..dff9e3605a98
--- /dev/null
+++ b/dev-util/plan9port/plan9port-0_pre20200526.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs readme.gentoo-r1
+
+MY_HASH="a6ad39aaaa36b8aadc5c35bfc803afbde32918c0"
+MY_P="${PN}-${MY_HASH}"
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="https://9fans.github.io/plan9port/
+	https://github.com/9fans/plan9port"
+SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X aqua truetype"
+REQUIRED_USE="?? ( X aqua )"
+
+DEPEND="
+	X? ( x11-apps/xauth )
+	truetype? (
+		media-libs/freetype
+		media-libs/fontconfig
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-noexecstack.patch"
+	"${FILESDIR}/${PN}-cflags.patch"
+	"${FILESDIR}/${PN}-builderr.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+PLAN9="/opt/plan9"
+EPLAN9="${EPREFIX}${PLAN9}"
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+DOC_CONTENTS="Plan 9 from User Space has been successfully installed into
+${PLAN9}. Your PLAN9 and PATH environment variables have
+also been appropriately set, please use env-update and
+source /etc/profile to bring that into immediate effect.
+
+Please note that ${PLAN9}/bin has been appended to the
+*end* or your PATH to prevent conflicts. To use the Plan9
+versions of common UNIX tools, use the absolute path:
+${PLAN9}/bin or the 9 command (eg: 9 troff)
+
+Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+DISABLE_AUTOFORMATTING="yes"
+
+src_prepare() {
+	default
+
+	case "${CHOST}" in
+		*apple*)
+			sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
+				die "Failed to sed AFLAGS" ;;
+	esac
+
+	# don't hardcode /bin and /usr/bin in PATH
+	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
+
+	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
+	sed -Ei -e 's,-I/usr(|/local)/include ,,g' \
+		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \
+		src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) ||
+		die "sed failed"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) ||
+		die "sed failed"
+}
+
+src_configure() {
+	local -a myconf=(
+		CC9="$(tc-getCC)"
+		CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
+	)
+
+	if use X; then
+		myconf+=( WSYSTYPE=x11 )
+	elif use aqua; then
+		local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \
+			<<< "${MACOSX_DEPLOYMENT_TARGET}")"
+		myconf+=( WSYSTYPE="${wsystype}" )
+	else
+		myconf+=( WSYSTYPE=nowsys )
+	fi
+
+	if use truetype; then
+		myconf+=( FONTSRV=fontsrv )
+	else
+		myconf+=( FONTSRV= )
+	fi
+
+	printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
+		die "cannot create configuration"
+}
+
+src_compile() {
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	NPROC="$(makeopts_jobs)" ./INSTALL -b ||
+		die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	# do* plays with the executable bit, and we should not modify them
+	dodir "${PLAN9}"
+	cp -a * "${ED}${PLAN9}" || die "cp failed"
+
+	# build the environment variables and install them in env.d
+	newenvd - 60plan9 <<-EOF
+		PLAN9="${EPLAN9}"
+		PATH="${EPLAN9}/bin"
+		ROOTPATH="${EPLAN9}/bin"
+		MANPATH="${EPLAN9}/man"
+	EOF
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/plan9port/plan9port-20140306-r4.ebuild b/dev-util/plan9port/plan9port-20140306-r4.ebuild
deleted file mode 100644
index 68a51b267f4e..000000000000
--- a/dev-util/plan9port/plan9port-20140306-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multiprocessing toolchain-funcs
-
-MY_HASH="e78ed7a67bbaa37dc57dfb37219f505c48755e14"
-MY_P="${PN}-${MY_HASH}"
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/"
-SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X aqua truetype"
-REQUIRED_USE="?? ( X aqua )"
-
-DEPEND="X? ( x11-apps/xauth )
-	truetype? ( media-libs/freetype
-	            media-libs/fontconfig )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PLAN9=/usr/lib/plan9
-EPLAN9="${EPREFIX}"${PLAN9}
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
-	case ${CHOST} in
-		*freebsd10.*)  # patch 9l to use -pthread also on FreeBSD-10
-			epatch "${FILESDIR}/${PN}-freebsd-10.patch" ;;
-		*apple*)
-			sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
-			die "Failed to sed AFLAGS" ;;
-	esac
-
-	# don't hardcode /bin and /usr/bin in PATH
-	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
-
-	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
-	for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
-		$(find -name makefile); do
-		sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
-		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" ${f} \
-		|| die "sed on ${f} failed"
-	done
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	grep  --null -l -r '/usr/local/plan9' |
-	xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
-}
-
-src_configure() {
-	local myconf=()
-	if use X; then
-		myconf+=("X11=${EPREFIX}/usr" WSYSTYPE=x11)
-	elif use aqua; then
-		local wsystype=$(echo ${MACOSX_DEPLOYMENT_TARGET} |
-		awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}')
-		myconf+=("WSYSTYPE=${wsystype}")
-	else
-		myconf+=(WSYSTYPE=nowsys)
-	fi
-
-	if use truetype; then
-		myconf+=(FONTSRV=fontsrv)
-	else
-		myconf+=(FONTSRV=)
-	fi
-	printf '%s\n' "${myconf[@]}" >> LOCAL.config
-}
-
-src_compile() {
-	export NPROC=$(makeopts_jobs)
-	export CC9=$(tc-getCC)
-
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
-}
-
-src_install() {
-	dodir "${PLAN9}"
-
-	# P9P's man does not handle compression
-	docompress -x $PLAN9/man
-
-	# do* plays with the executable bit, and we should not modify them
-	cp -a * "${ED}/${PLAN9}"
-
-	# build the environment variables and install them in env.d
-	cat > "${T}/60plan9" <<-EOF
-		PLAN9="${EPLAN9}"
-		PATH="${EPLAN9}/bin"
-		ROOTPATH="${EPLAN9}/bin"
-		MANPATH="${EPLAN9}/man"
-	EOF
-	doenvd "${T}/60plan9"
-}
-
-pkg_postinst() {
-	elog "Plan 9 from User Space has been successfully installed into"
-	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
-	elog "also been appropriately set, please use env-update and"
-	elog "source /etc/profile to bring that into immediate effect."
-	elog
-	elog "Please note that ${PLAN9}/bin has been appended to the"
-	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
-	elog "versions of common UNIX tools, use the absolute path:"
-	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
-	elog
-	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-}
diff --git a/dev-util/plan9port/plan9port-9999.ebuild b/dev-util/plan9port/plan9port-9999.ebuild
new file mode 100644
index 000000000000..4c1e286476b1
--- /dev/null
+++ b/dev-util/plan9port/plan9port-9999.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs git-r3 readme.gentoo-r1
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="https://9fans.github.io/plan9port/
+	https://github.com/9fans/plan9port"
+EGIT_REPO_URI="https://github.com/9fans/${PN}.git"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+IUSE="X aqua truetype"
+REQUIRED_USE="?? ( X aqua )"
+
+DEPEND="
+	X? ( x11-apps/xauth )
+	truetype? (
+		media-libs/freetype
+		media-libs/fontconfig
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-noexecstack.patch"
+	"${FILESDIR}/${PN}-cflags.patch"
+	"${FILESDIR}/${PN}-builderr.patch"
+)
+
+PLAN9="/opt/plan9"
+EPLAN9="${EPREFIX}${PLAN9}"
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+DOC_CONTENTS="Plan 9 from User Space has been successfully installed into
+${PLAN9}. Your PLAN9 and PATH environment variables have
+also been appropriately set, please use env-update and
+source /etc/profile to bring that into immediate effect.
+
+Please note that ${PLAN9}/bin has been appended to the
+*end* or your PATH to prevent conflicts. To use the Plan9
+versions of common UNIX tools, use the absolute path:
+${PLAN9}/bin or the 9 command (eg: 9 troff)
+
+Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+DISABLE_AUTOFORMATTING="yes"
+
+src_prepare() {
+	default
+
+	case "${CHOST}" in
+		*apple*)
+			sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
+				die "Failed to sed AFLAGS" ;;
+	esac
+
+	# don't hardcode /bin and /usr/bin in PATH
+	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
+
+	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
+	sed -Ei -e 's,-I/usr(|/local)/include ,,g' \
+		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \
+		src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) ||
+		die "sed failed"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) ||
+		die "sed failed"
+}
+
+src_configure() {
+	local -a myconf=(
+		CC9="$(tc-getCC)"
+		CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
+	)
+
+	if use X; then
+		myconf+=( WSYSTYPE=x11 )
+	elif use aqua; then
+		local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \
+			<<< "${MACOSX_DEPLOYMENT_TARGET}")"
+		myconf+=( WSYSTYPE="${wsystype}" )
+	else
+		myconf+=( WSYSTYPE=nowsys )
+	fi
+
+	if use truetype; then
+		myconf+=( FONTSRV=fontsrv )
+	else
+		myconf+=( FONTSRV= )
+	fi
+
+	printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
+		die "cannot create configuration"
+}
+
+src_compile() {
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	NPROC="$(makeopts_jobs)" ./INSTALL -b ||
+		die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	# do* plays with the executable bit, and we should not modify them
+	dodir "${PLAN9}"
+	cp -a * "${ED}${PLAN9}" || die "cp failed"
+
+	# build the environment variables and install them in env.d
+	newenvd - 60plan9 <<-EOF
+		PLAN9="${EPLAN9}"
+		PATH="${EPLAN9}/bin"
+		ROOTPATH="${EPLAN9}/bin"
+		MANPATH="${EPLAN9}/man"
+	EOF
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index d169b2897c08..8193fc74f0f0 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,3 +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 676 BLAKE2B d53a85d5cbb269b57cc1c22e0861682f66a1fae4d664c5acdd1c495e77b1077071945a2e4c93fa7ab2c0b71f001c8752c409edfe20c223baa6ff2a36f863fb06 SHA512 c332ec872e1dbaa57aee43fa21b8dfd7bef0adc19f7c64529138b2a20df0717900a14ba855ec65828ca1ad1abf4d6c024034970107491a8baf4de2afb168a3fd
 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/files/rebar-erlang23.diff b/dev-util/rebar/files/rebar-erlang23.diff
new file mode 100644
index 000000000000..da4835a8b28d
--- /dev/null
+++ b/dev-util/rebar/files/rebar-erlang23.diff
@@ -0,0 +1,12 @@
+diff -Naurp a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl
+--- a/src/rebar_port_compiler.erl	2016-08-31 16:47:31.000000000 +0200
++++ b/src/rebar_port_compiler.erl	2020-05-23 13:03:22.464682124 +0200
+@@ -673,7 +673,7 @@ default_env() ->
+                        "\" "
+                       ])},
+      {"ERL_EI_LIBDIR", lists:concat(["\"", erl_interface_dir(lib), "\""])},
+-     {"ERL_LDFLAGS"  , " -L$ERL_EI_LIBDIR -lerl_interface -lei"},
++     {"ERL_LDFLAGS"  , " -L$ERL_EI_LIBDIR -lei"},
+      {"ERLANG_ARCH"  , rebar_utils:wordsize()},
+      {"ERLANG_TARGET", rebar_utils:get_arch()},
+ 
diff --git a/dev-util/rebar/rebar-2.6.4-r1.ebuild b/dev-util/rebar/rebar-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..ea5c7125e53a
--- /dev/null
+++ b/dev-util/rebar/rebar-2.6.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://github.com/rebar/rebar"
+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"
+IUSE=""
+
+RDEPEND="dev-lang/erlang:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/rebar-erlang23.diff" )
+
+src_test() {
+	emake xref
+}
+
+src_install() {
+	dobin rebar
+	dodoc rebar.config.sample THANKS
+	dobashcomp priv/shell-completion/bash/${PN}
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index a40cfbdd84b7..192081a739a4 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,11 +3,11 @@ AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021
 AUX strace-5.6-AR.patch 629 BLAKE2B 91504e623c5c1710e382287fdadd8005c5a76f4a6d5b8b6d83dd9fc4a31259c241e1382e9a981abf2a2a70d0b5db8b46ca8c973e49bedd64c428e2be89affd18 SHA512 49631c075e7f0cd6ef3aa5ef4c3e734147a32f920733311a320b4b85e7e6aa9b21733a9dd3a76e0e42bf2d9d9d7a46a371ae43bcdf6a040f33c626c34a65e32e
 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
-DIST strace-5.5.tar.xz 1628744 BLAKE2B ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d SHA512 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231
 DIST strace-5.6.tar.xz 1775292 BLAKE2B 6e674e4a1b70a3ebb28aa0097baa07efc7dce18039a3a7d535b4c8b3fc1b11c59ef1eb79e58bbf4b9e2b9621d0840958ba5785d22d0cdcb4c00fb5fa2a3288c1 SHA512 58c8a250e55a018206bee9468ea057c087d5d5bb523339ea3c01e0a19d8f84c95bd1398d66a6dca6ada45c6535aa44b776713a2bb080eebaa734ffb926ac5b38
+DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
 EBUILD strace-5.3.ebuild 2323 BLAKE2B 02812e696ba9c1f24bb8ea9b7cb21ce1ec6afc9bd5dedb2d70c3bc9b88c4523745333070be4d2a0c9297533a636964efd02b1d1ae33ed025251d18074081d114 SHA512 8c2b4b7e6a9119d226117f72209ec360365615670092370faa22fa605f0afd583749f008146eb59afafefaaab9f634b512c0893e0d10b896e7bd6221e51a7f58
 EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
-EBUILD strace-5.5.ebuild 2331 BLAKE2B e86b36d25ebf6558d84f7ec96a499e50bb0550b6943e2e6fc3e5a71a08a3a9f8cc85b51355f6158eb03191e6cd821e3c2fee387c03ec97973944d4278e9991cf SHA512 0936fa36a65e028cccd9d42dfc614448fa381fce3682f4f26cf5f4fee83f69a6c8002e42abb62cee62a1d01fe9793f65eca313dda5d9a348a1905bb34860ef2f
 EBUILD strace-5.6.ebuild 2390 BLAKE2B 5ddf8f82a86da09956e593af6ba4d61645ff506f36db87ae5fa8d66c33646eadb67dcd3ead14e16db05578c8966eaf72dedec70e0da10aac9576b0a73831a63f SHA512 837bfb8e72e02ee1cc668cf7c149de669062587ed7d2fe3dd88ee1d88720a3811cba1bf03dafee7a1c0a7dc2dafeaeb0ea78566477638c2778184585d5078857
+EBUILD strace-5.7.ebuild 2355 BLAKE2B 7a3c90be9f839968e4b7355c80cfec5d9aacfe738af9bd8e8e128a64f7f54816850173e497d28e14087ba49e3c9c80e7b0dc2bc6f9f39aeee279f601bb5e0757 SHA512 e5ddb7a75e527523c8d9e39571fb1ba68dc38aec09536bc43cf1225bbd3cd521a32c517baa5c0c16b6874407fcf31dd8e505dfd4cb61223025df6d2b5fa1e46d
 EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-5.5.ebuild b/dev-util/strace/strace-5.7.ebuild
similarity index 97%
rename from dev-util/strace/strace-5.5.ebuild
rename to dev-util/strace/strace-5.7.ebuild
index cf81c1cc50d4..5d7d3277504a 100644
--- a/dev-util/strace/strace-5.5.ebuild
+++ b/dev-util/strace/strace-5.7.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.5-static.patch"
+	"${FILESDIR}/strace-5.5-static.patch"
 )
 
 src_prepare() {
@@ -77,6 +77,7 @@ src_configure() {
 
 	# Don't require mpers support on non-multilib systems. #649560
 	local myeconfargs=(
+		--disable-gcc-Werror
 		--enable-mpers=check
 		$(use_enable static)
 		$(use_with unwind libunwind)
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 11aae2dce7f9..e00d1521e066 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,5 +1,5 @@
 DIST stripe-mock-0.79.0.tar.gz 462829 BLAKE2B 7cb1365f3fabe4ad286b7f80bc4e1ef25764c86b090aacd543239ab35626271638fe5bde7131431cf233115451ba1c9e9df53a69ff9948c5e04965a67ed5038a SHA512 46f6900eb2d8ee37b1f8dc9a0603ee6182cc70889f92c2d9a8a976670211b2f37feb33d53d51364a05a91c130c4358cff3e0b15dfe61a7619132ef568266c27e
 DIST stripe-mock-0.88.0.tar.gz 504374 BLAKE2B 2414de64ebfd1ed4842fc85e77e940da4b08cc647abebc25259d402db23bf010ab69c9660ad80ad3428f27df4036e706051fa44dcee0d2c0f6e1f089994d31d5 SHA512 eb33249ff0c135d1e74bdfaf5d7ad04b1d7ff05d1472e30d55eb819f06795ec7a05ffe73e90b0dfdd3ebcb54f0fdfa6c0ecd1158ca22abc044e1c2e212984517
 EBUILD stripe-mock-0.79.0.ebuild 584 BLAKE2B 9052a35ea96059edaed6c0893930a2708f76cc8fd14526372468912a20fc38e1a3b93ae7ace2811783ff5c20fed4ed852e7ae01b0d5c5809f7554dc6a13673af SHA512 6d905c6ac495e5b644761cb5a19714360a4dba45f9c673481f5f5afd262cf96ef7c43dc505cecd4146fe14f99d34ff7cbbcbb8d31cdb81e38521fce04b353198
-EBUILD stripe-mock-0.88.0.ebuild 584 BLAKE2B 126881bf80224e33b8d73941ffbfbc25a85aff9ba665eadf552971fae1811d33f59b0b393463dcdc2248a67f2a1d57a6cd64259f97f7b7ab22ac08d69b36429b SHA512 851a750fd0af413dc7bd6b5e97fc055c1f02da682b6589a0116da4c0979449433750da5e558be41db27373e3815edc1ca65b1ed9018fb5c77d04c12cd04f2f9e
+EBUILD stripe-mock-0.88.0.ebuild 582 BLAKE2B dd8676dfab0891cc40b5922fe235ba58960c644a09734cbe60a1943d14b54395e7079a87b817b375bcf45536ad3314eb9751917d7a0aef68adafb6072a40b4a2 SHA512 a640eefff3cace87e30b6fc09ad3686139f8ce9048afa3115df14845a64602ccc76681bb34e345c1d4703820209d0c57961dddfd4aa1c6b435e06151934e4ccd
 MISC metadata.xml 591 BLAKE2B 0ecadf3b61979e117b020d78ffa50f7fc9ca8e7d36ef9b403b76063849032187dd7b86c1f44f877504874a100989079b238d0d046f5dcc2c9a74608859c2e1e5 SHA512 6e5bb363e28b92303a6793b4605a970253bb6263c2045527d04b21566aed05f6a51002a0af575e37cc644b9c3e0c2b384dab6cd04fe2ae531881054a901b48c4
diff --git a/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
index 722522531cd7..717ac11f061f 100644
--- a/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
@@ -10,7 +10,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
 HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
diff --git a/dev-util/webhook/Manifest b/dev-util/webhook/Manifest
index 99b6924785cb..1f14ea7f1e64 100644
--- a/dev-util/webhook/Manifest
+++ b/dev-util/webhook/Manifest
@@ -34,4 +34,4 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.zip 72777 BLAKE2B 8debe708ece406e6d908764b2d92a2276c7d8691d734df7aafb428e9158247eae6243f0dc4462555614394f90c68b2f060a47c57c51d5ee694f1adfb07da2a38 SHA512 1d0da148a9e1c6566bb3e689ba2df22551c31d7ecfaa8c00f5a20ae13a0f0fdfa5f2e46a37f75a6dc45d77e0ac2a213d693bfab42364b7052210dbbb436e59ab
 DIST webhook-2.7.0.tar.gz 1652898 BLAKE2B e6cf049b39d7fea689060e9e1e42f6386a7a671a10cc7d3fc288ea9285dc90e674a3a4b5fcb77ac5af8a8b1bbfee0a574b2ae94f8df296b64e15578c824f8500 SHA512 107db4f873aa66c9e9910eb7542edf18c3bd5b3509ff03d6e6947cb162d08101f5b11855c403d6a0a27fea8da693aaa2c995799670b73693c8fe2b2f50ac1da1
 EBUILD webhook-2.7.0.ebuild 3202 BLAKE2B 718238c51e98d19eb8d878ad5e1534468b94691acd776731937d7041b5af68f2e8d17e838cd1d8f29ea95c8dc6439e6eaf20dece261e73519429b6454b77259a SHA512 3090e2185311f4a27ff1160001d66696022ca003b8df7e61dd2cda466d19b7a31c583da44bbd8f527dc00daba75c09ac8a7495de5d51bbd54e912d0b439e978e
-MISC metadata.xml 298 BLAKE2B 5442d7be0c284b6d63c3a02462041ff12c3aabe0a1c595ae0841c89ec84a0ce0b0bc716015396b58f09fb54818ed45c0337c5458c366554d8753fe37bdce1ab4 SHA512 3487d8e98edfb3d454a875b81fec791c828fe734f1713d00bb8450eb2b9bd86f2a3260d334e46d8e6bdfe65eb31833cce661f73fbe756b040842e24bb0244138
+MISC metadata.xml 329 BLAKE2B 6f2ea3672ee9e5ceaed97b9f8e3bc7faa86df32ebe7c7bfb17815d5014e67ecbdd044661892743e3f7e5059b5f0f796b1f9da42e24e611790623269ff4e7ef0b SHA512 2becfb310daa3f376efb3860552f509aad470f060364d87bd03ca02c7f2955274244595f531b24daa65b9ce4f5a5384c729c2fb4561aa933d1fc166ef108dea2
diff --git a/dev-util/webhook/metadata.xml b/dev-util/webhook/metadata.xml
index c818e5364607..8ec7a628f4a5 100644
--- a/dev-util/webhook/metadata.xml
+++ b/dev-util/webhook/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">adnanh/webhook</remote-id>
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 9f396d15531d..80b166291bae 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,6 +1,6 @@
 AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f
 AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
-EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1093 BLAKE2B ea370a4d85604dc4ca56001f051fa231fb56d6cc64e25b54c3fbfa1a7a0b5a25386e828792d9a73c8fd5540a31cb0ad41b094d2317d9ed0a8df102300116124e SHA512 d3f3a5cd78ac76e43315cb298fb097dad9a404a5683a7aea65d2b92343c5da0c2e051c7798b6bcfc6cdcb28e0cc620633cb31ccf53d0a802aecc59bf8e534d62
+EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1092 BLAKE2B f32dccc300df7796a66093cf7dd5f36884bd97639779c78b48df702dc5701bc96ce8336e8dbd46f2c61e4f903336ee3c84c86991f2c07919bb851d50461f5b9f SHA512 5401e2786759e852bcfa6ae7cbbbee3b01fbb934279999f5ad7d6fc468325403a5c340489d4030207aa4349af960d3baa2a7de673ec4e74b4d4595c3d1e9be09
 EBUILD xxdiff-4.0.1_p20170622.ebuild 1216 BLAKE2B 7ed2ade587ac6b9662f07bb0e598dac94ab7795fc61d5d3e3e4404d8af820640b51d6ab88037dcce83c21e538d33379285cf5aeb955790d641134f0b780a4d71 SHA512 f6f4c5b92de89f166257c70792b25f546fd09114f31fce2e926ec919830e18bd46f57bc86f0e5534ab522419fec70ea9ca0b3791c1f347ca2e8e56a098868c1e
 MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
index 8429410821b5..963f344ebfad 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 50d8942cf9d1..2e066e69e710 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,3 +1,3 @@
 DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
-EBUILD ydiff-1.1.ebuild 654 BLAKE2B c5efed318721a50d0e477f7011aadf753e2ab307b26ceeab4feab11ef94699479c2a546324e94171c5d3eddfb728049e422760115d389af45b96aefc5196be82 SHA512 276c9f3ecf1f808d4bd76fafa13a2840e44bccfcc61fbbd7435fd8f34270c570bd4f9310edf2d25ad28ff5827cf0e0bdb0c95fc9ec46ed9657383ffb333948a4
+EBUILD ydiff-1.1.ebuild 652 BLAKE2B 64b7eb0fa137e38a02ff45de004eded3d9b07863d546b992a7f7e80fdee29b7ea3c82842e4183752012e64811369c3d8d54927f0fb72dd24106c46d7941edd19 SHA512 c274ee20ef7535608aeacf48704fd40f24d8b53dd398c702f7ab475cefa31d9fa44243b3361cddaa6a9fda4177eee46e1c576d81509ca308d08f05571373430d
 MISC metadata.xml 369 BLAKE2B e1679b4929852125cc2ce7ec0ede870da64132b820c16865d6fa4e572227c64d699871e07df5588ea46ae67cab3775be9908a76d2d222d75bc2f59ea9269b14a SHA512 798de8606d059795e57d1cfaf513e2587b132e512a8833d422d94e7708473379ddbcee63ec2cf8068653f7c1e02de516f7facb5e5fea59a9dca98698cc3c6d57
diff --git a/dev-util/ydiff/ydiff-1.1.ebuild b/dev-util/ydiff/ydiff-1.1.ebuild
index d3dfb7dd60a0..4d5e505aa774 100644
--- a/dev-util/ydiff/ydiff-1.1.ebuild
+++ b/dev-util/ydiff/ydiff-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sys-apps/less"
 RDEPEND=""
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index aea35989fcbc..f328b4a06d3b 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 8a9749c09371..775dcbeaab2e 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,9 +1,11 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
 DIST fossil-src-2.10.tar.gz 5634327 BLAKE2B 1a02ef0d32b06dd09760d6a62450ad7bc15de97b5263d50ec776dbf0e2fff6b6fba4ec944eecffdaf31737f4a45e30aa898a728590a0c6e2ae171937a349e92b SHA512 aad54e3eaa2d647257c5c723fca4e55981aac0432d3d0b4deaa9651c7db7d27cb9f26f7ff40c31c452cb8dd54b0f0663c632183dc11982bc9cc24adf78b952e5
+DIST fossil-src-2.11.tar.gz 5850256 BLAKE2B af825ca9b79360149d53001b2952259bbad50fe05e77e84e54d58b11a66e612fd8c5f7bb3a8c36dd6f1b267ede3a1ed4c6b8229d10c6f25ff4de858842e100ce SHA512 0489b5b8595a0c50c8a7d787ff2d4a30980dce83b33052f7bf8f4630320fe8a0276bc73a00f3ced2962a474df1fddb2dd2e0d70f8854e1fc83e3746ea63b6ba1
 DIST fossil-src-2.8.tar.gz 5359975 BLAKE2B 6b63eadc8cd563d646698edc9972a52ec1feb868cb362449c232c99dcb81fea2fa227d631ebf8b695417c571933784dfffd5ecbec2a5027ac9901578a054c559 SHA512 5c6a8dc1545c43b3c95fbbec343db023e27a9db58f282a881bb7e488e3e26a0f7913a41f505dedf618b884507e48956780bd0e12482e184345d68edd1e79ff8e
 DIST fossil-src-2.9.tar.gz 5440118 BLAKE2B 2817e3c88073a26ef384d45271511eaacf5394a67ba6041ba0b37f321303abcba28655daf7963b8e51a8bc9bfeee681cea1f318f5ba66e93a5317b98771ad059 SHA512 c3786d4ae5517c88917819448863e9e1e37704a7073a1c87c042660313b77ce3a63f32e35e6a56af1c681e7b8a5acc652b4447d0387b8a8a5b3b5aa04dd9a9b5
 EBUILD fossil-2.10-r1.ebuild 1785 BLAKE2B c9b8d29a0da8dc51377f3e83238b031efc61d95f3211b467229754503f11340371ea865f98f7141fad1268f123e12bf3ee1a7e2bcc58ecc4f9b8ec068b63470f SHA512 ca346dd213a307865eb7b77ae6031de1b4a7415fb7b3195c8fd06b1941ed125d91d7e48b81e4466b22c711975ffc9e70259248620345bf49838e42dc0008bbdb
 EBUILD fossil-2.10.ebuild 1532 BLAKE2B ea4e60d58501a90082b16fa9f34a2e1f1288064be2e4f31f05359a83e5673475e368b8b533221771f07abb7758d46a361537d580b52c7346d8552249d8d25411 SHA512 f7707a36961431a90c6cb39623b6d3ac681ff9a2e06729e7c3de9b980cb9d564c4262b7952c0e534d9dfa014d3d73bb969d74015102a8009244f3886b25a6d1f
+EBUILD fossil-2.11.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
 EBUILD fossil-2.8.ebuild 1529 BLAKE2B 8bfc18c0e98ce9838faa1fe65484bac119ec242f8085c9eaf912a1d5b65ae19598924bd4445e7717895b6e4de9ae0e50f662fc4b16a63089911d5a97a7005cc2 SHA512 b6174bcb75f9e6395b71c8b82103104b97a065af34720bc4aed358f71ac34033624022b06dfcdb0d03d583ff9c8891d21ed1073d4c21872d6a07150b20bf6306
 EBUILD fossil-2.9.ebuild 1534 BLAKE2B b56c917b54b543bc6db8bd3bc4c91e5912e97a31a7785f29c4bf2eb29750f3735f589e657e5344fc7b1b2bdac5e7282b2d67ff5d0c9ef7a5401f525cfb2330e6 SHA512 3b4ab6992cbcb3e4ef43409b2d9bd077e38130f1f8c88830f11e57c185a362d676000891d4677a2d3f7c01d5ec167c07768bb6f688db6cffad00e515afd861e6
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.11.ebuild b/dev-vcs/fossil/fossil-2.11.ebuild
new file mode 100644
index 000000000000..e75b80518477
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.11.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="https://www.fossil-scm.org/"
+SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
+	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
+
+REQUIRED_USE="ssl? ( !miniz )"
+
+RDEPEND="
+	sys-libs/zlib
+	|| (
+		sys-libs/readline:0
+		dev-libs/libedit
+	)
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tcl? ( dev-lang/tcl:0= )
+"
+
+# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
+DEPEND="${RDEPEND}
+	!tcl? (
+		|| (
+			dev-lang/tcl:*
+			dev-lang/jimtcl:*
+		)
+	)
+"
+
+# Tests can't be run from the build directory
+RESTRICT="test"
+
+# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
+PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug         && myconf+=' --fossil-debug'
+	use json          && myconf+=' --json'
+	use system-sqlite && myconf+=' --disable-internal-sqlite'
+	use static        && myconf+=' --static'
+	use tcl           && myconf+=' --with-tcl=1'
+	use fusefs        || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC CXX
+	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 01418e51d1e0..9030ac869512 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -15,22 +15,22 @@ DIST git-2.23.3.tar.xz 5716108 BLAKE2B 9d0e63e075d8e64bf2772bdd3e49e9907ae093bcf
 DIST git-2.24.3.tar.xz 5774192 BLAKE2B a8bea56f85a12863565325984a303ac2d964e0371de5252252a736a376a22cc1695da15b46d35bdec8a36c2ebd7ba7040727265acee37892350aad08209ed15f SHA512 b2fbafd0faa06a304e960f78696f5c033eb5330b18af28c0d169af86aa836dada0c3cf349993b1c9a6129d0c42788167a393f9db9be981610318dca5743b2c87
 DIST git-2.25.4.tar.xz 5880976 BLAKE2B a3ac79918ba174a93844d9518a2f1c6970abe2cd31acea260742d3c03a31a03131f53603a3bd3e525a60f8ebcfbbaa3b92228e2486717ca2d389a978e39bd5ec SHA512 ca2ecc561d06dbb393fe47d445f0d69423d114766d9bcc125ef1d6d37e350ad903c456540cea420c1a51635b750cde3901e4196f29ce95b315fda11270173450
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
-DIST git-2.27.0.rc2.tar.xz 6054356 BLAKE2B 62b848447a90e68e0265ebbdb1fe78cd28f5e3104fe1c8272cc783c0ba59f9324ebcee523f1a6009188d8ba050ccb7ff832034d3e4e9ab5c5d7a3657e80786c1 SHA512 02cb439255c6861ec0fe17705539c97e80c4eab6671797039d65357cce4802fb11575036b96e0054ad6b75c4d730779cb59a2e1fb66261a9f02e75d091d38f4f
+DIST git-2.27.0.tar.xz 6074636 BLAKE2B 72c992ee35a50cdeb2363f04edfab65358216b8415f31f217b6e837d1f7bc28b90e49850006596a8f5f1932fd3011c4253df287d445dca58e335d2f6e7bab8c2 SHA512 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
 DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
 DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
 DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
-DIST git-htmldocs-2.27.0.rc2.tar.xz 1325644 BLAKE2B 91b873c73fd90a2abc1cd71f61b206e256f95eb0d9c7d3d21426be8aa631d297f69aa95f33664e874e8a9110743b955d83c8fa8df69ccd77355293bbb1192b34 SHA512 83a0ec7bbbaea7af0ac5a94de60a9adfe5457bf2c411c3c81c785347cb22984e24298c080745eeee5914473c055c052dfcb776e0b270022e3e90cb88e6c5f210
+DIST git-htmldocs-2.27.0.tar.xz 1325820 BLAKE2B a86cb62b6e42e451201a69e92c897566a78ed4965a98ef7b09f7c4674f60a334357ea8834ec5d97764f5f7e8fe580b8ac3af4da588b72a0e01f065adcd019aec SHA512 6af974ea6c8458f72c5fc7a372611e0153b705a85092a5fe37587a3165368712e077f582ce4085538f48df925d60898b96c32275182b7ef034711ab53e7ab811
 DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
 DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
 DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
-DIST git-manpages-2.27.0.rc2.tar.xz 470652 BLAKE2B 1cb6112e20141de0e10416053d08f1f8ebff2d158fe61245403fb0506b0b004e6b54c752957e5fa6c1510828a9128cf33995e16030e85c8af60e7a45df85856b SHA512 1b7e9488aceff1e453dcca6536d2475350c13d6a3ee286523877fdfc4ae9dd7912fd421685f0e0e4f93a8ba023220295bffc0e93c3f35e548556aaf8b1a0096e
+DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
 EBUILD git-2.23.3.ebuild 19570 BLAKE2B 75aaef3ba36662b32abbfa30cd597265e7149a270c38188d790cbbaf64691ddbc192a3dd780e5e27c8b4bc5c2990d4278b49965f77a2bbbc7e8a4389c00b0de3 SHA512 73c26e4ba8d1b9be24d7c13eb69d1684050eb2de7be08ff32cf27769e2977897594a1cf1c7ce03262f5ed28db75bf4c6b175bc3274bc23bf560f8ba3a9423fc8
 EBUILD git-2.24.3.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.25.4.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.26.2.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
-EBUILD git-2.27.0_rc2.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
+EBUILD git-2.27.0.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r1.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r2.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r3.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
diff --git a/dev-vcs/git/git-2.27.0_rc2.ebuild b/dev-vcs/git/git-2.27.0.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.27.0_rc2.ebuild
rename to dev-vcs/git/git-2.27.0.ebuild
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index a414847e38a3..39e2acc97c3e 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -5,6 +5,6 @@ DIST stgit-0.21.tar.gz 319605 BLAKE2B 92bb879d8b8804c8a1b2ca8038d010a0b5118970a4
 DIST stgit-0.22.tar.gz 308815 BLAKE2B 46c6214012b8d6973273bec716b1ffdafde3ea17930da94de0f73e91e8753fc7ce1d890964c8fac1d32e6343f86e54057b732414fb187b5c9f50e2fa581e6321 SHA512 bfef074b952e01d9041a4ed5dfc6786c29ebb4b09a424ca09e9131ad21c418c4d79ec13eb908f5e8b015ebbc709aacb13824a1c9cad6d97e018a166b014c5e6f
 EBUILD stgit-0.19.ebuild 1882 BLAKE2B dadb04a29107bfbf0c5c897a87832530fe54829dfda617ac890f957d5024f3ca92ac9d2cfe25d1726fdb45504752aa456f1664850a3367700f24d89f05caeb1b SHA512 a39ef9bfceac8f443a7edfe0997c579b6a3d97fbd3d1cbdc0d76d9fb82d15a3368930099442f66a4cf87dbae525cd09341a6e9872e7bc30ed32edd5fb39f99a0
 EBUILD stgit-0.20.ebuild 1887 BLAKE2B 093a1f795c94a8943913d61b292b0157260bebfd3d80c262cb858f8a81440778f92fe0a30af396665bfa1ff8dcfcb5f4f6517aac8305370dafe43354b9a5babb SHA512 7ca719e9e4ce7c0b51499e007df93243adcdd99fef0c24dec6ad9527c4052cc2241e5e31f2eb7fd9151575efdc928232c42c7a31c74e6015f711d73ff37f3c15
-EBUILD stgit-0.21.ebuild 1889 BLAKE2B 87652129693e5648f177bb6412fdc45d7414237f636660a9f5ad22f167626bb64e773a14ef58b0d7b66332ec24974dded6060ecf9e22384926a9396ee3ae6352 SHA512 351e7a3389ead3b879b7fa5667559c2974c08111b371291b9866590e0a90f48e18f341a4667c5157ee280af9c6e0d26663b1e0f3d17bda072b5766d591f25f81
+EBUILD stgit-0.21.ebuild 1884 BLAKE2B 594047706e8083336ce8f9043e1ac8ecb790170fbd54c56866dfd7d601e7360da37868081e9ba996bd6dfafc4b3ac4f6d4902ac33ca4d7c01302024f9f8407ff SHA512 44eaa10b01d39646edb0b1ced2887620abf49f5f490f65b9b560e44f5b105fde7640f45708a7e6cba9ccca3ce808094d99066c8b9dfd8fe2115c32efe2272184
 EBUILD stgit-0.22.ebuild 1889 BLAKE2B 87652129693e5648f177bb6412fdc45d7414237f636660a9f5ad22f167626bb64e773a14ef58b0d7b66332ec24974dded6060ecf9e22384926a9396ee3ae6352 SHA512 351e7a3389ead3b879b7fa5667559c2974c08111b371291b9866590e0a90f48e18f341a4667c5157ee280af9c6e0d26663b1e0f3d17bda072b5766d591f25f81
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/stgit-0.21.ebuild b/dev-vcs/stgit/stgit-0.21.ebuild
index caede5a5d004..bd1e2329bd14 100644
--- a/dev-vcs/stgit/stgit-0.21.ebuild
+++ b/dev-vcs/stgit/stgit-0.21.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 9226a85ef9d5..cc28b70ee4bd 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 6f7ffdb626b4..ad90a0c7dd85 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -21,7 +21,7 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit multiprocessing
+inherit multiprocessing toolchain-funcs
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install src_test
 
@@ -162,6 +162,8 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
+	tc-export AR CC
+
 	cargo build $(usex debug "" --release) "$@" \
 		|| die "cargo build failed"
 }
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 930bcf22e29e..04edee339306 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -712,6 +712,7 @@ env_setup_xmakeopts() {
 	elif type -p ${CHOST}-ar > /dev/null ; then
 		xmakeopts="${xmakeopts} CROSS_COMPILE=${CHOST}-"
 	fi
+	xmakeopts="${xmakeopts} HOSTCC=$(tc-getBUILD_CC)"
 	export xmakeopts
 }
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 3d21013c6f86..7f9df5cb6b91 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest
index 90dc6fe6158c..73182e5d2fd4 100644
--- a/games-arcade/jazz2/Manifest
+++ b/games-arcade/jazz2/Manifest
@@ -1,3 +1,3 @@
-DIST jazz2-0.6.3_p20200327.tar.gz 11030066 BLAKE2B 64340e6aeca9635c2d30f7814c87eb6d48d1e8674554342a1563371e305dc0f9d85929d51c0e26d6a0e30899e0d4b916ad9daa4fde51b4e98e07693f0e5c08cf SHA512 ebb406a2e57f6bf50b23a068f3b640e03c5ccce0e36de686debaacec25d67075cacb60888a7de451028cf4622932e4d282d47d674e5de9230bd4a21c83393896
-EBUILD jazz2-0.6.3_p20200327.ebuild 2066 BLAKE2B 4785f5a8e6e552d4f541917278dd20ff4eb348eeacc5e7b88cb8fdf338c5370e357f01fbb17bf19e97d18b9d3b5490cf5124eb064e54b314b50c668c355b1cbc SHA512 cd9a8cf0c36bb4266fd17b6efb30b6b097b34befab344e2f894b549b796f0fdb29fd337e53f21eb0557f9c58f1f32af353821d64d4efa44950fa82882b69ed30
+DIST jazz2-0.6.4.tar.gz 11028330 BLAKE2B f0f6ca00af950d494baf71a38fcb0e5e14f144bb862475b62a028ce88ebf94905afc6a08da01a40fc68a11292d50c63f638b11973b3eb32811fe42f27dfd1012 SHA512 33216722aa9ce31ca2af4bd1657c8053414678f9d050ed56a802e281b4743860aae40dfdb1ae4047fbdbe5ae7f3ef0b90170184aabfa8279d9f886f7c9bfd24e
+EBUILD jazz2-0.6.4.ebuild 1896 BLAKE2B c1994d544ae3cf1c2215ebee1a01925747657c34f6b2f8a8b8ca515ff82be52d7e7031ac24e7a4283e8f5b8c59e204cc4adee60a76fdd4f869d5ddbeb4fcafae SHA512 34ead5ca314a299a5f8ccdc3f159d8114ef6143b4cb5802d3b345264fefc9b2e88012cf5402d38e4a97ff3c46a20814840248a76813cf2a886d70f9fdd3cef86
 MISC metadata.xml 495 BLAKE2B 38d96adaa7df348574ca3a8f1602a2bb08ec578c21fbbffe5138b0c394d045c8cc66f40383401d8aeb372189e8dc55a2290b7951063554ed68d88db413ec3fe4 SHA512 a851ade899d6e3b6f2983246cd4771cf3b05792f9a3acab18edff3f90839a05718491e9870ab917f30dfbcd7b739f753fc1294a52b3aa25c20f1d2f415a85aef
diff --git a/games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild b/games-arcade/jazz2/jazz2-0.6.4.ebuild
similarity index 87%
rename from games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild
rename to games-arcade/jazz2/jazz2-0.6.4.ebuild
index 8d3263f7c62f..3cb6f0f24315 100644
--- a/games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild
+++ b/games-arcade/jazz2/jazz2-0.6.4.ebuild
@@ -5,13 +5,9 @@ EAPI=7
 
 inherit desktop dotnet eutils
 
-COMMIT="5174d3bc2e94676c4ab730aad6c68bf17b5406dd"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2"
 HOMEPAGE="http://deat.tk/jazz2/"
-#SRC_URI="https://github.com/deathkiller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/deathkiller/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/deathkiller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 7547d6d7886f..bea28b3a6865 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest
index f460a3ba94ea..a2fd3c26408c 100644
--- a/games-board/four-in-a-row/Manifest
+++ b/games-board/four-in-a-row/Manifest
@@ -1,5 +1,3 @@
-DIST four-in-a-row-3.32.0.tar.xz 507596 BLAKE2B 8253c1f44d7c3e27d2e3fe64984aff5485569496d85a77a48b2fd67fee065377f4667b92524481838787c0b7f27e16250b0aa1bc53ff470624f9da92187b7e44 SHA512 f74dcb072c4da03b8cfc274d92a0eda8ca1fbea4b216b4add793155ae63bd8cc1c784ea2b553a198616dbc2254bb1d5567ddc1608f027eaf6e0a594741a2ab96
 DIST four-in-a-row-3.34.4.tar.xz 508780 BLAKE2B 4528642e82438c52706d068d01f5d167f83f4b6dc0a9883bd95a046d9c9772ac642f27f0b1b1197a4ce81b3b5a5a14ce7f9ed8eacbaca189692c0a3c34faeda1 SHA512 7bdfbf1c8953175af8dccbe0514215349a48246f949723628a940db6e5b1e3d89990aa57b5994e5460a79db19ba207de939fe81da53d5782a762695d1588776f
-EBUILD four-in-a-row-3.32.0.ebuild 864 BLAKE2B b33ea491bfae7293f6e59a145c40fad20b8e3ec70b8a3747bb9b73c426f6058b04dfbf3259e559ab701181ad9808c453221b82c9ffcb24121e3d34f02aaec8f1 SHA512 19bbf9805b63ef0812a7b43cf716c14ca4062f66e98bb5e8f9d285713bd22e2cc4b5563fe7f4507aa79f80f1d5f6abf55db14d20f62601fcfb98f461a66dd819
-EBUILD four-in-a-row-3.34.4.ebuild 900 BLAKE2B df1b6e95b89d744205d727acc9c6491ce3d953fb86a075a2bc8d7505be6e6d2fa41ed79d3eb321d3d60d4775c8ede2ceb9e7abd56563022ab472b01363fae9a5 SHA512 0ef891f7e38f75da4aba072ccf7b21d5904b825a5806ba4d26ac717dfbdd5f3e53f755b6802aa82b0c249c6e56f7a1497c389b42b04f9c62c0a7d7837418b4cd
+EBUILD four-in-a-row-3.34.4.ebuild 905 BLAKE2B b98c3d4d1c69dc03409b09349ca2fabe7dedacda7515650279fa3c487f841ba8b16f2c0de1a75fbe5e7a6b63d642c738666c458af52cc4ece0905272d3ca4a5e SHA512 b5f803e151b6b5ee4015c2c417ef698ca90c18098dc543bdb25d02a4307452c19ea0bf09ff372099f3e6c802326698edc27e2bf42c5d6332b3b94354341c6f12
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild b/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild
deleted file mode 100644
index 36ec20a463d2..000000000000
--- a/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Make lines of the same color to win"
-HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
-
-# Code and most themes are GPL-3+, CC-BY-SA-3.0 is user help license in v3.32.0
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=x11-libs/gtk+-3.13.2:3
-	>=gnome-base/librsvg-2.32.0
-	>=media-libs/libcanberra-0.26[gtk3]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild b/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
index 50b2fd2e5ed1..2621f6461808 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
 # Code and most themes are GPL-3+, CC-BY-SA-3.0 is user help license in v3.32.0
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/grhino/Manifest b/games-board/grhino/Manifest
index e12d40098daf..6d76b05b0282 100644
--- a/games-board/grhino/Manifest
+++ b/games-board/grhino/Manifest
@@ -1,4 +1,3 @@
 DIST grhino-0.16.1.tar.gz 1178091 BLAKE2B aa5d0c7aab142aabc39d849cbf18cce5aeb57d42f74ad1e2117c57e735d9a6b383fc284cae82c64d5ed8ac809eb364568133e06f42a1062312512becf87df315 SHA512 17fd5539a9d74a715237a51cbf2f3119feae2bed6a26496b02d7882385d5567571ba4b4c4018554944d07322e5a0c3b3235e141579281621f5a030acbe6480e2
-EBUILD grhino-0.16.1-r1.ebuild 961 BLAKE2B bb979c3934c7a110f9bd1f9999716abf14240e18c5433a0af211dc77c69c2130fad8d9f537493916a7f9c7a9a4e5f9e371f9409e870a9d6bf89f8d29b42f0e47 SHA512 e399e36b3bc2e812d64cc8770bd27186c8c16e6950b42b6b514ee7b77fb2551300ac39b3e89d5995af9226866ed2dd052244aa373575081c9eb40717be38c65e
 EBUILD grhino-0.16.1-r2.ebuild 680 BLAKE2B 1a4c7d6dd9ac0ff256b236b51486741cacc1bf3743f1c188b2997f097cdfc7229b92b92dac0d243ea2cb9c0df597b146f438615e0830b0c3729f3130d58d5220 SHA512 f9b5d42d27d5d78e52a8ecac328dea1c7c6a10ed8c7f546746258b5da38d6e54286f047bc5e2d35acef78df0c9db0073d811d8d529fbebc761727452556c4074
-MISC metadata.xml 513 BLAKE2B a54919c1b021a9e66b91ba91a110e75b9dd687538bc0da2c2beb5f738615e0f034954a7f19273022199efeb47cf1d3933ab5db7ddd8649a492846fd6a020eb05 SHA512 783fb713c40369df38b8aebba6ac6234ee646e097c1992b1ebeb790c3ddd1fa1915c5fcf4f1505f1b6450d9a4ca85e6be7eb38613316a3a475b625906fea6fc4
+MISC metadata.xml 419 BLAKE2B e5076a6519c86c88d126acc66917d5a0d03897d11fceb4d82bf9ceee009751dee881ff7e1ba3f18cc22a10edf8d893173d11ff5851ed4297d74a347df375766a SHA512 2de9ddcc05f6613b7f8c5d6a0dd673b1d24cd9be6935bd0a3db5f4f2b126fe6276badbfd0c597c6a9a998d95c9a794fc1a0b92dfeddb99270dd6431fcc445e10
diff --git a/games-board/grhino/grhino-0.16.1-r1.ebuild b/games-board/grhino/grhino-0.16.1-r1.ebuild
deleted file mode 100644
index 2697f40697f5..000000000000
--- a/games-board/grhino/grhino-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Reversi game for GNOME, supporting the Go/Game Text Protocol"
-HOMEPAGE="http://rhino.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rhino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome gtp nls"
-
-RDEPEND="gnome? ( =gnome-base/libgnomeui-2* )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	sed -i '/^(\|locale\|help\|omf\|icon\|)/s:@datadir@:/usr/share:' \
-		Makefile.in || die
-}
-
-src_configure() {
-	if use gnome || use gtp; then
-		econf \
-			--localedir=/usr/share/locale \
-			$(use_enable gnome) \
-			$(use_enable gtp) \
-			$(use_enable nls)
-	else
-		econf \
-			--localedir=/usr/share/locale \
-			--enable-gtp \
-			--disable-gnome \
-			$(use_enable nls)
-	fi
-}
-
-src_install() {
-	default
-	use gnome && make_desktop_entry ${PN} GRhino
-}
diff --git a/games-board/grhino/metadata.xml b/games-board/grhino/metadata.xml
index 5a4a37d191d9..08b073917817 100644
--- a/games-board/grhino/metadata.xml
+++ b/games-board/grhino/metadata.xml
@@ -8,9 +8,6 @@
   <longdescription lang="en">
 An Othello game with strong AI.
 </longdescription>
-  <use>
-    <flag name="gtp">Install the GTP (Go/Game Text Protocol) frontend</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">rhino</remote-id>
   </upstream>
diff --git a/games-board/gtkboard/Manifest b/games-board/gtkboard/Manifest
index cba005ff537e..e85579ca7926 100644
--- a/games-board/gtkboard/Manifest
+++ b/games-board/gtkboard/Manifest
@@ -1,5 +1,6 @@
 AUX gtkboard-0.11_pre0-gcc41.patch 591 BLAKE2B e3480d0969645815db2cdd9bf32e840bb671a2f9f89c96f5a7e6c61d258d52edc59eca03df64d461298d2afd478f9cccb396a75c31ecd701dc476d304b1f2b32 SHA512 ce7b16643054fd9171c867b6ee7db946577d610fe9f9f6ac9fab98378182934b2eca1828ec8550664c1c67bc2b0f6631ed4538feb9e52d6b9f0ac7e73c1cd656
 AUX gtkboard-0.11_pre0-gcc45.patch 696 BLAKE2B 922d0fdaf0352d21aaa5eaae8bd4eec92b0b2f4321afdf8430096fcf46e7749a06a35c1582d8f6752b0462c96ea150457b58df5d1d32d1f24e0d540e854b3e34 SHA512 7e95753b1a69fbb7031deeb160a7b6da2113171984d8680630317f121e0a12ba97c3230342a3beb5ece6d3579ac4d65a0e9fa1b78e635c690e9e5fac15b54cd9
+AUX gtkboard-0.11_pre0-stack-smash.patch 897 BLAKE2B ad479e26a9c9e730c62fba739e2eb33627cacc5befa3d3350ecfb890e432e74ed3200af52a5506e48a0a3998babbd3331168c7db9d716effdf00d94e9d98a8c3 SHA512 a1e6d4aae548fa12770cbad014f2dd312d12cea17fc9c64dd07be778be9bd479077ea5fa59e875b3a17ff4bde9cf8b074ff35f05c490a0fd3575453889f2bcf8
 DIST gtkboard-0.11pre0.tar.gz 459581 BLAKE2B efe6fc70d8b7c144f0db33502fbce509a0e600008747a5e9bd42d84d0d43de1c790436b731273c36d39356fb489f5616539655fd37ed5cfb802365dcd826e013 SHA512 09d4a1d5203ef0e21d21b5b6cb351add71d0a415ad83808b6e281dcf3f869221e99ae683846462d465eaac54f5eb292e1d8447ea7cdfb07602a8add49e2db283
-EBUILD gtkboard-0.11_pre0-r1.ebuild 934 BLAKE2B 6e721fd03960043465991a2ebc1fee4a2232f274351e78254ad240fe8e0cc4d7d867923e5160d003032fd4f99aab408a1b62b72846c4691dfe6bb32a87c22fa1 SHA512 e5f9be8adb782c47a169a7e6e333b72f6529b520a2aa4571438fecce2af7d854d16ed32cd04b6b18a244cbd86ac1842c7247b7a0e6fc3fc36e33d631e0feac51
+EBUILD gtkboard-0.11_pre0-r2.ebuild 926 BLAKE2B aaa32375c638766e959a0c5f12a7a94638c45c38c4243b74aa23032dbb09aac91513a1c44b48ad1c5da6323af07a02d8b64f92d809ac1a0ce77dd2211ba67e8d SHA512 f7d6d1bae7f4a599359926a8161eacea0430e3d076bcee12faadcabfad10068a90ebf7877644d5d6f0987ab0f580ce835470e10d2fc445896410a3ea5b060b4b
 MISC metadata.xml 331 BLAKE2B e0040c6aa21b5a10ccde6c6dd7ab3463f3821cfdf21e778b4e2dabc93b0bbf902081859f781697949aee8adc870641a7ce449a84e8e451875ebd62a4ef21d970 SHA512 809518470fc270114a602f396c94e42ed33a87e6a46924679e9f1c23dae1863ee4b5a4419bd73d95a069b3810e53f3dd59bfb40ddaa888c9683ac6e2c1c52fb3
diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-stack-smash.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-stack-smash.patch
new file mode 100644
index 000000000000..412412eb62a9
--- /dev/null
+++ b/games-board/gtkboard/files/gtkboard-0.11_pre0-stack-smash.patch
@@ -0,0 +1,32 @@
+From: Takahide Nojima <nozzy123nozzy@gmail.com>
+Date: Mon, 6 Jan 2020 02:01:42 +0900
+Subject: fixed-stack-smash
+
+Fix stack overflow in engine.c.
+It has 2 overflows.
+  -The 'linebuf' have 4096 bytes,but '\0' puts in 4097th.
+  -The last argument of g_io_channel_read should be
+   'unsigned long' not 'int'.
+
+See https://bugs.debian.org/948527
+---
+ src/engine.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index 1b733fb..6ad3b9a 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -345,10 +345,10 @@ static gboolean process_line ()
+ 
+ static gboolean channel_process_input ()
+ {
+-	static char linebuf[4096];
++	static char linebuf[4096+1];
+ 	char *linep = linebuf;
+ 	char *line;
+-	int bytes_read;
++	gsize bytes_read;
+ #if GLIB_MAJOR_VERSION > 1
+ 	// we need to call this again because we will get new events before returning
+ 	// from this function
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
similarity index 62%
rename from games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild
rename to games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
index b7ae827bf8d1..2886f2c69ada 100644
--- a/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild
+++ b/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
@@ -1,50 +1,53 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
 MY_P=${P/_}
+inherit desktop
+
 DESCRIPTION="Board games system"
-HOMEPAGE="http://gtkboard.sourceforge.net/"
+HOMEPAGE="http://gtkboard.sourceforge.net/indexold.html"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
+IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+BDEPEND="
+	virtual/pkgconfig"
+RDEPEND="
 	media-libs/libsdl:0[sound]
 	media-libs/sdl-mixer[vorbis]
-	gnome? ( gnome-base/libgnomeui )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/index.html )
+
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc41.patch
 	"${FILESDIR}"/${P}-gcc45.patch
+	"${FILESDIR}"/${P}-stack-smash.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i -e "/^LIBS/s:@LIBS@:@LIBS@ -lgmodule-2.0 -lm:" \
-		src/Makefile.in
+	sed -i -e "/^LIBS/s:@LIBS@:@LIBS@ -lgmodule-2.0 -lm:" src/Makefile.in || die
 }
 
 src_configure() {
 	econf \
 		--enable-gtk2 \
 		--enable-sdl \
-		$(use_enable gnome)
+		--disable-gnome
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	doicon pixmaps/${PN}.png
 	make_desktop_entry ${PN} Gtkboard
-	dodoc AUTHORS ChangeLog TODO doc/index.html
 }
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index 0724855d17b7..2007f79beafa 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1,5 +1,3 @@
-DIST iagno-3.32.0.tar.xz 500636 BLAKE2B 0c2995bcec9a1861ef0822fc71917b54a2633384279b547269174e262837d2a4b0cd4537b8cffd7d655e7e7f13a1dfca62cef41f7f3e76ef6b293a7640ad6da1 SHA512 596e8a0bc7afcb711b77da7ee1c6acdd45fdf2c845af393f5173362ae5ca53c029190b21918e50ed1715a2701fcabc1ce169417760a2424093d219a44fd9960b
 DIST iagno-3.34.5.tar.xz 563824 BLAKE2B 6933c1ca3ab5a31eebf285be1fa0ba6da18c5564589ec7a3083426dd22d0f050fbf87ef75c5cdc1b5e93822aba58d576e10f12c81785689739abb81fee659467 SHA512 5994d834302e52072e540ac882e8a5e39197a9ddd04972209362965d841565d942d341c91decedd1d11289c09336e13157414209c8d2d5c6816365d17e8f9379
-EBUILD iagno-3.32.0.ebuild 915 BLAKE2B 4eb1d2dc6e9093bf4d95d104847c0dbc124c06bcc9554471df577a35da35253802514de5e52a763064c9ffca778d67d6a23edc7412c2c5807f4fa126c3e8e359 SHA512 4c60e7d2ace3a1cb7142f51b79d4252110cbba3934157800510af158443a43f8f32ecc177f1a16974f7f5472377d173d55d9e126d4d85e430d01d4dcb40f6f4f
-EBUILD iagno-3.34.5.ebuild 924 BLAKE2B 261bfe80bdfbbbafb5203eaa99345c32621f5bd9bd3324d0f26c8cb17c845b54fc5749a8efb7fbc6f31ac66f9612687c50a92f5f5f820ab9db0c0ec85dc081ea SHA512 5384e97474bbfa65293ad69ae7da1f21ef79cd32a6f6db0aa5c06038d443ddf3b50d573633a1ff3de83bdd123cbe1b89f5ea59e0803d4015c9f0579f024156c1
+EBUILD iagno-3.34.5.ebuild 929 BLAKE2B e8fea8bf42ec33050ae200298bf41a9424262799f44f3fa9b85baeeefc7e13e7cd67c9d3372eb1cf15e99219104b23af1442975a1001dacd5d9fe24bb37c398d SHA512 447d87f833e112306e3d61c522001b767b1eb1326f5592a5944c9b1a577f364f1f1f310aae5bc322b8f8c4f8824af966a05437b6ffa14f03a559a1a03a5aef17
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/iagno/iagno-3.32.0.ebuild b/games-board/iagno/iagno-3.32.0.ebuild
deleted file mode 100644
index fd83c4d2c120..000000000000
--- a/games-board/iagno/iagno-3.32.0.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 gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=dev-libs/glib-2.40.0:2
-	>=x11-libs/gtk+-3.22.23:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-BDEPEND="
-	$(vala_depend)
-	gnome-base/librsvg:2[vala]
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/iagno/iagno-3.34.5.ebuild b/games-board/iagno/iagno-3.34.5.ebuild
index 0c382e3b7fcf..627e9c25853b 100644
--- a/games-board/iagno/iagno-3.34.5.ebuild
+++ b/games-board/iagno/iagno-3.34.5.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/teg/Manifest b/games-board/teg/Manifest
index 8773f166bfe6..68f96b38c7a0 100644
--- a/games-board/teg/Manifest
+++ b/games-board/teg/Manifest
@@ -1,4 +1,3 @@
 DIST teg-0.11.2.tar.gz 5790172 BLAKE2B 8a8084307a278b7b4aa7df7ce416f53b7bcc2dabb5ef13441810dbbe1d545819d4662028947d88d95e225f8e5f7d0ea8a06d6891d874fb88512233e70976e2fa SHA512 ac31b074eb0ff007ba34fc62043200701d6a481e8ad5eb323a111d0a93b998aa69ce3972780ce3bd212729ffd72229eb1a3ef3e73a9c0c6ceedd16c16107f4f2
 EBUILD teg-0.11.2-r1.ebuild 685 BLAKE2B 2fcc383ffcdf5fde05bb7310c95180b014417a8fa811ad5dead20ef7f13e539fa5a4b622847fcb217def39d394c8a88f1ea1cfdbe4b055d645602bd49a2d303e SHA512 e69f4369ba0b87d4a7a0bcd142df6465da1c262a0932ab7896a7311bbc97fb722dceef4030985f1a34489d8de2df0a9b9ec9a1eb1f8c0914db2c7c5b63ffc266
-EBUILD teg-0.11.2.ebuild 479 BLAKE2B ff491540cc95258914a882c96a8a48621c963400b43126d28c35cb653d21651aa4bf91d90fa4d882c60d02500decc9758e3025b66813c257661b66f509aba2db SHA512 886fced1994d0d387d7597f2273d01db5cc177ebe8b808a240dd68ad89e724226607b52c825103dc5c763927475ade3b875b31fcb20f3d66b20aa2f0bf91d2ba
 MISC metadata.xml 801 BLAKE2B 072d6f3eab552ee9add89f373133034203bac2769cb19295b6d0fb949c966fc890590b6070d549c96450421ea51dcf420e265d8edf9c4c2768797d117299751c SHA512 11efadf3c902ffc4b0ac9a14fbcd1c56d57299b48e09d024b9d175bc526c558808b99b836986b2e07dc5edafa5d79a8628c64d87fe2ef7ae62fd1630ba48a302
diff --git a/games-board/teg/teg-0.11.2.ebuild b/games-board/teg/teg-0.11.2.ebuild
deleted file mode 100644
index c4525b381adc..000000000000
--- a/games-board/teg/teg-0.11.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2
-
-DESCRIPTION="Gnome Risk Clone"
-HOMEPAGE="http://teg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/teg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="nls"
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libgnomeui
-	gnome-base/libgnome
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-text/htmltidy
-	nls? ( sys-devel/gettext )"
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 4b2f5c7946ea..1088feb857b4 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index ae0427726a05..d1957035af0e 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,4 +1,3 @@
-AUX dumb-ldflags.patch 655 BLAKE2B 0016029ffcb71378dc3feaca92828b14437c67c9c7000fdac1daa2bedff70129611dd51e03a670c49bfa8d3829a4be0aac35b7f79603ecdc578751005716a8aa SHA512 767e0a1371bfa7c717a3639eb529ce94a1a38e4f8b386972e6e87d44a5a427222f44d4d2929ea9ecb1d8b4e6a5ee4ea1285c93843c00ed23cf97afcbdf0f1f87
-DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9 SHA512 12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7
-EBUILD frotz-2.50_beta2.ebuild 1814 BLAKE2B 0f24f2d07bf5c0532517bfd330f96ec90fd5d59e4d49f1aa86e8ec76fec4f29c0bfacc9f0ef29c37786ef4ecd0ad9d62a03cbd1827d79bd1de634abeb5c0af0f SHA512 c9f23711277aab3d807b0840c1130e91a256f628caae08fb7b6c0fd082e48d8ea5af49d9e29b9e8e55faa76b98987575cfedb6ea432318a9b2ea70019a4cb7aa
+DIST frotz-2.52.tar.bz2 289109 BLAKE2B d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774 SHA512 387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710
+EBUILD frotz-2.52.ebuild 1688 BLAKE2B 1428b453f2f43dc447a4982d510eda0f1f1e8fbdc124f32529c64cff46b7fb029667de95516f845ede99a0b5476b3f210f2e355914880a3816fec9e36037a114 SHA512 34b9d215752c7f299e9911de3b40b8cbc0e17a7455f3faa8caf31154bd8298d8b1002dbc84dc8b1811dd4335ec245dd42bce1136fa3632719351d9f2eb210132
 MISC metadata.xml 337 BLAKE2B 58dbc1d02cdf6768759edb274b556b608135d088ab1b827abbe23726435e2595a9008a377bd27ebb1b4a517dc9e5ef74a9dcd2e08d829e0aacaa854fc258f830 SHA512 ace3f8702420d20cb543c88e0e22fae40cea97be5d86c40657107b9621c72ef462480a790f26735d212aec7fdffb27a1b00bd48f70d0e030f28efa53f51e0217
diff --git a/games-engines/frotz/files/dumb-ldflags.patch b/games-engines/frotz/files/dumb-ldflags.patch
deleted file mode 100644
index 2ac968b4b1da..000000000000
--- a/games-engines/frotz/files/dumb-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4b4597d49dc024adf99a336d836709b876846128 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 26 Oct 2019 14:14:00 +0100
-Subject: [PATCH] Add missing LDFLAGS when linking dfrotz
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 3c3c318..ed71a7d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -261,7 +261,7 @@ nosound_helper:
- 
- dumb: $(DFROTZ_BIN)
- $(DFROTZ_BIN): $(COMMON_LIB) $(DUMB_LIB) $(BLORB_LIB) $(COMMON_LIB)
--	$(CC) $+ -o $@$(EXTENSION)
-+	$(CC) $+ -o $@$(EXTENSION) $(LDFLAGS)
- 	@echo "** Done building Frotz with dumb interface."
- 
- sdl: $(SFROTZ_BIN)
--- 
-2.23.0
-
diff --git a/games-engines/frotz/frotz-2.50_beta2.ebuild b/games-engines/frotz/frotz-2.52.ebuild
similarity index 85%
rename from games-engines/frotz/frotz-2.50_beta2.ebuild
rename to games-engines/frotz/frotz-2.52.ebuild
index 544ab8e09d62..cab60c1ec299 100644
--- a/games-engines/frotz/frotz-2.50_beta2.ebuild
+++ b/games-engines/frotz/frotz-2.52.ebuild
@@ -5,11 +5,9 @@ EAPI=7
 
 inherit toolchain-funcs
 
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
 DESCRIPTION="Interpreter for Z-code based text games"
 HOMEPAGE="https://661.org/proj/if/frotz/"
-SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +21,7 @@ DEPEND="
 		sound? (
 			media-libs/libao
 			media-libs/libmodplug
-			media-libs/libsamplerate[sndfile]
+			media-libs/libsamplerate
 			media-libs/libsndfile[-minimal]
 			media-libs/libvorbis
 		)
@@ -37,16 +35,9 @@ DEPEND="
 		virtual/jpeg:0=
 	)
 "
-
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/dumb-ldflags.patch
-)
-
 src_compile() {
 	emake \
 		dumb \
@@ -58,7 +49,7 @@ src_compile() {
 		RANLIB="$(tc-getRANLIB)" \
 		CURSES=$(usex unicode ncursesw ncurses) \
 		USE_UTF8=$(usex unicode yes "") \
-		SOUND=$(usex sound ao none) \
+		SOUND_TYPE=$(usex sound ao none) \
 		PREFIX="${EPREFIX}/usr" \
 		SYSCONFDIR="${EPREFIX}/etc"
 }
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
index 61018724cae1..4a69d9eba0ac 100644
--- a/games-engines/renpy/Manifest
+++ b/games-engines/renpy/Manifest
@@ -8,5 +8,5 @@ AUX renpy.1 4642 BLAKE2B 446100972a1cb82dd91a25bb03895bdf717f33d1ffa27497a1e71ec
 DIST renpy-6.99.12.4-source.tar.bz2 18192453 BLAKE2B eb00db04fc6ed0aafa0428c3ba0ffe986634f8b536a7cd6c88c6082789554f6d9631f433baa3e34ab91d19509ccef5617e3fe8ec410b96f4b87d489656cc893b SHA512 375b67e15630fc21915136e70bc93db6da7c2da192d39b1256822513ae44974124522c85f1976f2af62df27b5fa11493af488b02abcf0081eeae03e1a69dfca5
 DIST renpy-7.3.5-source.tar.bz2 68211972 BLAKE2B 46d8e1c788398515005eba9b668020aa2c9527e4f9207c95661d8fe86f4bbb6bc1832fc3e6808023355e2ff67666bc6d3b03f89ef58afa77d5a3abc965192175 SHA512 5a34412379682628d0be9cbbca0dfc95d5e52f8ffa871cdab0c20d028c532233b0d94a7dfdec67fec5294a789e9ca16b61dc30ef138e303d476007eaffff0d2f
 EBUILD renpy-6.99.12.4-r4.ebuild 2601 BLAKE2B 35433cab4074dd62876d1793ef6805ece5072c754e2d9d540347134c7d05861e9b63d1253e5a7107063ab184edb3fe3c9d163ce5b9676f92829f7c847e6ed4e6 SHA512 a22414e7c61487e2747d84b1cf87774898e71cbf67fb687422e8b6c968de2b74b1f5d19350b9f71b9709a31d04b34b5a063d4e232d75f8e697f9b536e3ccc52b
-EBUILD renpy-7.3.5.ebuild 2507 BLAKE2B 498510724821527fcd849069d2c2c9c2fae8a78f7763b7c17e29bb66d61fe6f48e812d67eaab40cfb9edc891cf945954c3f9e292ed5fe741751e9ed38da4905d SHA512 bbb6795786b794db20fa24616079d383d6ca6fe5d4d86c0a29d06be6ec0ad9eec550150541ee05d1f20f9d3ceee6396626cf71979bb565f4630a76598c6c3f75
+EBUILD renpy-7.3.5.ebuild 2505 BLAKE2B 0a9b18ec24c6dad1ffca6edbf03d87d2e791dff73228d94d97c4c304cac4efd1bae5b241eaeffdf690536354546dd5fac8d83361a2656f791ba73dc61085126d SHA512 f1363dce2e1946c42aa9f66870436afb9491681765ffdd422755413094026813f547c176fa3fdd343b99138803c8277d9212202df9ee1a73c6d7147e9ae0be28
 MISC metadata.xml 1063 BLAKE2B 397a9759c24976baaf19f8603b716edbaaa67c6c1ebb4fa9d971004a05d3b61a1b7fef806b7964b23c9f37c6f91dd3f22c5ae5ee007a760183ffa3cdcf5f4253 SHA512 801640d22f7d54fa918564d14aa0bfbd63c6f106dd1ff690740b93bb7da51012c42b4b75431e3741c47049121bcfb908c3a1cde6b41091b51079c5f0cacc0753
diff --git a/games-engines/renpy/renpy-7.3.5.ebuild b/games-engines/renpy/renpy-7.3.5.ebuild
index f408ea63475c..db5f7121aac7 100644
--- a/games-engines/renpy/renpy-7.3.5.ebuild
+++ b/games-engines/renpy/renpy-7.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
 
 LICENSE="MIT"
 SLOT=0
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="development doc examples"
 REQUIRED_USE="examples? ( development )"
 
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 750b494119a0..1cf1b5adfae5 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 351470871890..15343c503c00 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,5 +1,3 @@
-DIST quadrapassel-3.32.0.tar.xz 478332 BLAKE2B c685ecdc542ea29dea145fb93409d951a058a7451cc0f6795a6c7e61387d891f6941e8569f4e61b4f473f72b4045d348669920d5847ba6165e891fac58bfa42c SHA512 c618d4b35888122fcdecb6085773d30198907d09dd234283650c96f1e7a5994f51e1ef33f7df2732c1ab28cf73f5fb3a4e35bd8780e782714c3faeb0eb46d24d
 DIST quadrapassel-3.36.00.tar.xz 308000 BLAKE2B 9decfce3573cd301d716cd0e5433113869118efc6935bcf1f1ed38a2c8cd26aec3b84d782f1b907a972cf9aeaf940d10c85de45e2d111e19c215a06e49aced15 SHA512 4e27011855e29b4703d5d1b82d9cc5a334ee60bd8e2a9ee8cdebd931a029df76407da02edffc9c1bdf5e845aee92291d09fe3c17fd0622a4e77d6eddd2ed5a4e
-EBUILD quadrapassel-3.32.0.ebuild 938 BLAKE2B 077a7dd4a6ed7413090298ee134e54114abf41bb6dfcf52c46f88c4644d6afa3c411ce47dcbbe798293a2eccd837441da024888221fed5cd363ef62aa13826c9 SHA512 575353193a9aa6ea200edae46e73b97dfeb207bdca8b946c7d8cc22ef728805cf9e088a631ff2149cf76a8c5d013039ffc94e6902705591d278d4d7643b12eba
-EBUILD quadrapassel-3.36.00.ebuild 948 BLAKE2B e730f34451e2117f4d0ef628cd871f3a38eedfa460e4c4e9f684506011ce9e54ee3c5b71b7546e78236567bf7475ae646f44379144ab43d2886dc0b81a6f7754 SHA512 374f474eab0176d7f114609d30d31e3b553b67904aceb40bc682f5956f7d5303631b929f9eb2411fc8b6b3191a87e0ac5c57cdf833d66f9fe7adb1f7d1aad6cd
+EBUILD quadrapassel-3.36.00.ebuild 953 BLAKE2B 76fca33db0bb3c34b0b9c2d8a3e2fed8f0510dd312d08987f38a52eb3c6bb10067f40409cf641fc4798499eb42f30aad0db3a5f26beb69f6f6a428a5006da3bb SHA512 eb3edd31e93aca93b74488371dcbe3900ce17f71421c6e221ee3dc0108edb76bfa41b06211e585de67d4e02e9e95209dd0172aa4e3a68d8588893da9c454e217
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
deleted file mode 100644
index 9e567600ad00..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libcanberra-0.26[gtk3]
-	media-libs/cogl:1.0=
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	>=x11-libs/gtk+-3.12.0:3
-	>=dev-libs/libmanette-0.2.0
-	x11-libs/pango
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	dev-libs/libmanette[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
index 45a88d8f0990..368d3a28e733 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 549b770a4529..2054f5a8b97d 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 03fdc4103215..d673f31c604f 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,7 +2,7 @@ AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48
 DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc SHA512 3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d SHA512 b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
 DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1 SHA512 2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb
-EBUILD wesnoth-1.14.11.ebuild 2550 BLAKE2B d8bfc7d57d25c6bbd37cb231e5083a04a3a49e8b272e1989edee7831f5fca3a599f7ad7efb571cf8d268b163b146185bfceb930b9e4c3c7b31e355c770d37172 SHA512 2e867d9bd06be0eef6eefa9f642decb680649fa2f169e43e56c65100e62698c69dd9c24fd616f84de1795b0b98888ce5693530c7e2ac5fa40b3543404f9b31c5
-EBUILD wesnoth-1.14.9.ebuild 2588 BLAKE2B 017a50f4a8c800c038669419d13065f5102900f1852ed5f8cb6ba6a9dd4b7b2855699e71e1209850869c801a27795b1f3593eb1ac2a518e6c311095a6e9090fb SHA512 dd3053f5584fcb92d1c11340be6b8c28a69af18234a2afae0bab0cbbcb7bc839d7e5f1b95bface37a859d0c4bcb76960f876cddcc9dcda578a6e2783dace36c9
-EBUILD wesnoth-1.15.3.ebuild 2550 BLAKE2B d8bfc7d57d25c6bbd37cb231e5083a04a3a49e8b272e1989edee7831f5fca3a599f7ad7efb571cf8d268b163b146185bfceb930b9e4c3c7b31e355c770d37172 SHA512 2e867d9bd06be0eef6eefa9f642decb680649fa2f169e43e56c65100e62698c69dd9c24fd616f84de1795b0b98888ce5693530c7e2ac5fa40b3543404f9b31c5
+EBUILD wesnoth-1.14.11.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
+EBUILD wesnoth-1.14.9.ebuild 2601 BLAKE2B 861704b67dbf714eb632a12150d10feb7ea9bc0b041c076ca62622d51aa4a63c609f5b9c77d6389fbaab6138c7e61c38fbf954e6fbbd3daa15a424e446aa8436 SHA512 854af8bb697930e58c8a67fdfd65b69f7ba75ca6d0f2a7bfe97f54b19a6b322d8b131a6ddc3181028341de7a88beab62501539b97f34d64bbff235ac6c2d52df
+EBUILD wesnoth-1.15.3.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.11.ebuild b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
index f11fafb5b6da..407e3840468a 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
diff --git a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
index 6f718f0b23ef..dd0a982c833b 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs user xdg
+inherit cmake flag-o-matic toolchain-funcs user xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
diff --git a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
index f11fafb5b6da..407e3840468a 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 02ec33e8437e..4dbd97767c9a 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index a5f31c5da637..268152481619 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -4,5 +4,5 @@ AUX slade-3.1.12a-freetype-deps.patch 2207 BLAKE2B 48ae8033f80c6438db6af26f8c810
 AUX slade-3.1.12a-sfml-gtk3.patch 2524 BLAKE2B 0bdd400ba218d1c0a0db48a3ab144b6083c22fcc69d112765aeda069853c03a97c4f774d24cb73c1bb202089eb8184435a121a0473f5914d17ee208bdf181a4d SHA512 b83c27f224c45533738d8341ac7116e226ae45e13514b9dca85f5813d73c2b1f13460961ea8fbbbe8acb40ab80d37100f3c66abc7df4b49abeabba1ffa8fa70c
 AUX slade-3.1.12a-wxGLCanvas.patch 3768 BLAKE2B b69e84d4c31c7f46c9298f282f4407c10edaf77ec73ccea780f3a9dddbcd89bd315e327716dee8432a27e8150133b42a6a819c8af7b8567980941c79a8b7a138 SHA512 5ae7d5e91012a3e526fe95003cfbcfcb69de9636b453018a654da50af11772c2be4690f36786634e8941d011f8094093fa2a7e8ac1d099a0627e93e1ee47b863
 DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B 400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566 SHA512 ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
-EBUILD slade-3.1.12a.ebuild 1382 BLAKE2B 3a77e8c403f1c9c266ebbdcb95ac339d26d141155a4b1d2cfe1969ccbbdad6983bf60138891b2e31ea29dbc25db123b9d01c1814e9b7150a066416edbec812cc SHA512 d9cc6b4dde7c41158ba9dbf18f49f7fe098dcd3e6e69609fcd0996cba48e361b11ad26debc3bedb24ecd0a4a22e214e7f4a8f11454fda622aea94f7fe8fbc156
+EBUILD slade-3.1.12a.ebuild 1391 BLAKE2B 36c2bb38430d78af113f0408c428ece5af94bff7fe2d89440f17cf39cf7e3f978d1757a0b739da0f424be346edd6e3e33307750056acd91105eff0a3429c7204 SHA512 e62795cbdd0e197f78407e1ed207d5cce2c4ef1d9cc8c95bcadc9840320844dfc48161bca4ed6e7a2d6ba0c94cf884b2844c554c70f9acd4fe4194b261bd2cd1
 MISC metadata.xml 456 BLAKE2B bb0657015b0259912543f091f7e08695a3bba37da01594f9979c71d435bd1505790f009d827cd654267b96de446666c4eca7c564962e35563eff26027b30e119 SHA512 e6cc7225d2bcf85aaf62158fdfb7b92f2816f4363795f7b82293f932efc4182275979117a2673242f7c666d26036a1de1a6caaab0c3a48e19ca00b639007f272
diff --git a/games-util/slade/slade-3.1.12a.ebuild b/games-util/slade/slade-3.1.12a.ebuild
index b204c6c7870d..641a17fb0105 100644
--- a/games-util/slade/slade-3.1.12a.ebuild
+++ b/games-util/slade/slade-3.1.12a.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/libsfml:=
 	net-misc/curl
 	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[webkit?]
+	x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
 	fluidsynth? ( media-sound/fluidsynth:= )
 "
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8002b9fea925..849128a97360 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index db770b0d03b6..f01f9189de76 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -4,5 +4,5 @@ AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a
 DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
 EBUILD dconf-0.32.0-r2.ebuild 2190 BLAKE2B 0986b0dd27d8b5ba3e52e294fa9e7e790ce808b3596f024d62112e89270c55bf6dc22585115cd3d58a9d4459a3cd006c1cc38371100b866d92771733d5d89bc7 SHA512 3d089f03f7cff19d6bd49fefbac7238f23852dd5286fe41056df9df66e600b8aa0808572721fc92eab2e9152187634beba9bfbb91bbdcad5f5d3e2368e495754
-EBUILD dconf-0.34.0.ebuild 2195 BLAKE2B 4aa948dc6a2d0a0e426a228e0f09bd18bcf52a6ce51bed953e98f395027be26996fd608c973df0c594a6c508d04ec58d59bec87a6a15bf75f2fb4505ee3b8a8b SHA512 6976547c8379c4a6c0fe00b47f4bdd769db0b868d3e36aeb69acc8dea17c31a33f6f8ad96b17b17d739ff050ca08e1ed14e7d9dde33f23270780b6a21b1ce1ef
+EBUILD dconf-0.34.0.ebuild 2194 BLAKE2B b13abd71df3ea91f67ad8834d46e9412e9014553ecf2e0c595c37bb6c6241c9a760f0262a408d86deda07e83294d9b44847d1677989c66a8fd68c2ccfa89f56d SHA512 30015a932e6403f82081ac1fe1ec3730c309a51a5cdf54f4506aaa8065df2adc31d133e056d28abf1d25efb2e42d3c4090eeb88929d63b1a11c40ce5c91ce617
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild
index 02f84c4f4104..19b227fd137d 100644
--- a/gnome-base/dconf/dconf-0.34.0.ebuild
+++ b/gnome-base/dconf/dconf-0.34.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-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="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 7c4ca658ebc4..b23c6ee229a1 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-control-center-3.32.2-fix-gcc10-fno-common.patch 706 BLAKE2B c53a8ba8e45682fb6af8114154724453bdaae589184b6b1eab85b8db33e8169e69b5cf1055c53857a20682e177a212640d60050351fd267346fa797eff0c2c13 SHA512 76c01a7f72230b7aad7b21dba9f58063a0ce93a945ac5a3c19a5a7c9af6dcb8225d3143b099e9ee6938b11107a511b1b1b580558ec57aa9c973e7cad0b26f1d0
 DIST gnome-control-center-3.34.5-patchset.tar.xz 7500 BLAKE2B 6ec377725fa81a2d49eb0496b31adf7a303505b4478781dd3d4f2c0b204996ae94e3bb5b9b43c324d8e317d66646ee28fa2e471ff884b709c03419fd0243f342 SHA512 c658f0515a7b72c78c3ec6c78a1586169d21f01a40211e14d9e70fade3d5a18e29639c2aa5ef37dc6c741df9f9b7478cb221c83e3f1b4e4876e6b854e38ff524
 DIST gnome-control-center-3.34.5.tar.xz 6234916 BLAKE2B 9c41ee8f24a66ff66173587f0f75bb743434f21315281db11577bed2c4770c9da5606df37020d4951b7e542171298abceef65ba02e66519737aeb30bb6bd3861 SHA512 564cf514345c45c39003e309d9d93a862cfe801e84968412f6c69031745df0683716423de2d85cde166fc9eb256a45be713e7eb62c8ac3e8e4a59e91ab160156
-EBUILD gnome-control-center-3.34.5.ebuild 6261 BLAKE2B 11b89f8cff7245be63380dbb1d9da532ddd424b4728ff71058a6f774d68d1beef23633f5e8e56de3ccad7726bf1ad2af6d4f239e4f3d382b33a1dbe39b91d014 SHA512 e3652cd364f0549c70f27c01412d7967f43905d17a8d9d40a27e5d326da3476169b6643f6a1a12cc67216f910865c699a73be1b7f680d425b69fffad730521ab
+EBUILD gnome-control-center-3.34.5.ebuild 6266 BLAKE2B 9eb6bce22e9865e39c85094d29337a217ae2cddce0f791baedb1f0755919692f08d3343dd5e38f996a7d96051db657fd05749dfcfbeb004a82e27ec5f1262e08 SHA512 923f3c2072d28eaa5daa8e6ba8e302b129e05f3e008bb95f837dbc7302d7ad0cfaa9b560d88e054518f5d67fc8f06a67a1c699bf8d4a3b45be4aa1392f040ccd
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
index 9eeabf9010d2..5907a46cd6c6 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	flickr? ( gnome-online-accounts )
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 1387c1613947..666dcb9f76f4 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-core-apps-3.34.4.ebuild 1653 BLAKE2B 65a0e21703fd99ad52e6b63f63cc0fb420233ef07d5cf02d078b6baec3e6f2d74e9c5bb2b5290cc7c1dcc6e32294b431549ff60cdf77a82d4dbe8a8150f413bd SHA512 f41ba2a877cc466a68f1e8b4ad9b9c8a38c6f302375d56cb451ec7cfd4d935733a2eda3fde03ede3ee211e4cf05ea4baa931585a0e160fe26facda62f05689cf
+EBUILD gnome-core-apps-3.34.4.ebuild 1658 BLAKE2B bac78a85a54c48bc642fef0ef77b24f6f53a4c1424f0ced9efea39c8aefa3bca6ca0963225187d6c6b332a8f72dd851065b5da9f897fe3fa4a8602afba8d8f75 SHA512 98a6f83b8afe74a6b287e07612c166552d8dff54392f4f6072657b4d8a512e7f8674bb2a89232f7ce9be3a4d46f3bc8a2f66d9854d0ac10d1a276e1418172393
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
index e2b5cb418515..d3f10edf2128 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # gnome-color-manager min version enforced here due to control-center pulling it in
 RDEPEND="
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index b9d3de20bee6..382b321c8877 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-light-3.34.4.ebuild 2055 BLAKE2B 395aa425e5922f03ca93136f3d56618bf52ceee21ffb6af0b773ac8a1532d00cb51f666b8d16b4b02b50b1d9e27fd7708bc87881e5a03a7b3f5b9a6d16c3eba8 SHA512 30354aafd6a092c099b0696288183a86234bc0f185260c836836280bedfc7d80953c299163c127b05f98533e5f65f72642edb12711e871af3dd186dffd6d656d
+EBUILD gnome-light-3.34.4.ebuild 2060 BLAKE2B 1b60f2198f285e4c5bf9682aec0cf2bffcd95e349c0e24cc82b1b3f16be506c4322c1acf1d5d63c53b6256f5f4bb256da67133f53ce0affbb49ed30b97b2cbbb SHA512 5593d45f556ad1761cc8039c0b2a412485f1bd5eeec4df6bbd69afe11e3215a7d6adc52aad0757f4c6fdab49568ebf1a7d882f48cf4191f7dbe2f46b443bf7fa
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.34.4.ebuild b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
index df4419c5a785..71ed235e22cd 100644
--- a/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
@@ -13,7 +13,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 56a74bcdd3ed..789c9fe20b81 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,5 +2,5 @@ AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a44
 AUX 3.34-optional-bluetooth.patch 1971 BLAKE2B bac967362e46cbd8b76368377c607573e34489b41b70441488086953f56581c8c77b013f848c079bb189188b5ac62de935fc55dd03f2bce725547079b344a27e SHA512 f3c8479090656f5655766a6fd790729e5c16c1b09f61f7b41485bdeee53e6e2ada7ecf7e641b8c8a9cb520a5db8a1bb4f5d0d005226bc5c08c1c553541e3e049
 AUX 3.34.4-custom_stylesheet_crash.patch 17904 BLAKE2B cff95bf20f9b2e35daa885cbfb2e7490c968daefbcaac0a11287833d4cc23ca6c7e4e4ca52a523555da69e40ef0efd85cdeea8ad25f0943c887cabef22935bd4 SHA512 c0200c7759aa502b6d3ba4cbff789ab52d1510a0a0d7213c64e26e4773a58f1c7767b9fa2531a2c032943f08101b268453a462e7013d12cec96a32bfd3642c7e
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234 SHA512 ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
-EBUILD gnome-shell-3.34.5.ebuild 6904 BLAKE2B e7b977f91bdda4a6cd3902b826b22594dc3c48c7c9d61ed57a3a8140fbc11efdfb9747241b3c2025875c947c1454db4c62c916492c14dcf0356a59d4daa712d7 SHA512 248c0599cdfc0a73cd9e69d457cf980c6c8f825995cc59787c8af584401febc480fc5d9998a349654438e137f5c6b57b3471de55bf5b6e35fe230ff6e3807ff8
+EBUILD gnome-shell-3.34.5.ebuild 6768 BLAKE2B 72b4934d79160c38f7868b4afddd6490cc936a0dbe73af07fcecd9f7c1434d4b96afcc036d53ac2b4d746429c9bd910c9333a97a994f64f757a1760136928302 SHA512 3a2cb1659aabe6995d27646fb5c1d5576335a96cc9b62f00e488b39694c4470f3f16185e92c71ea105449f2af6667511fff3fabfeb7d3a7b2a370412872d7357
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
index 74ebb96f0478..d1c2b7848cff 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
@@ -107,9 +107,9 @@ RDEPEND="${DEPEND}
 # avoid circular dependency, see bug #546134
 PDEPEND="
 	>=gnome-base/gdm-3.5[introspection]
-	!arm? ( >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] )
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
 	browser-extension? ( gnome-extra/chrome-gnome-shell )
-" # FIXME: Temporary ugly workaround above for arm deptree issues without cascading it more by unkeywording gnome-shell for arm
+"
 BDEPEND="
 	dev-lang/sassc
 	dev-libs/libxslt
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index ab76171ed3b2..92666d9dcd23 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec
 DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
 DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
 EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1016 BLAKE2B 7f58297cfc383e02cac7ab3f0ac945c4f72ff0d7b488f6087f03a91976d66d0f34a2815a78bd96b5487ec525e650b212a3d02a6d63dbe25d91c424e21dfee5ae SHA512 a4dc5205066a8dc4a359846fab989ce5c92f2f4b8f83085f7d714396ed5820a9c3f0fd5e1b5529bebc0a60cf9213b236a52f007d58d5b1f1a345fa115c3991b9
-EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1020 BLAKE2B 89a0b83cb867a66f4567bccb9817fab76c26520a4c210f732396c8a3baa2456c2708c55daba6c67053009919d318680c024e448271e06fe253ed80aada607d91 SHA512 79bbc994aa889a0c71a093026f0765c829cc2ac8c2e83d7c4d9bd8aaeed3053e5e82a10e5620bcceec89be0a883529c20601d1c2e83d6696bd604b954f538c2f
+EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1019 BLAKE2B cc5311a56a4cee3bbc80066685df311ea82465bbd63c9f910056bbbcea3c029c52cd6508722ae23280d8b0714b1a6a70cb3bf54359a20af6c9dd5fb1da58e409 SHA512 514bd47165fef54dbc2079e77ea25daeb076b56d51743d4ecfd9685d49fbe5d878e9b2dde512d8c57a7a242afd15be2a816582d53fa5d84eaec601829f010e54
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
index 29c65ee63b07..e8f82b220d2c 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="!<gnome-base/gdm-3.8"
 RDEPEND="${DEPEND}"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f6b0af8b1cf8..3d76f46dca20 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index f66817a48862..6c81e5acc919 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
 DIST gnome-contacts-3.34.1.tar.xz 365384 BLAKE2B 3563ce0784c19b2cf61e3cad60afaeaa310c53c68f11da459a3053df6be769fe0bdfea84f106e11fd2921c3f6bf8ef6a03b8cd90a680dc5b46d9a0486fd0c737 SHA512 6dad3fd9d199ad87c642e9f36102a142958cd3f577eba36fa3ed2800af5acb44752fa1f8b7eb8991974c514245af51015e6b5e08636274b9048813c37abcc478
 EBUILD gnome-contacts-3.30.2.ebuild 1529 BLAKE2B 728a5e3fbf49c1153308e26bcd0b541c5168490d20419444c43fc0c709c138510eced523ba90c156df92d60f9d6cbb61e80833a274a096e0fcb252652c80725b SHA512 cfe781f150533677bfa9fd55b45af28eede8241b35ee5039a5e3ae19eac3306200e8d31c8af69ec918c002ca0400ae1730ba39e3994ce8badbb15c0aacc1b099
-EBUILD gnome-contacts-3.34.1.ebuild 1606 BLAKE2B f59f4be7af2ec1b898ab05debad82d058c75173765c33b6e8377c50acfdf80a8d0bad238313faad22de1bb1e41acec3476e69fed017b945cd50585129069754a SHA512 202d0a52f6725fe2a6063cc608ecb262acb6a9db626562f5f0e361b3566ad4722faa1878dfae2a320ec8bb5a04e497378fbfa8cbc0671a693643cebbb12937a1
+EBUILD gnome-contacts-3.34.1.ebuild 1611 BLAKE2B a16dd9abb90ad6f6657d3cc54c6c1da999cf73fc561d6d8859da1d9601fc729b2ec54dedbd13096dad255a3b1281ffffa8cd7a546d59d82d5596ff1b8f156068 SHA512 2e703d0a22240ce7361de5170409e0e4ff1e7bff4b1cbe6297e18dd95bfe92934678867dfd206912fc5ce7031ebc8c41d59eae9756b3b4272736a3f2df237c8a
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
index 1fab11efdac2..1173e5363b76 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index eff1960cb3d1..bf2987a64473 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,7 +1,5 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 AUX 3.34.0-fix-python.patch 2967 BLAKE2B a1a2859dcd5ecd1028b1b08d266960bb0366d0a940c81a2e9e338af02b72a01939a835dca37ab05b8a5b0ca8e118e2e0b5178479aa90b61a59b3f426f83e95be SHA512 097abd98bd2124c5e2536ed7bc8f337f836da4a4dda4e2566d533c16e771d91690f43f47e7d61a9a238e2c9cf6e687a057b6857265ef3892eacfa7f2079a00b0
-DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
 DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840
-EBUILD gnome-tweaks-3.32.0-r1.ebuild 1220 BLAKE2B 639c7c98ab4460bd17a5106864f3f5a8cdbd8d46c5bd3d34cdf45cb2f8fa9f914409ed76d307dacefe955fb8f6c2af213c01c4fc6ad94d7e9c451b8fc03ab3c1 SHA512 3c78ca14c52886c36e5b58a8d3a1a579b5b2558dfdabb0467b7ee26f093dedd185036382221d2c608fb5a152e3ebb45315b06b2d429c2495de990f1a0542ef55
-EBUILD gnome-tweaks-3.34.0.ebuild 1269 BLAKE2B d7dff6ea7652815bcbe22a88ea51c6690cc3a86dc72bb25f2489dd47f3537704d751ffecc9ff19c96a5019d20a88ada90d54687f1a7cc140f1239144457f3309 SHA512 b2cdf68c05cc4e71bea22a3be8321bae0ae4ae9c793e57575373907ddcee611f2091d07377a15666f226a5e7893eb7a572daea2ad858da2182937c72df8e8d9a
+EBUILD gnome-tweaks-3.34.0.ebuild 1274 BLAKE2B ac94b96ae6e3a2e2b7160df5eccc67fb2879a1bb84d24bdc86d83355903ef201becfbad5c3078b036270aa69ccf4ab2a0ad38a1010d594d24009505643aee8a0 SHA512 b093666a39cefa20c4e0ff99bf40c08aad841ac3f4a5448fd09ecafe6141c2ce408c3edd9f6c5db88d38c154daa8274bdb99ddc27df1ce8c4d5bd72f7325a3e3
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
deleted file mode 100644
index 9fd3cac37c4e..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# See README.md for list of deps
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=gnome-base/gnome-settings-daemon-3
-	x11-themes/sound-theme-freedesktop
-
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.30:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.28
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=">=sys-devel/gettext-0.19.8"
-
-PATCHES=(
-	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-)
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
index 2f288eb6ed57..785d4fb33a8f 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index d937b4e48f0c..cd122448eb09 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-3.32.1.tar.xz 528412 BLAKE2B 0e35757b8bd4139ebf436f69c6254cb26ba92f13d6ce345093b023151d3127f70a866572e6d42c9c93d2faf85abd6dc0ef2720955f5defab3c3415605eaf9152 SHA512 05a03e045c8278faaf39604d6cbccb449130d2c85e3231c8c9737e344fc249cd2949011fb1a0e4fb6085dc21374e7804fc7fa4161f51607d93b301cbcf5453be
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
 EBUILD yelp-xsl-3.32.1.ebuild 574 BLAKE2B 0c51d2be30a2bedf87ce1fb8b4d88e4e6b7b00a2962fe6c31b4d94e1a6d0476f1dbb8552196714407c5dc4ada3d02a704c68b9148557c24b9753e9f7977130bb SHA512 4aab22ce9fd16d45da239a51f1c09c87a4d2f0af3b4b7f43c7684f85232b11731a392f0d347d70abb7359b9a311453814f8e7d27b5d20c05fafe09252d0eff83
-EBUILD yelp-xsl-3.34.2.ebuild 560 BLAKE2B 6c56cde2b6bc48f9fd138aac622a59095d5079a17a6cb39820e0041fec248d6f3e90cf9feea1642e9eda694ddba217826c9a6a3db24af68dcffd16a596db50fb SHA512 4acc16bbd74dd7a0abe30558177e3c48c8f94f1aa0ac07f403dc4e7da7d8755582e0767285eb2673b8629f0279693b3c627614b46d092577f59f4a7bd1f7a050
+EBUILD yelp-xsl-3.34.2.ebuild 559 BLAKE2B 527dac5a6e539cad1ad105d6522659f28102921fd5003b1fd87c55e9adf3d5d961a0f143600414f69550fd78b2e0c0114395b70e59899976bd470919c513292c SHA512 dd366e5bde6504d86afe7b95b062aefae26c5789b9951e869bb3eb980728297d13348099de79aa415aa590f9fc03be79e31eae533633c8780d692322b306693a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
index 8db246fe41e5..c324f8bb9b57 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 5cbc848c311f..d824c9cf6956 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 7dcdc4a98311..4bbf85fb44d1 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,3 @@
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
-EBUILD libhandy-0.0.13.ebuild 1524 BLAKE2B 213c411f65be0d25d85624d099ef0f2f5248a979809df66be110f62817c7624e2e19f0b66b0937e449286f16a01c286672cb5886e6c79f96a61a6f25ed3324c5 SHA512 4e8e8756659769f4ccf1464f8b542718549f9d8d7bfa64a04b63f8e724b122fd1fc8bb66bd05ccface82e6f88d291629e31fffb845b89067b94d65eb3e3b0c34
+EBUILD libhandy-0.0.13.ebuild 1529 BLAKE2B 19de19913c32cf576e8c50e2d97d21baf1de6f82287c6f423e70ec1b86928ad1b1f619535e59abba0c6202dd4a5062e3293dd983bef15b5cb1e5f70bb27d958a SHA512 233e6db2a84c03810aaa1eeeebdd7a890aba1993de78f732e5d25db64d8d07ad7a0fd56109f6473fcfcfbad9875de22f598c592cac0818246c89da0a94bd558e
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
index 1fa76729e3c2..4f69d327c067 100644
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.13.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
 # SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index da3d39eeceb7..6f40fc3f8bca 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,3 @@
 DIST libwpe-1.4.0.1.tar.xz 49636 BLAKE2B 6fc9d6865873c7c16be3c959316539ecd4f08ae91dac003a46ca91e34503810cab089c9b609318b32919c02e111e209b68874aba0b6730e71b2e51fb75498656 SHA512 cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670
-EBUILD libwpe-1.4.0.1.ebuild 574 BLAKE2B af82f703a8a70acf33b3ac28562134cf1bfc8c44c20b8766a09d9ad9a7ba1b094a542d2e9fc1204e54367f81c21c5c2b407a832d4bc00314c831fb8ee6c78d4f SHA512 3be3ccd9415163abec1106aee0dc69b4b037c2b722e39cf99b5f4df576db67ca1f2f83217c0aa0f9a79a9f68874d51bdf615a19cf234e6f11a8f0a92e9d761e0
+EBUILD libwpe-1.4.0.1.ebuild 579 BLAKE2B c45bbab88c62dcc3d07c0ba9cc294b2156f7aef9d19b2899c3003b0e1104fd8aa4917e114c86425c404498527dc47d7b2f75f5f1a28f9b7a21e83d9c3009f090 SHA512 aca65332f9a002e9da94b21da16439d529200adf6afb3a5f8dbd8f5007df8a6338826a9feb0c4212f5b5f34a3afdf35d36eb1f4034e3b19e44573058f422d018
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.4.0.1.ebuild b/gui-libs/libwpe/libwpe-1.4.0.1.ebuild
index df42a5e3df27..4394cfb0a82b 100644
--- a/gui-libs/libwpe/libwpe-1.4.0.1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.4.0.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index f67fe32d4026..400b441cd070 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,4 +1,4 @@
 AUX 1.4.0-eglmesaext-include.patch 816 BLAKE2B 451eb913d74197820adcb639e6768c479aa8add03d8bc9e47933325380390268ac79c53d098e636ac484d5613b5e7e7ea6584949d745a814b9f6075499d733cb SHA512 453e6c310373b5e147a9a898401788e5d4ec6210e004eb0ad8428e0508a38296cdcb91442636bb8e8ef5faa2f0a7bab13d5f49f8c73c3b15de1983b44a03c9a7
 DIST wpebackend-fdo-1.4.0.tar.xz 30204 BLAKE2B dda32e0408a8fd98dc1d03c4606e20fb219fe722aef24360e31cd62027601a4795dbdbf026925e284e6b87f223e6e79824e8e6bab181b7bbf42a9db0664358dc SHA512 f94167b13345adfda15312b16e5de04910f812c7481f7e3c8a00163ce8387be22373867b51b2c5cb424e62de877c1aaa48592aac85ec9cc03c969c7e83185660
-EBUILD wpebackend-fdo-1.4.0.ebuild 676 BLAKE2B 29c9716d21c8edb88c2d8ebf26820782bc3907ef6a575197dace85bad027e7320e25a3e97f0430610324fece27df1c415bd2ec61e18d3d734fbf3b006620c19c SHA512 7528aca942b7dcf976a43109896e42aa1a5265e047bb06da33ff1f8571eac9bdf4b3905990147ab30377072291e3761f25f0264c83b7a19d230ce0329b6721f1
+EBUILD wpebackend-fdo-1.4.0.ebuild 681 BLAKE2B cf241acf23a9f0ed3cb9b0a77b351e1836af881d634f9ede62185a9bf2ca93ec107ff4434f16a303720f7029fd10c37b32e8020fbffd3424ca321cbc96d3e589 SHA512 19b01b03c88022aeed8e377b75c5eabfabeeed854c4dfff4088bef7d91c2b5667430331412291a87719415f2a6ff7a56ee32247cc97e8769026d726b703fe09a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
index dd5e1106235d..19d3cdbadb2b 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index fbf5da165443..31e30e5b7aee 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest
index a3bc86eabf84..fde0786efdfe 100644
--- a/kde-misc/kio-fuse/Manifest
+++ b/kde-misc/kio-fuse/Manifest
@@ -1,3 +1,3 @@
 DIST kio-fuse-4.95.0.tar.xz 44236 BLAKE2B 0dcfe077cd2ac7e94bd836c0e0c8599ac739c7e4886908660f512b68b9eee28945333ab254df220c5cb940fa13789cb33f3f6b1d31acc11c1990b265e9f295e6 SHA512 a4c2ce4bdee6aefa7fcb5bc16d5179e87ec513259b754ffeb75d5d4836c56f05e417cb8b605e3cae33bc93b0cf61fb7042b3edf476d3d9e312a1fd65578ba4b5
-EBUILD kio-fuse-4.95.0.ebuild 711 BLAKE2B 10435afefd514a338ef28c6ae5ea2f506caa5dac8d1f17f24b8a22bea05f50e8b9bf32a9047b71626e4fe310d87a8dcaf0b0b32d62d03c7c16aa44a5ffe97797 SHA512 38f6d8198212982831c3eae8105d53fdaac0e58866f738c078ec43b2b6541e1db8bb3615fe179e454b63fe8a413d721b13cfbad26eaf2913ab4b789611766467
+EBUILD kio-fuse-4.95.0.ebuild 761 BLAKE2B 11ac325c1340771efb51b409bee451d2db67f55627419ff980d490e5a3b7f523aba0bb72363218f54ec9a755a073cf043ba9eab2272101815beca2cb1e891436 SHA512 907e8527ce9f6ec5e33c9bec29190432dd9ec3aae2f55e0d4b07313a086c0e15e154474d78c93a7dfced217997ed9864501aebb824a529b06804001db25a1a98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild b/kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild
index 62b097801e07..4edff21bbe30 100644
--- a/kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild
@@ -30,3 +30,5 @@ DEPEND="
 	sys-fs/fuse:3
 "
 RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # depend on fuse kernel module
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 0cd3c52475c4..addf50a958ea 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,5 @@
 DIST tellico-3.2.3.tar.xz 5589552 BLAKE2B e22f0344ccd879694976bc00fa6bcb52e3b878d4ef92c05b9b9a62ab74b1e84cd4b649682a55ee4a1b2da4678676abe8f1da5591f57dbd7db156b5e5bd0b9dd1 SHA512 4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7
-DIST tellico-3.3.tar.xz 5618088 BLAKE2B 0896e4df313233e132021047fdd522b527fa1b0b4eea7de36788acbe59bc20cb7556c1a43643c431be51ec813326ff0280b1ba7e49e1486bc9805acaa4b3b808 SHA512 235e29e172eaf41bc07f08691d41ac5e246a2e1be6c2765208440926bce4c6f1d8bf37d4f806c26809a21aebefac7694157cf472656c1a37bca584b7c5ccdc10
+DIST tellico-3.3.1.tar.xz 5619068 BLAKE2B 5b70f42102c2dbb349f343146edb30e94d73b891f7b95fcba87cc19ea6228a62273f9f0321c32037a62cb2cffa2ec61108db519b3387968d2a0ebd1ca332bfd7 SHA512 12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74
 EBUILD tellico-3.2.3.ebuild 2274 BLAKE2B 8e8e349acda8333b06c48e343cf441437961894c84c8d0a36e8f50da118835f8bbf85b2e08091f2822fbf232142930fac60d1ff1f12abcee23551e2c8dc7d01c SHA512 ebcc4734e81cb790e98fccf5fcb344b7fae5c6c1a0174a0201786c11c6e1da1f293400af2c0d39dced149fdafdb05c93ab44940b14956263f7c4641f43605cb0
-EBUILD tellico-3.3.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
+EBUILD tellico-3.3.1.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/tellico-3.3.ebuild b/kde-misc/tellico/tellico-3.3.1.ebuild
similarity index 100%
rename from kde-misc/tellico/tellico-3.3.ebuild
rename to kde-misc/tellico/tellico-3.3.1.ebuild
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 801d15082975..2200ad1436ff 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 817fc3052764..34459865eafa 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -7,5 +7,4 @@ AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 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.18.5.ebuild 4512 BLAKE2B 1e139447f604f0aa4ca1041a742b5137fa934508675a1ad14ae3f584fbd45df8bd0d62f9c1806b9a8dc43cf4f68d2456faed8bb71359932c71ff2746a4b02dfa SHA512 4fe5864070bbcf16283e2fa821b02e56674304b836511662a21e60a6ae4e6be84f6727f8d7ce41f28f6284cbc28a5420c5a4866299c12b591feb493e705d28bb
 MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
deleted file mode 100644
index 78ba5b38ae68..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
+++ /dev/null
@@ -1,150 +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.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-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 ~arm 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=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
-)
-
-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 ibus IBus)
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	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-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 5295080f9c9f..be72bf155ef4 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,5 +5,4 @@ AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 3
 AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
-EBUILD plasma-workspace-5.18.5.ebuild 6987 BLAKE2B b17560d59293f948bbcca87a39f3770ec39a319d2d2f8b3df194a35191f068483d0c5e218594212fdaa4af5c954ae03f7fac454f9265bbc70badc681c06a4ca2 SHA512 4fab8614add4a4b0e457e0de49926e13b712a82dfdb4726c72ceaac104a7f1b509228194f5648411164e0dff4ec5283c44f0151b12d23a46a1e2a73203f53ba1
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
deleted file mode 100644
index d4db44181265..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
+++ /dev/null
@@ -1,223 +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.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-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" # downstream patch
-
-	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
-)
-
-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/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 85c4e9de223a..defbf677b5dd 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 22935eef2a93..dd59909e3ab6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,3 @@
-AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa
-AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
-AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
 AUX 3.34.4-CVE-2020-11879.patch 4256 BLAKE2B efe57b53f04908ed5ff83da42a759428b68cef0ceeeee158cdc9792e4af9f31654621742db3ae5a15f30ba68409cfbe775d09d7893cc9dbac0328b5c092f3695 SHA512 7484974c557eb084055b80f45f03d0d7f40084bdaf53cd90dd1f62efea250801eb99f6a35befd9e19c3c44e0b2d1ddc0db299d3063ca2045b7421bfcbba27c76
 DIST evolution-3.34.4.tar.xz 11964640 BLAKE2B 48b58208064633236be32f44ff49f8718e110d1ab1aa311b3652affb3b5793b9f6775519191a9480efef731c9f14ff269d65dacbd8d411b30be64daaf953c4b5 SHA512 54ff4b191237b291e3e008ca8691624ac0af35bae096c20615ac5a51be033c97ea28be6629362a3676bee9285afab666c4624cfcca536bf5255ecd38dcf3ac58
 DIST evolution-3.36.2.tar.xz 12027568 BLAKE2B 3bf2eca4a26e16b34567b4a976ccaa0d3138e3a7ba1a0c9652c3e642dd7e332e4a9994b9e5ae6ce3ed137eb85ac396c83b3bb84fdd99129fe4537a391ad268ff SHA512 2dccf69d32c4381f40ccdf84b621b8241c22bdb992cb77a87ce2e62e3598c436e7d0f8b72ce4fe504399c04a38266b0b0c2abf04000267a16c242d2dec7b9e9c
diff --git a/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch b/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch
deleted file mode 100644
index 54a5fc714def..000000000000
--- a/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Mon, 22 Jul 2019 16:06:21 +0800
-Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line
-
-When a library provides no way to find linker flags for linking with it,
-the build system usually depends on the user to necessary put -L flags
-in LDFLAGS environment variable in order to find it. However, GtkDoc
-module constructs the command line by itself, and it forgets to add
-LDFLAGS to the command line of gtkdoc-scangobj.
-
-It is especially important to include LDFLAGS on non-GNU systems. For
-example, FreeBSD libc doesn't include a gettext implementation. GLib
-requires gettext, and it pulls in an external gettext runtime for it.
-However, gettext-runtime doesn't include a .pc file, so LDFLAGS is
-required if gettext-runtime isn't installed in the same prefix as GLib.
-Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can
-result in a linking error because -lintl cannot be found.
-
-In evolution-data-server we are lucky most of the time because it
-depends on a lot of external libraries. These external libraries are
-likely to be installed in the same prefix as gettext-runtime, so not
-using LDFLAGS doesn't cause linking failure because required flags are
-already pulled in by other libraries. In fact, this problem was found
-when building libical, which uses a similar GtkDoc.cmake file.
-
-In addition to the change to include LDFLAGS, this commit also changes
-the following things:
-
- - Instead of constructing _scangobj_ldflags in reverse order, do it in
-   normal order. Appending is easier to understand than prepending, and
-   the linker also interprets -L and -l flags in normal order.
-
- - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment
-   says, and it is expected to work because we no longer constructs
-   _scangobj_ldflags in reverse order.
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
----
- cmake/modules/GtkDoc.cmake | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index cc6cc007a..0ba1a7a78 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 		list(APPEND _scangobj_deps ${opt})
- 	endforeach(opt)
- 
--	# Add them as the last, thus in-tree headers/libs have precedence
-+	# Add it as the last, thus in-tree headers have precedence
- 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
--	list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR})
- 
- 	if(_scangobj_deps)
- 		list(REMOVE_DUPLICATES _scangobj_deps)
-@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 				if(NOT _output_name)
- 					set(_output_name ${opt})
- 				endif(NOT _output_name)
--				set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}")
-+				set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}")
- 
- 				if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY"))
- 					set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>")
-@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 		endif(TARGET ${opt})
- 	endforeach(opt)
- 
-+	# Add extra flags from LDFLAGS environment variable
-+	set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}")
-+
- 	foreach(opt IN LISTS _scangobj_deps)
- 		if(NOT TARGET ${opt})
- 			set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}")
- 		endif(NOT TARGET ${opt})
- 	endforeach(opt)
- 
-+	# Add it as the last, thus in-tree libs have precedence
-+	set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}")
-+
- 	set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}")
- 
- 	if(NOT (_scangobj_cflags STREQUAL ""))
--- 
-2.20.1
-
diff --git a/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch b/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch
deleted file mode 100644
index 56e66eae8938..000000000000
--- a/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 5 Aug 2019 12:55:23 +0200
-Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line
-
-The LDFLAGS could imply certain compile options being used (like -fPIC),
-but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation
-could fail.
-
-Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
----
- cmake/modules/GtkDoc.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index 0ba1a7a78..2dfc4d691 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 
- 	# Add it as the last, thus in-tree headers have precedence
- 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
-+	list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
- 
- 	if(_scangobj_deps)
- 		list(REMOVE_DUPLICATES _scangobj_deps)
--- 
-2.20.1
-
diff --git a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch b/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
deleted file mode 100644
index 192f4d0d3d8c..000000000000
--- a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 66aeb5aeb4065f6a5482d10bacbe370de2e49b7f Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 29 Dec 2019 15:47:32 +0200
-Subject: [PATCH] Add env var workaround for WebKitGTK-2.26 compatibility
-
----
- src/shell/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/shell/main.c b/src/shell/main.c
-index abc140d55f..cd671fd89a 100644
---- a/src/shell/main.c
-+++ b/src/shell/main.c
-@@ -607,6 +607,9 @@ main (gint argc,
- 		 * it already set, thus he/she can override the Evolution's default. */
- 		g_setenv ("WEBKIT_DISABLE_COMPOSITING_MODE", "1", FALSE);
- 
-+		/* Workaround issues with WebKitGTK 2.26 */
-+		g_setenv ("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", FALSE);
-+
- 		/* FIXME WK2 - Look if we still need this it looks like it's not. */
- 		/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=683548 */
- 		g_type_ensure (WEBKIT_TYPE_WEB_VIEW);
--- 
-2.20.1
-
diff --git a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
index 35131939ad9f..426c5373fb9b 100644
--- a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ MY_PV=$(ver_cut 1-3)
 MY_PVR=$(ver_rs 3 '-')
 
 DESCRIPTION="Free Anti-Virus and Anti-Spam Filter"
-HOMEPAGE="http://www.mailscanner.info/"
-SRC_URI="http://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
+HOMEPAGE="https://www.mailscanner.info/"
+SRC_URI="https://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index 2a1c0727319b..5b760a436336 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -1,5 +1,5 @@
 AUX confd.mailscanner 147 BLAKE2B be4369be15115d4e1194d0d56b547e88a824378dce4af82f1600cff3cbd7fc75bd99919a6127e1c4ae99268605cc4d96187b4806fb7dbe60000adda8b9c0b2fd SHA512 2fb6f96eef254fae597e23ddb80c649e5754999e542436b7172ab4fca0d3e281645a2fcf21a3bde4c6c9d7cd48de868e64e74c5caac7ff235dbbbcc6c2ebeda3
 AUX initd.mailscanner 982 BLAKE2B c630647b12057e9c56264b9d5b58a6cf4fca8e3d07d38204a64714fcc99d7be3929b2e774e268ec958fefa071db2ec20e9dacc22a64b6c1f4e338c57c1bee6ef SHA512 88a14b02ec004b487b6aa9a8732092a18b465f8aa81e2c958b96434064a15ad5a5ce43b473679bd8b18a661f972c8df756c54691d35c4261dff8a26cd8e291ec
 DIST MailScanner-install-4.84.5-2.tar.gz 9510489 BLAKE2B 7bfdb0ba9fbd38281328e66fab9512b6dcc596d92fb18186df950d26c451bff0a8fa5345df7849e60e0040e6559754ef9e2099c17425ed4a6465071e0fb610dd SHA512 d9d082e29ddb6eae4f30069298507805a7674c264bf8edad3db3322fa0f2c2ad4539c0c2213c6fcbee11b7c57a36218c1d24243077358bac98e7ae07f7ee506f
-EBUILD MailScanner-4.84.5.2.ebuild 9558 BLAKE2B 0fa0a676e8407e44fce381a0dc027026acc4bfe3fbc33190f4bc2e037b39ef0fde6cfd3aed3ab4675eeabf67b618815ac51428e5f1fd8944a3510b2b24a3dc91 SHA512 f0003842049b6a7f198d0ba64ceae698a6790b0de51f6a813151f8128871ea91495733fd62d43bee33a89853eaac842b53a4d8083a48d57b3b73eade85c9428b
+EBUILD MailScanner-4.84.5.2.ebuild 9560 BLAKE2B bd421f08f148633612872243d2c7fab5c748c795e92890521032f32000ebd40813babe09d83694062240de873864d950cdb6a6b0a4fc3cded7479ac0c69503ff SHA512 5327747a40ad5b828b70b1e04efdc2ca53e94244fbd498d09812d95c122be9e8cee78f6d0de2dc45ee068327cc3a0328294f305f3bd26ff83786a084325cca7a
 MISC metadata.xml 511 BLAKE2B aba5245d0255701f471123abd5309a3b2d8702ed1189257ffb47ff5af540a24c82aad2f6115f79e146e1c90a6208bd961da29a553219eb71508d152c8be4d0d0 SHA512 6087d7d6977befe9271c7f95cb0ed5a232e7d4bb1e070259ee3fef10173be00f77cc834ce14f55b9123f7c4379595c4a5f817fefdbd9fde760a57e66144791b0
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index eb46c907e159..ca6564a66a1e 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index c01171ab4606..714d71efaed0 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,4 +1,4 @@
 AUX libspf2-1.2.10-gcc5.patch 1080 BLAKE2B ce085a71cba9f6a493c7b276dada02dceb8efdb75df9d0062b74acd9b0e9d5a9c56cdd970743cc9e4860a4714e24d0e4687d9a2c5d321e320a6888c06f88e6c3 SHA512 cd2af129e334e0e1efcd722680f8f7cb064e6f5581ce41c791cb4f5f34d1eb4ac0dc586114b3017b4fd2ba350f11972f78a4029a8fc03118cf74c4f1276cd12b
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-EBUILD libspf2-1.2.10.ebuild 1215 BLAKE2B 13dfc8b345caed7c7c8129905c7b7251686ab6bcfb2cbcb22a63360529890bb75e5813b9e9a92b2c649137dcdf81d3310a765e27a6895067d6e41a4fb2e62838 SHA512 746d8c4c07edac2d23281870d9983f0ca52ba9bc9494f9e7c9f077d5a7d2a8c68df75fcc78b218713df04dff766c4f7b2c1af18ad92400ba82a8a1df83fc7a65
+EBUILD libspf2-1.2.10.ebuild 1217 BLAKE2B 1bf70c5a8adc6658410a40975197dc227d25a62658d7cbb1533c940067e1b161969ab9783f8229f115d08d36f5c5b0d91e1a8da65efe24c7c15feb4fcb8768cf SHA512 66032f679276548e0b3e8999922e7008508d35824d59131c10c9eebe971675ade779a7377e73e414073844563570eebbdf5c2e7af4734280b1286649b15d3a14
 MISC metadata.xml 588 BLAKE2B f2a34d6c55b8678f9ef69824ccce32a51508fe251af758d4d4c3ae05b51498b543e5f60757764a4a47dbc98587bc2b57faced4965d8c401e35f8e36605313a4c SHA512 8328d959a8b69fa3e10108f21cf2c53a3daf4aacbd9646af8e5af95ec818eeb6aebc20185b991e4ce6a3a2d0101bf67ce47b7af85dec4b06c2748d5f4fafd18e
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 38a4f67b8ce2..8e1ef5506072 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
-HOMEPAGE="http://www.libspf2.org"
-SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
+HOMEPAGE="https://www.libspf2.org"
+SRC_URI="https://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
diff --git a/mail-filter/libsrs2/Manifest b/mail-filter/libsrs2/Manifest
index d2b3a86836e0..84c89f38c5f9 100644
--- a/mail-filter/libsrs2/Manifest
+++ b/mail-filter/libsrs2/Manifest
@@ -1,4 +1,4 @@
 AUX libsrs2-1.0.18-parallel-make.diff 477 BLAKE2B 21f7d1bdf54c73c28a7c5f59da1deb11282017becf812a3c964363eb6c316a03a9dac8f8d186489638f092b9fa76399a8763ea42104a5c09dafbd0be2253444b SHA512 a30b4ebe22f2f890597c8b1d6ffa5e0d81cc9b5bfb583899cf5996278d0b17a58850870db29d26c032dc10eeb0bf4e660071fc483c84fc70d317687339fbb482
 DIST libsrs2-1.0.18.tar.gz 295748 BLAKE2B c4572ec58b474f47d34e127db7ce142ba6e715fb7f987801ae55a26628b5e2535b645b8209b6f5b106150b7999d2757e6b7bb64ee556d4b1c52df73144081626 SHA512 b9c189caa227487e90566f65430345f09a3d545fc286a3eb0c445aee3a74905c1a9248ce78b36a7cfb6a2936f6cd1efbe99ba7b8df49a613a81c6435396f5422
-EBUILD libsrs2-1.0.18.ebuild 646 BLAKE2B c9fad4cc79e7cde66330bf1615e32fbac51fc79741b0d5a7185240012d6f2337ec80f4e74c41fb19d85d4afd6d0dfeaf87bd55f0bbfd2fa6d80295b521c3be28 SHA512 17293195555996e17d7ce7a74db0252ca29098b68f7663f4b6c5c01f35100cd0485207186c49c2a7ff71e13297dee6c7fb1d377a987e34e85f8f2033e8e79ded
+EBUILD libsrs2-1.0.18.ebuild 645 BLAKE2B 9498fbbe89354df714c5ad8c3dea93e34be7bc1405a3c07eae01ae0b70158f1bd5e597565e4ec483ec196444071cb4781041507c7f214635387d034f3c4798b0 SHA512 87ec4fb64213d1fda387dbea96ea832b9ff1d05c0fc5fb2398afc7d9d8d93424879d185a20705d6be41f1677807e50f3bb448861c83fec9ab41644d2befd3bde
 MISC metadata.xml 690 BLAKE2B b3a2bc9aa4161919f2180d85d14c186cbb116e48d9ec0594f495b4a592c2e5f35c09402c70acd5ea99af7e80734bfd64a6e8c41a8de8ddd32e5d30d2532fc475 SHA512 477ded5b9f894d5e438356ccbc8a9f39ca4790b965e8fe0a5f7d2ba6af4ccf571306e86fb30523ba4ae837a9ec88098f55e2d988c9bf2a35197aa643d3fe7381
diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
index 6eca36dacfb6..e31cfb85a72c 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit eutils autotools
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
-HOMEPAGE="http://www.libsrs2.org/"
-SRC_URI="http://www.libsrs2.org/srs/${P}.tar.gz"
+HOMEPAGE="https://www.libsrs2.org/"
+SRC_URI="https://www.libsrs2.org/srs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 9a1b57830e97..dcd2b9c9c24d 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index eb428fbd0191..33401c0d0e2c 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -10,6 +10,8 @@ AUX exim-4.93-as-needed-ldflags.patch 6013 BLAKE2B 2de473f089a36cabd5481020524dc
 AUX exim-4.93-fno-common.patch 767 BLAKE2B cd66b56d88badd97c1d081c3458adf294352b9f34dc0faee820d75ed4b97be8a5f313c4ba46ea08d4c3ba4744badf3759393bea1455a3e7fc04d80939d5ec49e SHA512 5fc5cab9091296e0bc7665e9e08f5232decef4585c7504abab104a8a7cf1c69aee4f535f1e1214b94aeb856b8f5620c42608f35e7c7ff26667de88a8719bd301
 AUX exim-4.93-localscan_dlopen.patch 9585 BLAKE2B 02b11e75c94d70a787973e89dc329fc006b263d4411ccfb177acf596fd3832cc471004394cf126a9299b62113dc25fcf61bff9bb63d39c19f60ca7203c732be3 SHA512 5de142c1da26cd60e9e05de25e7c7de1f338591b3d73ea9ff151dc446ca45a2361841a28776e9680e77183f2071a7cac68063d5f83e79257b7b4a4884e1e9110
 AUX exim-4.93-radius.patch 2791 BLAKE2B 94edcc141e9ed4b8f669298fc9af5e2fdc2835488567917721c7061835e7d7980c3944cb21b2cdb46041be7e8f93d57fc4d26cda0aa9583b98a594ee6c11260a SHA512 8393bddb5f85879e6fb3e4a8272df8583d99600f5ef25abbcea429743e9e396248e47c2dabeba7c6178d2a4d21f82ae68cde92a50bcb9598370bd0b3d8bc220f
+AUX exim-4.94-localscan_dlopen.patch 9595 BLAKE2B c48eaaf486585890dc4028beaca7a39d5b1d965323468c4c317d099ccf0e2e983e9366cb923e0b34546a66ac718ee15e8f682a65cdcd771de8164f76b86c0aa2 SHA512 bd7872473ad1ab9eca41757ca6ee7dd8628bddfa145191aea6a5ac4b62b0e4e3539803cf75fcb22b8bfdcca33a7d2f71ff58ca1862f456960e6b7e4d262ba6ef
+AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa317026d159de7a0ac37f2563999a6470df2dc203c1fcda8e7074c949133a0311c2b94c4b48bbc46d64c7c486202c SHA512 13863226883f79dcc781fe8eb3b50ad3c5511af130cf6e41ce40e8543d46832668bd7d746a2cc67842748cdf26144bef4aece49397d3168819215eac93ca1e6e
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
 AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
 AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998
@@ -19,7 +21,10 @@ AUX exim.service 229 BLAKE2B 6d6396ef98b8e7c4fcfa28e24223bd58393387abedfb960284d
 AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa857d0d32285abf6db23c3d717992c43443ab4bcd97a19ec3811f182200a2d99a48ced6cfb6bc SHA512 db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae
 AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
 DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e SHA512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
+DIST exim-4.94.tar.xz 1828824 BLAKE2B 3836ae6427830b16fa366f5ca35431144eb48b922b699da20f3a5e423c9c8266def981afa008e50a879ac3583f3491d8f9c449e67c66053dc45e8612e38e836f SHA512 3bf95ade30902327403e7308089a3e423761da5b0745397dace7c7fd15ba3838d93e0ee418f1fed57606f79e57b793c7c7407e5c0d526146f0036126d5d95316
 DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
+DIST exim-pdf-4.94.tar.xz 2089804 BLAKE2B 08f4631e903f1344d76da8dc1dcfd122cd5963bb2efbd54a486e7cf95df9e7ef06aa31dead1243a007656f05c18993f3fda18ba16ba1fde9377ac33324d5fe99 SHA512 d56666b619ba850dfa68de90afc7435bae741d72d18b5837762781ba18032878323ad40978e0113d4b88a01fd7a1d07213e6a74c38d699371d62796b6c3c35cc
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.93.0.4-r1.ebuild 14020 BLAKE2B 2d97b3d39774320271507fdf50f93d9dac88bdaa54b0d8387b2baeb6fff6baee9bc4185b86591f12053f3210b18514f027a6de9a103daad81d871fee837a9c7e SHA512 382c09462376ff6a156ede33316585c38e93a4e5474271f06bd141be20567af2df4e0a26539a219d09cd3b760a754dfc187fd75c712637cc60723b5d2e7f5526
+EBUILD exim-4.94.ebuild 13846 BLAKE2B 549c21f0695e50ba4c4f91b8beab7ab04a60eafc0fc3c89d5b697bd0f1befae5dac091e9feeedef64f26fc47dbacb7ea1d18681371143325cbb275f633434db3 SHA512 12f941c204ca217119c6da4e21e2b4f4a6387d3f360c1e5f7724e90ec28829d60a0ee141a1d950151ce219b3ae2e559805bdccc71fa7c5ae925f15dfebda57cb
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.94.ebuild b/mail-mta/exim/exim-4.94.ebuild
new file mode 100644
index 000000000000..eaeaaeefbd37
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.ebuild
@@ -0,0 +1,588 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	dkim? ( ssl !gnutls )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? ( exiscan-acl )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+       [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+	dev-libs/libpcre
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[pkcs11?]
+			dev-libs/libtasn1
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nis? (
+		elibc_glibc? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
+	"
+	# added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+	# Legacy patches which need a respin for -p1
+	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	eapply     "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279
+	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
+	eapply     "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
+
+	if use maildir ; then
+		eapply "${FILESDIR}"/exim-4.94-maildir.patch
+	else
+		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	if use !elibc_glibc && use !elibc_musl ; then
+		cat >> Makefile <<- EOC
+			EXTRALIBS_EXIM=-liconv
+		EOC
+	fi
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+		# keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+		CFLAGS += -I$(db_includedir ${DB_VERS})
+		DBMLIB = -l$(db_libname ${DB_VERS})
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+				LOOKUP_LIBS += -lnsl
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+		cat >> Makefile <<- EOC
+			EXIM_MONITOR=eximon.bin
+		EOC
+	fi
+
+	#
+	# features
+	#
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+				>> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL=yes" >> Makefile
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	else
+		echo "DISABLE_TLS=yes" >> Makefile
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# DANE
+	if use !dane; then
+		# DANE is enabled by default
+		sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc -r "${S}"/doc/.
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
+	fi
+	if use dmarc ; then
+		einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+		einfo "you can populate this file with the contents downloaded from"
+		einfo "  https://publicsuffix.org/list/public_suffix_list.dat"
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use srs && einfo "SRS support is experimental"
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	elog "The obsolete acl condition 'demime' is removed, the replacements"
+	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
+}
diff --git a/mail-mta/exim/files/exim-4.94-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.94-localscan_dlopen.patch
new file mode 100644
index 000000000000..68ff48ac2a33
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94-localscan_dlopen.patch
@@ -0,0 +1,269 @@
+diff -ur exim-4.92.orig/src/config.h.defaults exim-4.92/src/config.h.defaults
+--- exim-4.92.orig/src/config.h.defaults	2019-01-30 14:59:52.000000000 +0100
++++ exim-4.92/src/config.h.defaults	2019-02-16 18:17:24.547216157 +0100
+@@ -32,6 +32,8 @@
+ 
+ #define AUTH_VARS                     3
+ 
++#define DLOPEN_LOCAL_SCAN
++
+ #define BIN_DIRECTORY
+ 
+ #define CONFIGURE_FILE
+Only in exim-4.92/src: config.h.defaults.orig
+diff -ur exim-4.92.orig/src/EDITME exim-4.92/src/EDITME
+--- exim-4.92.orig/src/EDITME	2019-01-30 14:59:52.000000000 +0100
++++ exim-4.92/src/EDITME	2019-02-16 18:17:24.547216157 +0100
+@@ -824,6 +824,24 @@
+ 
+ 
+ #------------------------------------------------------------------------------
++# On systems which support dynamic loading of shared libraries, Exim can
++# load a local_scan function specified in its config file instead of having
++# to be recompiled with the desired local_scan function. For a full
++# description of the API to this function, see the Exim specification.
++
++#DLOPEN_LOCAL_SCAN=yes
++
++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
++# linker flags.  Without it, the loaded .so won't be able to access any
++# functions from exim.
++
++LFLAGS = -rdynamic
++ifeq ($(OSTYPE),Linux)
++LFLAGS += -ldl
++endif
++
++
++#------------------------------------------------------------------------------
+ # The default distribution of Exim contains only the plain text form of the
+ # documentation. Other forms are available separately. If you want to install
+ # the documentation in "info" format, first fetch the Texinfo documentation
+Only in exim-4.92/src: EDITME.orig
+diff -ur exim-4.92.orig/src/globals.c exim-4.92/src/globals.c
+--- exim-4.92.orig/src/globals.c	2019-01-30 14:59:52.000000000 +0100
++++ exim-4.92/src/globals.c	2019-02-16 18:17:24.549216150 +0100
+@@ -41,6 +41,10 @@
+ 
+ uschar *no_aliases             = NULL;
+ 
++#ifdef DLOPEN_LOCAL_SCAN
++uschar *local_scan_path        = NULL;
++#endif
++
+ 
+ /* For comments on these variables, see globals.h. I'm too idle to
+ duplicate them here... */
+Only in exim-4.92/src: globals.c.orig
+diff -ur exim-4.92.orig/src/globals.h exim-4.92/src/globals.h
+--- exim-4.92.orig/src/globals.h	2019-01-30 14:59:52.000000000 +0100
++++ exim-4.92/src/globals.h	2019-02-16 18:17:24.549216150 +0100
+@@ -152,6 +152,9 @@
+ extern int (*receive_ferror)(void);
+ extern BOOL (*receive_smtp_buffered)(void);
+ 
++#ifdef DLOPEN_LOCAL_SCAN
++extern uschar *local_scan_path;        /* Path to local_scan() library */
++#endif
+ 
+ /* For clearing, saving, restoring address expansion variables. We have to have
+ the size of this vector set explicitly, because it is referenced from more than
+Only in exim-4.92/src: globals.h.orig
+diff -ur exim-4.92.orig/src/local_scan.c exim-4.92/src/local_scan.c
+--- exim-4.92.orig/src/local_scan.c	2019-01-30 14:59:52.000000000 +0100
++++ exim-4.92/src/local_scan.c	2019-02-16 18:29:56.832732592 +0100
+@@ -5,61 +5,133 @@
+ /* Copyright (c) University of Cambridge 1995 - 2009 */
+ /* See the file NOTICE for conditions of use and distribution. */
+ 
++#include "local_scan.h"
+ 
+-/******************************************************************************
+-This file contains a template local_scan() function that just returns ACCEPT.
+-If you want to implement your own version, you should copy this file to, say
+-Local/local_scan.c, and edit the copy. To use your version instead of the
+-default, you must set
+-
+-HAVE_LOCAL_SCAN=yes
+-LOCAL_SCAN_SOURCE=Local/local_scan.c
+-
+-in your Local/Makefile. This makes it easy to copy your version for use with
+-subsequent Exim releases.
+-
+-For a full description of the API to this function, see the Exim specification.
+-******************************************************************************/
+-
+-
+-/* This is the only Exim header that you should include. The effect of
+-including any other Exim header is not defined, and may change from release to
+-release. Use only the documented interface! */
+-
+-#include "local_scan.h"
+-
+-
+-/* This is a "do-nothing" version of a local_scan() function. The arguments
+-are:
+-
+-  fd             The file descriptor of the open -D file, which contains the
+-                   body of the message. The file is open for reading and
+-                   writing, but modifying it is dangerous and not recommended.
+-
+-  return_text    A pointer to an unsigned char* variable which you can set in
+-                   order to return a text string. It is initialized to NULL.
+-
+-The return values of this function are:
+-
+-  LOCAL_SCAN_ACCEPT
+-                 The message is to be accepted. The return_text argument is
+-                   saved in $local_scan_data.
+-
+-  LOCAL_SCAN_REJECT
+-                 The message is to be rejected. The returned text is used
+-                   in the rejection message.
+-
+-  LOCAL_SCAN_TEMPREJECT
+-                 This specifies a temporary rejection. The returned text
+-                   is used in the rejection message.
+-*/
++#ifdef DLOPEN_LOCAL_SCAN
++#include <stdlib.h>
++#include <dlfcn.h>
++static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
++static int load_local_scan_library(void);
++extern uschar *local_scan_path;        /* Path to local_scan() library */
++#endif
+ 
+ int
+ local_scan(int fd, uschar **return_text)
+ {
+ fd = fd;                      /* Keep picky compilers happy */
+ return_text = return_text;
+-return LOCAL_SCAN_ACCEPT;
++#ifdef DLOPEN_LOCAL_SCAN
++/* local_scan_path is defined AND not the empty string */
++if (local_scan_path && *local_scan_path)
++  {
++  if (!local_scan_fn)
++    {
++    if (!load_local_scan_library())
++      {
++        char *base_msg , *error_msg , *final_msg ;
++        int final_length = -1 ;
++
++        base_msg=US"Local configuration error - local_scan() library failure\n";
++        error_msg = dlerror() ;
++
++        final_length = strlen(base_msg) + strlen(error_msg) + 1 ;
++        final_msg = (char*)malloc( final_length*sizeof(char) ) ;
++        *final_msg = '\0' ;
++
++        strcat( final_msg , base_msg ) ;
++        strcat( final_msg , error_msg ) ;
++
++        *return_text = final_msg ;
++      return LOCAL_SCAN_TEMPREJECT;
++      }
++    }
++    return local_scan_fn(fd, return_text);
++  }
++else
++#endif
++  return LOCAL_SCAN_ACCEPT;
++}
++
++#ifdef DLOPEN_LOCAL_SCAN
++
++static int load_local_scan_library(void)
++{
++/* No point in keeping local_scan_lib since we'll never dlclose() anyway */
++void *local_scan_lib = NULL;
++int (*local_scan_version_fn)(void);
++int vers_maj;
++int vers_min;
++
++local_scan_lib = dlopen(local_scan_path, RTLD_NOW);
++if (!local_scan_lib)
++  {
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - "
++    "message temporarily rejected");
++  return FALSE;
++  }
++
++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major");
++if (!local_scan_version_fn)
++  {
++  dlclose(local_scan_lib);
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
++    "local_scan_version_major() function - message temporarily rejected");
++  return FALSE;
++  }
++
++/* The major number is increased when the ABI is changed in a non
++   backward compatible way. */
++vers_maj = local_scan_version_fn();
++
++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor");
++if (!local_scan_version_fn)
++  {
++  dlclose(local_scan_lib);
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
++    "local_scan_version_minor() function - message temporarily rejected");
++  return FALSE;
++  }
++
++/* The minor number is increased each time a new feature is added (in a
++   way that doesn't break backward compatibility) -- Marc */
++vers_min = local_scan_version_fn();
++
++
++if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR)
++  {
++  dlclose(local_scan_lib);
++  local_scan_lib = NULL;
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major"
++    "version number, you need to recompile your module for this version"
++    "of exim (The module was compiled for version %d.%d and this exim provides"
++    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
++    LOCAL_SCAN_ABI_VERSION_MINOR);
++  return FALSE;
++  }
++else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR)
++  {
++  dlclose(local_scan_lib);
++  local_scan_lib = NULL;
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor"
++    "version number, you need to recompile your module for this version"
++    "of exim (The module was compiled for version %d.%d and this exim provides"
++    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
++    LOCAL_SCAN_ABI_VERSION_MINOR);
++  return FALSE;
++  }
++
++local_scan_fn = dlsym(local_scan_lib, "local_scan");
++if (!local_scan_fn)
++  {
++  dlclose(local_scan_lib);
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
++    "local_scan() function - message temporarily rejected");
++  return FALSE;
++  }
++
++return TRUE;
+ }
+ 
++#endif /* DLOPEN_LOCAL_SCAN */
++
+ /* End of local_scan.c */
+diff -ur exim-4.92.orig/src/readconf.c exim-4.92/src/readconf.c
+--- exim-4.92.orig/src/readconf.c	2019-01-30 14:59:52.000000000 +0100
++++ exim-4.92/src/readconf.c	2019-02-16 18:18:46.013947455 +0100
+@@ -205,6 +205,9 @@
+   { "local_from_prefix",        opt_stringptr,   {&local_from_prefix} },
+   { "local_from_suffix",        opt_stringptr,   {&local_from_suffix} },
+   { "local_interfaces",         opt_stringptr,   {&local_interfaces} },
++#ifdef DLOPEN_LOCAL_SCAN
++  { "local_scan_path",          opt_stringptr,   {&local_scan_path} },
++#endif
+ #ifdef HAVE_LOCAL_SCAN
+   { "local_scan_timeout",       opt_time,        {&local_scan_timeout} },
+ #endif
diff --git a/mail-mta/exim/files/exim-4.94-maildir.patch b/mail-mta/exim/files/exim-4.94-maildir.patch
new file mode 100644
index 000000000000..a1a728158ac7
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94-maildir.patch
@@ -0,0 +1,13 @@
+--- a/src/configure.default
++++ b/src/configure.default
+@@ -873,7 +873,9 @@
+ 
+ local_delivery:
+   driver = appendfile
+-  file = /var/mail/$local_part_data
++# file = /var/mail/$local_part_data
++  directory = /home/$local_part_data/.maildir
++  maildir_format
+   delivery_date_add
+   envelope_to_add
+   return_path_add
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index f57b6812d1e5..644c5f7d86a3 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -18,5 +18,5 @@ DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d32
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r12.ebuild 4558 BLAKE2B 9adfc66473fb61f908cb90f881fa3f23341df3d2e734e997164c3d6151fc540db39efd6680c289c0f86e3d78ba1fdc49e8f6ba2ef325562ffbf177024af2d3fa SHA512 736fab292b62cd258357a612159485adf80681e1244aa9057d8eb7b8ec2069b5538654653f9ca5d4132139151dcb935c54a9e8395a8aa0517e2f92654ab0d4f5
-EBUILD netqmail-1.06-r13.ebuild 4716 BLAKE2B caa266393bebd340fe69c0db66340b5b58545da63d0118f6dabf247f0f8dd887b394fd1900b5e808499d410fc31ab9e24d602164f9c1b62450958c0e8032607c SHA512 99d405d30686b2fd603b2d93acac021057305aa369a536494232f2499901005b43dde2483de79024a7c4328d2e3a901e3f217699ec66b6edcaa40fa2df6e2c13
+EBUILD netqmail-1.06-r13.ebuild 4714 BLAKE2B 8178f44b4ed5d20febead83d867eb73ae5aba9543e3e8061b217806f952605a13747114b2352a13aaaf40bfb677314d4f47f0a20de11db5f7f76eeaffddbf127 SHA512 f87dea38d11d0f2f869bbd1531bee17951c6274bfb8c8eed138d69771e5faf4604773f6f42f67486e65b6da912087ed90c1b376711fc2cf0b388620ae2178a7f
 MISC metadata.xml 720 BLAKE2B 9bd0209a0db8075a22507fb63fa9f045959323da3b4c53e3d9da9d412fd39ff3576dc29c6d2af9db949e5fee4e98e166bbc41ce1d48ba0f8964e85fbe99728bb SHA512 57330a6fa33d3c65b0fe1289f89d356bebca6e7c8ba47cb5edfe53cd74938646ca60e3d001facab1fa5c4071fee7c3a8e0ad2ba2b4604aea3a8525c391991715
diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
index ae21c36a52c5..738fa4800d1f 100644
--- a/mail-mta/netqmail/netqmail-1.06-r13.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index a1e39d488825..4decdc50a47c 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,12 +1,7 @@
-AUX init.d-nullmailer-r4 976 BLAKE2B bef0e403a51808dcb1a6d08a5a06746e8f164b8d1e2ce94cf6d4269df1addc1b6e8d61d945e4da20b08d565a327232eaa4926029a8f2c07bf89e3847aab36a29 SHA512 e08847554d483e2feb69296747b267585d7960b057ae12f4440a452cb9c1954b5c54bb0d0c4884563b31d83b252a11897cc599a47ec782ea740fc282e9f6c512
-AUX init.d-nullmailer-r5 1132 BLAKE2B 2ce6f056f336013fa8786523e3f32359ca5bbdd47343f2ef943b855569a9754d12f65e35ce4d49bf9425cf0d40b628d407b8f2064c0ddc0a742578a852c1c60f SHA512 34a31a53f5f7f1bec4b5cc25bd50e2928cd658360d8430256a5a80a87609a3858a2f2252fce0e5258ac85f1957286c9b449fb1ddb14ace2cfc0dc75cb53aefb9
 AUX init.d-nullmailer-r6 1180 BLAKE2B fdfc17abfac24faa184d9cfe8fe3597f09bfe258ca44c41db05d91e0a086c8b52ed12f722f0ce5ecf1b9b5b11fc420cf13cc9127b849150be87fdd7bce94d859 SHA512 951313ba50dacfbfef440ad32bb4196e276bbe9fb636f05d8e311bd7bfea8e89f135a8e48c9df797031517125c848421dddb41215553144e384d98587c74be8d
-AUX nullmailer-1.13-unistd.h.patch 867 BLAKE2B 758af8df9518938f930f4095ce71c7c088b2ebcbd6a2814a2eba91521d4507df50f3d92a526cbb8f2a94df4cc080ef115c4d1b81dd0a31fb20c3949961ef91d7 SHA512 0a46f6a10a380a3b5b1527d60eef768f2e1b94b2848c4d866bf3088f9b1592b3fc464c69d2559309adfae6fc8f46f3897585d736b37947239106090c3449aaf3
 AUX nullmailer-2.2-disable-dns-using-test.patch 895 BLAKE2B 5b37129452e13c526a391580fb4816bf81c0db7adbed56d2e51f2948fe43e67bb7e1167ebf1ed1d589194204942efc985f18e14e5d2cd495a20f6df051519fa3 SHA512 d16592477612a716a8883ada1f18c34a4add81cfcfdda252705090e1f0b59f22a9bda9fe26bf950a78e21b9a69d20662825461669db72269280b7f82a1f8f8d9
 AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac5db9dc1db1d8937f6773a26668444df71ffb3593d6da4d0a35f74b51d66c019a84e6ef146da12fe60bc5517f543adcc5984060feebe95b SHA512 fc3bbcd8accd5a37b8292c6fb3e935ab1cd35d4a67bb224eadf48ff54b3b00508d6496e3d40c4546a966ce5dd6c297822a4e76a6b9e69d0ce47dd4e0e3883e47
 AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
-AUX nullmailer.service 401 BLAKE2B cca2fbdad581638f52a59caea902ca5701ca69e8b0e4a7c8fd87b8bfe3b9c233422ed0d93c0c583778e25998758c70cdf1602e35316739fa27018a590e28c8a5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7
-AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c7237a7c4e44516b2ca796c627cd00473f42e1c017865915cf8933f4d3df856ead3439d9e1e97bdded8bf81e SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
 EBUILD nullmailer-2.2-r1.ebuild 4277 BLAKE2B d854bb6a9b83c14213b3dad8ed304e9f7fd468bd1d987e1ad6d6aa29f84f810ce2c882ed6cec10063d45e70b521928777c638a4821e0d662a88af1c3dfc16670 SHA512 c6b520cee7decd5f8100bf79c4428029838673711539cd98af775ac97b87a1b0639a4aa0cde0f64f9cde4f0b922b5c55391c9a2b6534f2de5c61d9c4a168ade2
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r4 b/mail-mta/nullmailer/files/init.d-nullmailer-r4
deleted file mode 100644
index 3a6e049f8257..000000000000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r4
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-command="/usr/sbin/nullmailer-send"
-
-start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
-
-required_dirs="/var/nullmailer"
-pidfile="/run/nullmailer.pid"
-command_background="true"
-command_args="-s"
-
-depend() {
-	use net logger
-}
-
-checkconfig() {
-	local error=0
-	local f=/etc/nullmailer/me
-	if [ ! -s ${f} ]; then
-		eerror "${f} does not exist"
-		error=1
-	fi
-	f=/etc/nullmailer/defaultdomain
-	if [ ! -s ${f} ]; then
-		eerror "${f} does not exist"
-		error=1
-	fi
-	if [ ${error} -eq 1 ]; then
-		einfo "You need to run 'emerge --config nullmailer'!"
-	fi
-	if [ -e /service/nullmailer ]; then
-		eerror "Nullmailer is already running under svscan!"
-		error=2
-	fi
-	if [ ${error} -ne 0 ]; then
-		return 1
-	else
-		return 0
-	fi
-}
-
-start_pre() {
-	checkconfig
-}
-
-stop_pre() {
-	checkconfig # to avoid init.d stopping svscan instance
-}
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r5 b/mail-mta/nullmailer/files/init.d-nullmailer-r5
deleted file mode 100644
index 38ab1319df52..000000000000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r5
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-command="/usr/sbin/nullmailer-send"
-
-start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
-start_stop_daemon_args+=" --stdout /var/log/nullmailer/nullmailer.log"
-start_stop_daemon_args+=" --stderr /var/log/nullmailer/nullmailer.log"
-
-required_dirs="/var/spool/nullmailer /var/log/nullmailer"
-pidfile="/run/nullmailer.pid"
-command_background="true"
-
-depend() {
-	use net logger
-}
-
-checkconfig() {
-	local error=0
-	local f=/etc/nullmailer/me
-	if [ ! -s ${f} ]; then
-		eerror "${f} does not exist"
-		error=1
-	fi
-	f=/etc/nullmailer/defaultdomain
-	if [ ! -s ${f} ]; then
-		eerror "${f} does not exist"
-		error=1
-	fi
-	if [ ${error} -eq 1 ]; then
-		einfo "You need to run 'emerge --config nullmailer'!"
-	fi
-	if [ -e /service/nullmailer ]; then
-		eerror "Nullmailer is already running under svscan!"
-		error=2
-	fi
-	if [ ${error} -ne 0 ]; then
-		return 1
-	else
-		return 0
-	fi
-}
-
-start_pre() {
-	checkconfig
-}
-
-stop_pre() {
-	checkconfig # to avoid init.d stopping svscan instance
-}
diff --git a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
deleted file mode 100644
index 8199b9627f47..000000000000
--- a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sat, 31 Jan 2015 23:55:48 +0000
-Subject: [PATCH] lib/fdbuf/fdbuf.h: include <unistd.h>
-
-class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t,
-but these are defined in <unistd.h> according to POSIX.  With libc's
-that adhere strictly to standards, like musl, this breaks the build.
-
-We add <unistd.h> to fdbuf.h which is included by fdbuf.h.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- lib/fdbuf/fdbuf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/fdbuf/fdbuf.h b/lib/fdbuf/fdbuf.h
-index 4b0e9cb..0054b01 100644
---- a/lib/fdbuf/fdbuf.h
-+++ b/lib/fdbuf/fdbuf.h
-@@ -20,6 +20,7 @@
- #include "config.h"
- #include <string.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #ifdef _REENTRANT
- #include <pthread.h>
diff --git a/mail-mta/nullmailer/files/nullmailer.service b/mail-mta/nullmailer/files/nullmailer.service
deleted file mode 100644
index 8aae6c996d13..000000000000
--- a/mail-mta/nullmailer/files/nullmailer.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Nullmailer relay-only MTA
-Requires=network.target
-After=local-fs.target syslog.target
-ConditionPathExists=/var/nullmailer/queue
-ConditionPathExists=/etc/nullmailer/defaultdomain
-ConditionPathExists=/etc/nullmailer/me
-
-[Service]
-WorkingDirectory=/var/nullmailer
-ExecStart=/usr/sbin/nullmailer-send -s
-User=nullmail
-Group=nullmail
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mail-mta/nullmailer/files/remotes.sample-1.13 b/mail-mta/nullmailer/files/remotes.sample-1.13
deleted file mode 100644
index d04aee24ecb6..000000000000
--- a/mail-mta/nullmailer/files/remotes.sample-1.13
+++ /dev/null
@@ -1,29 +0,0 @@
-# Format is: HOST PROTOCOL [OPTIONS]
-# HOST = IP or DNS
-# PROTOCOL = smtp | qmtp
-# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
-#
-# Examples:
-# A standard SMTP server:
-# somesendmailserver.domain.com smtp
-#
-# A qmail server with QMQP setup:
-# someqmailserver.domain.com qmqp
-#
-# A nonstandard SMTP server setup:
-# someotherserver.domain.com smtp --port=2525
-#
-# SMTP server supporting AUTH PLAIN
-# mailserver smtp --user=<user> --pass=<pass>
-#
-# SMTP server supporting AUTH LOGIN 
-# mailserver smtp --user=<user> --pass=<pass> --auth-login
-#
-# SMTP server with smtps (legacy - use starttls instead)
-# mailserver smtp --user=<user> --pass=<pass> --port=465 --ssl
-#
-# SMTP server on submission port with starttls
-# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls
-#
-# SMTP server on submission port with starttls and self-signed certificate
-# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls --insecure
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4dbe42aa6900..9d5dda908f69 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest
index 3acd6916bc13..3f16f9fee2fc 100644
--- a/media-gfx/flam3/Manifest
+++ b/media-gfx/flam3/Manifest
@@ -1,3 +1,3 @@
 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e
-EBUILD flam3-3.1.1.ebuild 752 BLAKE2B a3610475d5b8ca2838ff1e63e8762f6abb33c81300eb1b347f808e1d9f73c883f91303130d6b7dccdb3f7cfe8ce12f7b3c22d41fcbb3262c27d970820e6c7fc3 SHA512 040bd665e40d14196122a32bdc39b60f9d120bdbf7c93e0b4134879fd1d57c6dd9ad0aac4b0c0ca5d4ef9090a54f93e3ba826eba1a3325aa75272fa5cfc518fd
+EBUILD flam3-3.1.1.ebuild 753 BLAKE2B 42ea277494de993383f4b16a383a20a9dc1ff52bfc7cf0f092524b5ad8f62a542ea88e37456afd9b9e521883af62842dbd645433dd43a96514d3a67d37464599 SHA512 afded1a293e601f2873a8c346cbbcc042d627ed254fafb90f54f7f8dadca5930cda1c40fc04160bfa18e19c08c1a56bef1eb3f2a2321eca13fb8e19691456257
 MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca
diff --git a/media-gfx/flam3/flam3-3.1.1.ebuild b/media-gfx/flam3/flam3-3.1.1.ebuild
index 4ac1899f81dc..bc2cc8e1aa49 100644
--- a/media-gfx/flam3/flam3-3.1.1.ebuild
+++ b/media-gfx/flam3/flam3-3.1.1.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=6
 inherit autotools eutils
 
 DESCRIPTION="Tools and a library for creating flame fractal images"
-HOMEPAGE="http://flam3.com/"
+HOMEPAGE="https://flam3.com/"
 SRC_URI="https://github.com/scottdraves/flam3/archive/v$PV.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index fa27e6223b7c..f7566f3c6582 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,13 @@
 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-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
+DIST ImageMagick-7.0.10-16.tar.xz 9694880 BLAKE2B 6d0e0baeb99d9815255f10d04176b816694afb9d7e2169af60401eb57b13bc2dbf1223b1b3de6b67c2ed9f1581983801bfec017dee6f4b73319b68d0e16366fb SHA512 e1ba52cde03b1230789a9e538ea93bd8b0713b418cf268ab3c3be0c0da4b6144ff47479e554c27a9348d56b5e94a181944474f77568f502cf31885d871f2ea5e
 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.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-7.0.10.16-r1.ebuild 7229 BLAKE2B 299edd607f466deec1fa7b6342849a92060b6fab2336b7af2b1ec6a9670b07690b83c50c6afe5dbc69caf01cb1200e53e8cf3cd885134da36b41fd71b473059b SHA512 0993d1ee3162ccfbd19a5fe5374b5842279122d70a3db05f93092b8a0344e1a06f2abe21562d58776f0526df5ba3a6433c9aa4325b7d1c9e06c8ec0c3471d18a
+EBUILD imagemagick-7.0.10.16.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
 EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
 EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
new file mode 100644
index 000000000000..02b0c9655fe7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
@@ -0,0 +1,255 @@
+# 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-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.16-r1.ebuild
new file mode 100644
index 000000000000..b59ce1f516d1
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.16-r1.ebuild
@@ -0,0 +1,269 @@
+# 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 ~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/inkscape
+		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
new file mode 100644
index 000000000000..4d2561accf79
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
@@ -0,0 +1,267 @@
+# 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/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 81562f13f1e1..6d07713a4456 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -12,7 +12,7 @@ DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c441
 DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89
 DIST inkscape-INKSCAPE_1_0.tar.gz 64306274 BLAKE2B 8bc4e2d156fad99b2b2a700bde29372dd56db6a1a9a8e825d46d214bbd18a1d29365510c16d51dbb2cad88f88fb10232f1bab403da4900beaa72de5d0f8726df SHA512 214c04c7f1d23dd0d296f4262743b2a206fe3b3df7abdb4bc4a4604a7f0caab2d7970d04b5795f121417d0e015e2d42d14be0b67438d752a81c4ad079b486f06
 EBUILD inkscape-0.92.4-r3.ebuild 3921 BLAKE2B ad0b135b5c24cd27954aa493d45b90eb74af7cd13fffcb919b6af4e9b4c66848bfc8ba5eeec5e36fdb6ca14052fa794f78f801c129c762ef4b4a3f9da43cdb58 SHA512 91705b00b90160ea40e2c055900ff51016f5cb0897ce8c23b9798a7158062a8485fc5077b18b5446baf3c5515e8161df1dc8377925ca2865037b9930656d7e53
-EBUILD inkscape-1.0.ebuild 4206 BLAKE2B 43931848f4450b4076f2d0094a0ef4ae24c4919fee8a4b2f8c8642846712ca6f66ea670ec42c0b80f787a46e109da125e70a3302f77dfef3bf662b1ebbab9dec SHA512 50636054af59a19a1365e8ac8d78970807630ab66c7ba947d3d81b65906297b6e0714a545507a48861d735eae9209004c791b6a139ea2f837e08878a8293316e
+EBUILD inkscape-1.0.ebuild 4219 BLAKE2B 442ca4db0f5fb25da79f93a863e9dc9f79751f6a0ea43da4403e4f9898aaf154b49d3023e35924241ddd298f68ea686d693f32b66f7dd15a085f2bb97d025b08 SHA512 fa219804dfbb420e06dca74d382cc9a4e361060b052bae8ab4ecd2910f3aeeedf9477c15302623868ee55e4d40c33506ff093576f093a1bad1f0d5d70a781a2e
 EBUILD inkscape-1.0_rc1.ebuild 4025 BLAKE2B a389779a3554e8ef91f98451ca92e9458d9491c9057845607f2f8c4090e1a8a6eaca2726a0001555a363ac446452059ef32dbe3b409add74947fe653763c903e SHA512 203d90d1d4f8915801d23513c4df476e93427134bd510df650c6484c9408bb0c20dfdb445d0ca4ff36aaeef7f7c73befffcf32c7726b98f5214fad49444bfca8
 EBUILD inkscape-9999.ebuild 4109 BLAKE2B 86555c26d13d9fcffbef05fb3b6a59338d110462b02b501443ec287b09856a9562cd06a466b09a594820c226bc2c0855d951e1b6e2d61f9d58ad60be4c05465c SHA512 181dfe6ce67120b3fcb08ac69838e5eeeb1853e83f55c5d5b78e93c9c448ba0193f36044d95eae242506c68dc3e51ece773225010fcda90a27e1105570cf4abf
 MISC metadata.xml 1178 BLAKE2B 437e874d080bbd913e0910e0c7dc3a86834ac88b770493d65f29623db9a87d96f2cfc72e04bcdf51fc9f5d688695742d07a19414db55ff2ccb1a1b20cef20ad2 SHA512 007d65995421695c434b0c4a80474c43c95b7604cbe1cf576f5c7c4741777e563daa19bb25421089a979e0d23ce86522efae01e3f12a0b210323fc5306a2d305
diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild
index 3af00fe145cb..3d561da7ea67 100644
--- a/media-gfx/inkscape/inkscape-1.0.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
 openmp postscript spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index aa34257c0292..92ef1c9f7f10 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -3,6 +3,6 @@ AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a232
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
-EBUILD librecad-2.1.3-r5.ebuild 1206 BLAKE2B 5934d1af4efa6668916303c85aed2654ab43458a23532167997a2f31bdcfd356c4914ab4ea75e3f77699abae115bdbf6555629038f3d4eb25b132e69f9147100 SHA512 56eae3cd2e47f5f45f496a581f454dff497b2b447afde848b57fae0fa145223191844a872620a012c0b489dc382213d61af8efa13e4baf72a5bc5b31690e0f48
+EBUILD librecad-2.1.3-r5.ebuild 1205 BLAKE2B d67aacabb6f255121b05dc70ae105fdf4e1065ec70965c55e5c7e4d37883a67c01e0826129051514fe9faa2e45402329eb34c980eed41a04d7e4006d6fb0a3e2 SHA512 f7d5a84c94cbe86a9e21c9f97a51680dfc3c0c0897e31ac2b454eadcd0bda469bc6a32f9349a2eaac05d8ce76304d0244336eb2170675618b1e2d6df3378aae7
 EBUILD librecad-9999.ebuild 1143 BLAKE2B 640a03b64ac56e00a3821dc9278efc0cfbb4eb7ca3ca83d428242aff78a0ab1d783b705cef0af939537a281b57db4d1ce640f3baa1eda7086b52a4fad481a77a SHA512 173a061d72db9ec980e13173d7d8caf7583d57a794cbb3c72a42553d4546cc28f45c5ae8ceab19ef71a838739c717a3c75e6506cada23a123c060fa89c04000c
 MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 054af7f65e7a..bc56b908be42 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 BDEPEND="
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index a77241fdffbb..26ea4e532962 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 1308 BLAKE2B 81133b1450c339d66e1abb5421fe305bdd15e9eee62a9f5d25ee7f3c6b3f52e676045edfc933bfc9f3313af623cc133d39d752b5be116b49d886d48cafba5a09 SHA512 1a1435dcd69955c2114640097278fb0de6eda7f2ed44c39931980ee47fbcf965d312514f1d15d2c666d90b31d89aba0133ef3ec5c0a6dea0631903aeab88ad98
+EBUILD pngquant-2.12.6.ebuild 1315 BLAKE2B c2c34025738f43aabad78ab1d5c8dfba36a773681b1586aef74175954883339d19be40a326b9e44fb777f7d20409cbe45d8e66095a388b8b25425bf122566b93 SHA512 de5f70cb47551fba61add790cf1825a88fe39a60d5a20a346ff38231292aa7f63e1c7abd4f49d7190e61752ece76c529431cd958d171712d29a816fc38225888
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
index 3fb651b60f57..c301e0f1f4c0 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 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
 
 RDEPEND="
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 59a2369c77f1..ff1b76320d75 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-EBUILD scour-0.37.ebuild 688 BLAKE2B 310d9780ccd7f0e397ed89819798aaa58d1a75144a70a06ee1782c567eb535769e0ff55f451908d41f6a877a98b1ef812616f6790d9ca487e5c74efe51209ece SHA512 82840425dc89ff6dbd9c16cb46ea2df2f21b4096a6f56685b7fd7ef7602e08c695c9316d3e76fca5047550e96d4e21f1d5e43d0d08825d7fbcbc07b7636d7693
+EBUILD scour-0.37.ebuild 708 BLAKE2B 0525bd0e25e3c8b958a843ffaf36fb1c2fae11ea73081cce8dff132ab65a1462f28e074b3abcb21a74fe03ce7e4d5d72b3ff3298fb1f048664f82da89fd9ecfb SHA512 0fa8a4115e44a6c3c36ff4ba53426a5f09840e619d5040d6e4cef9de7d5472ceb0fea0bc3bf63c7159d1d7f7f2f09a2155952ae071373c748bacf0db7eed9e65
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
index 8be46ee7714c..385e5c4dbf25 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 0305f596b77f..ecca7e396314 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -2,5 +2,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2994 BLAKE2B c12dbc9f3687485588ab94e6a0681c7d3a24b31835dbf049dfc2992a1268bea34a92db7f0dd5f3e1016f1ab873cbbb5262d813e607054b9fe5dfa249389338b1 SHA512 5e4a6f4c01a208a8bacd49b88e55ef511e01aecf7fa6abf025a1a82c5c2b827130e517e8e7697f4d57e0456cf580fb00653347a00af70fb0b9fac04713fc56dd
+EBUILD transfig-3.2.5e.ebuild 2995 BLAKE2B a50fa8614a2326e7a427c538d41dd0e589e2129544045919042a0ca8821fa4b29322c23606b143bb2f51e95ee7c6b2e89e8abb4e3c0c2536d926cf1d355d39f1 SHA512 652a8b602eca4c66b26e5bdb4bac9b3c390d0b71be482b18230db5c5561e4ca56d2b842e1867fec368a891b200a365e167a0ba9808c0e246c9be24c610c10ff1
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index 995ddf174764..da2af8a5f308 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib
 MY_P=${PN}.${PV}
 
 DESCRIPTION="A set of tools for creating TeX documents with graphics"
-HOMEPAGE="http://www.xfig.org/"
+HOMEPAGE="https://www.xfig.org/"
 SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 	mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ca81540d81ca..4d6f2eb6ba17 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 5c553a4de1ce..838fcdbfa490 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,8 +1,6 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5
 AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
-DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
-EBUILD alsa-lib-1.2.1.2.ebuild 2081 BLAKE2B fd2d0ee1156be52d3c71585e44660bff6b0fc387b04be344dcb6ffe514739e192602b9979c3f58aa38e8a014e2888779b4f185d1c2162b156ece817fdf01238d SHA512 f21334e3525ddbc6621d0b588b73208d88348e51c8b3c89ec645cd322449046c86b30de99accf3f943ddd444aba08d62546376bb22569bd9ba5f8126270a12f3
 EBUILD alsa-lib-1.2.2-r1.ebuild 2177 BLAKE2B 263db5805070d0c436255435b0ad6d8788f30b01b62dba79adf8705d5736760d9be0bf3f821f212406c9b353416a7125a687ef27a97b44e99fc50b6aa3a57365 SHA512 0f79c21aa74feb187d563c472d95628f7558cd2e80778a861fc220282e7ab2c1949e003a50722af9dbac5798572da2afa70da859e7bf082b7ece76672d91af01
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
deleted file mode 100644
index e6d96d0f76ee..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 0b04bf514511..64f851648a98 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-topology-conf-1.2.1.tar.bz2 5377 BLAKE2B 95cd1074068ba85e6c6b74d65f7ddc40e182426cff69c7765689edcaca3609a249638c70e5f92c889b3c76ea662e7e43e355af4573acb3fc293026392f614522 SHA512 ed86e7372f887a2e13596ca7456da1db84ff05d01f98d80c403263673d2c0f247834bdc9edbeb62231ca1dc6b9792dade87672d905303a8e0fa462c1fac1b7fd
 DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
-EBUILD alsa-topology-conf-1.2.1.ebuild 508 BLAKE2B b9ee49c419bc7031c0d9ae43c9755b5d6e959c988d4134058be8b60aa5df7242307bf5d09ccc2f726a520dc1680704058a1b5c74e980a4bb3a4b3519784b8613 SHA512 8cb4d00cdc952b1d3e1b6a262e6603ea7fab93624af981eb03cb92a39fee9f35c1f21ea9e993516889892ea7ce7e12c678fac7aea179b1319d16cfe9d9cf8c0c
 EBUILD alsa-topology-conf-1.2.2.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
deleted file mode 100644
index d7bc4c5ca7bd..000000000000
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r topology
-}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 6024f738f53e..aac45d3f3de1 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-ucm-conf-1.2.1.2.tar.bz2 14660 BLAKE2B dec3e11d2aef17344eb1a11987eb9b6b53606fe278bf84523cf6a829799b264b6a0bfd0e6af46c7ce834f34584078fbd8e1a78c667c64f51e0ef67e448264705 SHA512 e498c4355a765eb6ecd03f03611c8904f757bf73619a3c8159c044f80a4c3ab5cbd343692c227e13c6da307fc2e35259b4726902d3ab8e03eff11aa1c74027d5
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
-EBUILD alsa-ucm-conf-1.2.1.2.ebuild 502 BLAKE2B 1ae7ea2cfbc19b75907a9fc6a0735ad629dde011e7f696cd3d3b18c2fee2e9cd09d0b0ab3e200bb67757716148aa98b3d0e36590cde94ea900162d25bcc522ff SHA512 079df2aa14928f0676bb01129f9c269ff8bf49845903fb9e0aca6709125925a58cdda235e82a122a27c7bbedbe64a7dafc691910059348029532cc826d507ce0
 EBUILD alsa-ucm-conf-1.2.2.ebuild 486 BLAKE2B 456d70f97a19fd26cb183e365f926cbeb4b5e457b60086a385db8f694bced10d6ad9370b6b4860790c4742fb9c1d70398e170c702231827c20a70dddc2f724be SHA512 d013fe3c77ebd5e6680938d4464d0dc8730ec395321450f93b2ca3c186541a65b82df77dfc454479148915cc2971268c8202bf7e88996f48466380a1b200f1bc
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
deleted file mode 100644
index 522f5a35e125..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.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
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index e09ec7400a2a..a9ab846bc7f9 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 835 BLAKE2B 20783da2497157094aa9b6305e35a946ed7469a2ac3dd2f3e74e40d7af1df0d4ecb990835a6522e16c67f799ee53c7cdc90e707bf36c50bffc3bbe7f68ae3f58 SHA512 9f154e73011e55051b152735b0415cd90f97765c42146bb27f90bcc02d11be07cc138ddcf2a0e1c9850bb4f4eef44b38bfbe7ce452c1eb400215e201e3a432eb
+EBUILD gsound-1.0.2-r1.ebuild 840 BLAKE2B 86ce5f9912a71a58c30cf6467d49b660f85d91b67e92388f27023ab8af62c9ff54bcb4971028b6e38ab9108af48db2eaa03b1d57c38fc27cfa36a4e3bed8690f SHA512 79ba41aaa997eae46954656e012e547f7a7f8a3b4a8eda3a916831704a0df3016f0357823e4c738c9f876f609f50263a8276d342634f40b7ddd85274f8ab5030
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index ef942f7e5821..cf05d8cf1144 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 67c122c3a577..0ea503815a8f 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,7 +2,7 @@ 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
 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
-EBUILD harfbuzz-2.6.5.ebuild 3145 BLAKE2B 87df30ecd05c9faf052b654ff8e2c1c001b1dc3276774e09af63652645f44f6269fd3a7855f033f3d92c839f04ac68d00ef4b9baf3d99947596f48f1ea9567f3 SHA512 7624b58316cfe916fe1fb35ab4e413e761f5dd275ca0218c25374a2085a053e366a80539d532b28c26de783a9b8c8372234f310f48f682b67de42cf6357330e6
-EBUILD harfbuzz-2.6.6.ebuild 3152 BLAKE2B 219373be1ff401f327e22436520df53e785ad22c18bef41bb63af46ad4ef59d84bab3227418a42267141365c6ea10a46e6221706b0a6b04657a85a6b5946855d SHA512 826ddd3abf73bbc194ffde795c5a79479fab3706f9b14ce531336eec6de09dbfbea857e6c6b4695121dfb9e1b9c3116ab7481fd4860dd769c5c587849adbb6ac
-EBUILD harfbuzz-9999.ebuild 3152 BLAKE2B 219373be1ff401f327e22436520df53e785ad22c18bef41bb63af46ad4ef59d84bab3227418a42267141365c6ea10a46e6221706b0a6b04657a85a6b5946855d SHA512 826ddd3abf73bbc194ffde795c5a79479fab3706f9b14ce531336eec6de09dbfbea857e6c6b4695121dfb9e1b9c3116ab7481fd4860dd769c5c587849adbb6ac
+EBUILD harfbuzz-2.6.5.ebuild 3164 BLAKE2B 205fecfb2ba8f0bbcbe68bff20c0e7136589a0415270ef4f96b62941e52da1fc26a99216324eddabdccc98465fa5c466411d360387f049b1f1184c4f22043416 SHA512 988a256f1994d61e0e7e1b526617f566e6c7fe3fa05057a445995a93dcd97a3ee8859bd40e1e0fb3043f46b3ce46bddabacbf6634823e47197372079a78ec8bd
+EBUILD harfbuzz-2.6.6.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.5.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
index 73fd6fa0ccdf..63f6e1fd3798 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
@@ -5,17 +5,17 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+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 autotools
+	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"
@@ -78,9 +78,10 @@ src_prepare() {
 
 	sed -i \
 		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources || die # bug 726120
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
 
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 	elibtoolize # for Solaris
 
 	# bug 618772
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
index 639eff7a8db2..bdc327af67b0 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+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 autotools
+	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"
@@ -78,9 +78,10 @@ src_prepare() {
 
 	sed -i \
 		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources || die # bug 726120
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
 
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 	elibtoolize # for Solaris
 
 	# bug 618772
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 639eff7a8db2..bdc327af67b0 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+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 autotools
+	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"
@@ -78,9 +78,10 @@ src_prepare() {
 
 	sed -i \
 		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources || die # bug 726120
+		test/shaping/data/in-house/Makefile.sources \
+		test/shaping/data/in-house/Makefile.in || die # bug 726120
 
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 	elibtoolize # for Solaris
 
 	# bug 618772
diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest
index bbe4d1743b8b..5c8ac485d3ea 100644
--- a/media-libs/libirman/Manifest
+++ b/media-libs/libirman/Manifest
@@ -1,3 +1,3 @@
 DIST libirman-0.4.5.tar.bz2 225330 BLAKE2B a8910631b4985e5ba8a425ea0914005fefb89329b9cb297e78a6c6775d386765aeabc86a92b63eadef17c7428e07213ebafc81d26fcf237f770ddf5aed06bff0 SHA512 5b0a8e1c0699bf1d8b43bbb2320b3abbd1f8d400264efd78d1cfb5ea942ff1d272b150012dfa61f5afc427824282a62755ec1e1189dd3d849a5f62293125ffb3
-EBUILD libirman-0.4.5.ebuild 676 BLAKE2B 8b457e11919b55c6e90d2576235159867d4a85fc036e028f43dac72ce966e28165bb83e72e7702ab2d7d41267ca025449de1517ad78f1322f1a54279a8b8a37d SHA512 635d68af8f61b6740d704b6a8eaf20a30b25ab3fa2418c0dcfb27fa2f645842abc6a8ddd7e1e7a9f222bc375c0990a25a4e013ce9626fa920a2531467d101e6f
+EBUILD libirman-0.4.5.ebuild 678 BLAKE2B 01aa13c11eca7f8cfb3ccac5fc2a371dedc93396b4939f7e6a329a4e6ae8dd20f7442f38c172595a2b17f35d9ca76da3333f0b1ba17ba313bae15475a7b8d455 SHA512 d2e92d6c25df00a3ac8c0241bac7cbd436e87384bb7145f3a5703de6920df6d0f5e9350502a8c68a840666e06a0d2c7d3811594da43eea2d7a5f7064a78efc5f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libirman/libirman-0.4.5.ebuild b/media-libs/libirman/libirman-0.4.5.ebuild
index f8f4a774babb..ea00085e4777 100644
--- a/media-libs/libirman/libirman-0.4.5.ebuild
+++ b/media-libs/libirman/libirman-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools toolchain-funcs
 
 DESCRIPTION="library for Irman control of Unix software"
-HOMEPAGE="http://www.lirc.org/software/snapshots/"
-SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.bz2"
+HOMEPAGE="https://www.lirc.org/software/snapshots/"
+SRC_URI="https://www.lirc.org/software/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index e007dacca0fc..35be7dfe2aca 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a
-EBUILD libopenmpt-0.4.12.ebuild 1554 BLAKE2B 3870f7a3f7707e9c919ded11f1bd241fdec746649eb134cfc4949a9b9cc9c4127802fc5d6f8067d6ff57996efcab3546eb03277a50cc1cd529e10ce3cc78f9bd SHA512 63e37a8a5fba2e1d3f8547d2d41f7203cfbba34a5129cae8718d905611d95247ee026009c55492b641eea83bc53393c390b01f12140b48de8c7e2671f47d944a
+DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
+EBUILD libopenmpt-0.5.0.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.4.12.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
similarity index 98%
rename from media-libs/libopenmpt/libopenmpt-0.4.12.ebuild
rename to media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
index 093c6758739c..cfb89e4fb8bc 100644
--- a/media-libs/libopenmpt/libopenmpt-0.4.12.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
@@ -46,7 +46,6 @@ multilib_src_configure() {
 		--without-portaudio \
 		--without-portaudiocpp \
 		--without-sdl2 \
-		--without-sdl \
 		--without-sndfile \
 		--without-flac
 }
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index c81759748240..5ced92b7628a 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,5 @@
 DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4
+DIST libtgvoip-2.4.4_p20200525.tar.gz 1482357 BLAKE2B 9324165a2818f3d6907fb80403c8df83e196e7566161d781f5608c2bc4fc0f34a4b69883202ac1a9d20d783d363534c11436cedcd24fa93c092eaca97369734e SHA512 5c9fbbccde8fb7dbe8076cda53a3ec80f633493c9b3016627307463dca3426623703cd28ea7ad360bd9ff7c062edecd04787b9f8a32c439cc6622d8680d624c0
 EBUILD libtgvoip-2.4.4_p20200430.ebuild 1039 BLAKE2B 21f3e2037b6d704070f183c1b21a7a82e772c1ee9119530a202063e7606244b9585e41dd39b82de347d6f72d6d4d88a92a4d96e928338a72b06b8f028db7e6c4 SHA512 76558155767123484954b131ff62e85b22f23cc40c4c867fd29aa2e010231ed03bde4dc617e3d2fb8104f3e8677b94faf48854b7912258bb1999a92368dcd1bc
+EBUILD libtgvoip-2.4.4_p20200525.ebuild 1098 BLAKE2B a5d7b79ab969443ec6e61dbcdcb5e5eee3cd97f6d9dd5e42879ab0884573584ee17b11f0e8667ff86c707741c22e27484edb36fb04d51d32ae1c626531c8227b SHA512 c23f91744a01ffccd74eb58fd28d5e048470b19565c903ad00dac2980367ff37251ab8acba3ed5df7aa48c4ecd42b959636e06b5218091a3eb18ba5d0e291e2c
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild
new file mode 100644
index 000000000000..89791a76dd27
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="d2e63429ec94ee178a62b55be01f1cca98e9de83"
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dsp libressl pulseaudio"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/opus:=
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable dsp)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 0dccc2977fa6..4eac26a54bdb 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,6 +1,6 @@
 AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738bf12697b435accb54037611f2e24cc842b06abe3789503a1cc0a1ca74f50edf55d26dd7712406ba817f4959c0 SHA512 756c794acbdb2941553a60d1966635a66b44ff7209019fc9516d66baffa6101071f0f412b675823d32ad48c47d533a29cbeadc56459e88435509032569d62fbf
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
-EBUILD lv2-1.14.0-r2.ebuild 1370 BLAKE2B f2755705d9de56e800dfee4d1e734a84b7edbf1e2addb4c33311f5e996354edae2b3a97d962d309a2e95dc26efdf01f110f1adbcc0fcdc313bb24d52f8359642 SHA512 bd725c86c65236f6ca476183bb9e28ed328e3cdda5ea5dcdb2f78e2e334dfc1075a03fab2f8ae9ab6a753bf2aa9282a04a2b730a0329de410aeac5b2ee1bd78c
-EBUILD lv2-1.16.0-r1.ebuild 1374 BLAKE2B 4bc9f94c695197d7ff4e8ff49957b34b94d4cce497b9ef703b54d23665276fe07a3b7c69938c9b2f57c93875738e84186837c8603b4d0fe1d75046e89cf340b8 SHA512 5d6517175cabb5adca92d0fb8b1708aacc3327348567996e506057c852ca2b5ab4c7fdf6477306846594b9921b564281dd48f7e48bb55beddb8b5a435020eee1
+EBUILD lv2-1.14.0-r2.ebuild 1372 BLAKE2B fa87255c14d58bcf8d65dbae163b3bc47123e5b7fcc0c9f31cbd9f58c311e5e504e329ff32458d7969ca43f0c254b90fd3b8abf43467320e565f0a9d04d21e63 SHA512 d91778e926c632b8a948c5d49fc0bdeae8555ae546eb04bd234c6e160d6ea1fbe049bd567a6aa77a59524953e9509b97f123f6493b14a56a2e22ed9695bf22b2
+EBUILD lv2-1.16.0-r1.ebuild 1376 BLAKE2B 3826579de7cbba3611dc893f9c192185fbdfca25f87f6add254c63088cc9c0e85f1e4331e56c233ace6295f050d0c857c3c78d44912132f9fe27eb70f1f2827c SHA512 420d21694ad738cf489f58bd271057ad8d33101df5a1be4b667b9716c827494f6153114d30586822cf54fe64ee127f9538eeabd9e62c8c18ea0c3891a58c0f0a
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r2.ebuild b/media-libs/lv2/lv2-1.14.0-r2.ebuild
index b7351ced68ec..766c421292c7 100644
--- a/media-libs/lv2/lv2-1.14.0-r2.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r2.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE='threads(+)'
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
 
 DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="http://lv2plug.in/"
-SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+HOMEPAGE="https://lv2plug.in/"
+SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/lv2/lv2-1.16.0-r1.ebuild b/media-libs/lv2/lv2-1.16.0-r1.ebuild
index f55b702ccae6..d7b0d73f20b1 100644
--- a/media-libs/lv2/lv2-1.16.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.16.0-r1.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE='threads(+)'
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
 
 DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="http://lv2plug.in/"
-SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+HOMEPAGE="https://lv2plug.in/"
+SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 904eaf739092..f9f4d082d5eb 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,7 +7,7 @@ DIST mesa-20.1.0.tar.xz 12661712 BLAKE2B cdd5f1d9167ed2c2d1e4f63d5c8ededbaf3d10f
 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.1.0.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+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-9999.ebuild 14914 BLAKE2B 0593a1fefdfa89754eb0b9880dd555b286ac9efdaa91d93a31e711ea0ef36686773f7449b33c933c23e614167764937978c8bae95e7682c712fd817b741fb4c9 SHA512 5e904f7560f0766ba1c72834e59c8353eb409f3f14d0f0df3275fd2b5a0d5fb6640e02bd1991cd15527747016663ec2bab5bc2e16e77dab2d567f7a18b03c0c0
+EBUILD mesa-9999.ebuild 14963 BLAKE2B 22006871378002e152a19853c37776d37576b644439836676ec21ac536a49c86f70b00bfd3815547ca5c2a967a40e9e7554589db69a75ded004d25b3aee64342 SHA512 7ff9297ebf9f9c68aa6d499824346f548e3369f17e585f63aaf5f0bb3dd235b2af9e210d60ad272a5e6261544e2818a32d7893e59123b13aa959864fe83592f3
 MISC metadata.xml 1989 BLAKE2B 239b50a1ebb1c70411ec31b3c1c2b85aa620f3ea7e0fcc104b3bdf9c1062df46948eeddbb5dc06258664b0a5c962d2af62d9d7f29091a82540ce170e2b1a3d21 SHA512 e8404153aa7d82b7c459afbab6483cb70372e3c69e366f71e3953d26a9299e5a82fc249751ba83a2a61329dae68e2aebb67d7989ea59fc2eb81c3d5c008ed2c0
diff --git a/media-libs/mesa/mesa-20.1.0.ebuild b/media-libs/mesa/mesa-20.1.0.ebuild
index ff719014070b..00b4050b4e80 100644
--- a/media-libs/mesa/mesa-20.1.0.ebuild
+++ b/media-libs/mesa/mesa-20.1.0.ebuild
@@ -504,6 +504,7 @@ multilib_src_configure() {
 		-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)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ff719014070b..00b4050b4e80 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -504,6 +504,7 @@ multilib_src_configure() {
 		-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)
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 560dc4fd2af1..5642e3f64d97 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 07e7c89002d8..01dfc1ccccc7 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,7 +1,5 @@
 AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2722d07a55e63e3a1ad36507bb15c970507450fcc29b51b8cfb77a1a15d8a68a9b1e5dca3279f5b2df85e731f8 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
-DIST alsa-plugins-1.2.1.tar.bz2 406309 BLAKE2B 2ac26ad87fcdcc4452ec32b2b437d3be4308f13ce2a8e24150f319805b6d684edc6be9e51654f27c1a5bbc01a7caa9eb70250be405dc6921ecd93ee417f24cdf SHA512 a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
-EBUILD alsa-plugins-1.2.1.ebuild 3004 BLAKE2B eaf4a2f4b4053f439b2b70257d789dce8e22be1010d32aa649cefcf2e04ba7d0b4d4af3904b961c1ea7cc261d7a1ef20a28bd253fd32e9923f28d75e945e3a2f SHA512 9a89468199c10ae69e84b143192a32a57104fe021e6d12e4238cdd3d8872420f2675666dc6c403839c2f661e25abab133872c02b7bdaa88b2b7032edd64a5c72
 EBUILD alsa-plugins-1.2.2.ebuild 3024 BLAKE2B 47959f6f20d5cc67216fbc7037fc2df6abf5d8f046a43bd2bb4da1aa11bccf04bdc7c805e354a8b61cda24ada5999a75b51bfba2bfe5cbd6d930bbaa76d46238 SHA512 e627069813135380621098133c29b5bab069e247cbd1c08a120b1a3dcab35cb776ee603199b73471f8a61f3dfd8061d05852466eac75cf63ada1b2e66c0b0a81
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
deleted file mode 100644
index 63868db995ad..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.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
-inherit autotools flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? ( media-video/ffmpeg:0= )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		-i pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		# default does not contain $prefix: bug #673464
-		--with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d
-
-		--with-speex="$(usex speex lib no)"
-		$(use_enable arcam_av arcamav)
-		$(use_enable ffmpeg libav)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable mix)
-		$(use_enable oss)
-		$(use_enable pulseaudio)
-		$(use_enable speex speexdsp)
-		$(use_enable usb_stream usbstream)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed \
-			-e "s:/usr/lib/alsa-lib/::" \
-			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
-			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
-	fi
-
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 1dbef847d01c..ee2ecc99a083 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,8 @@
 DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-4.0.3.tar.bz2 1759123 BLAKE2B 7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b SHA512 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
+DIST audacious-plugins-4.0.4.tar.bz2 1761281 BLAKE2B 36f77d19e2cac461cd5649589bc4cb19a76577c30d5de4015688da5bf21efe1c835e1160534bc377e9a6f495fc9c2650544cc6c7bafac61c2f7187991a4d7935 SHA512 d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8
 EBUILD audacious-plugins-3.10.1-r3.ebuild 3849 BLAKE2B c829fdcb6a41aad4cf807ccf0719a1877789a06e1811fa64a574dad26838723cbafacf6645235417e2b68cecfeb2bb66b4a3d061816fcab8e554a8bc34a9c5c9 SHA512 7b5710f309e15c2e465531edf626238faa607369f2a46fb0b4defe3523286f04ae897c6016c0c4ff1f540e8701e7ee9ca15921840b32c8ae001257793b3dfd0d
 EBUILD audacious-plugins-4.0.3.ebuild 4145 BLAKE2B e05a4040a1c2f61f111ce4f4f3ef1e60c3e4594a292bc989dfc467fb8aefd2b30cfaca1576ef7ec582d1c851b89b75381e5a52a991809c75923629c5b3cd762c SHA512 5f6dae8d50a5a3641d27fa8edfe47b9fd5f56e05d984522a913c2211bc2885f45cc92a81ada71611220072166ec62122009804b086b6aeecfa898d68c2bc39de
-EBUILD audacious-plugins-9999.ebuild 4444 BLAKE2B 7d6b475ded94f7fcfe9ae74efb3a8558cd599686c14c02ed0498e2b8945e791392cc269bdeb28f437f4ec7671a396fae37e2d6680e7ba4fae4df438ab4a0626e SHA512 21c95c887368cf14dd32a2fe6405d02f66ab17e53163b6d9660e61adf99f31330f4e5a40e9be1abc14b2b88e14064e7472cca80c08b768a194edd5c16a878e88
-MISC metadata.xml 1317 BLAKE2B 49a347b9594d7f9c5fe658313e06205b419899f13af88a3d7ca8b03ffbf6359da8ea4c4645781c248f8f72c889e2e21d125e9469bad22da66df464b3002d2bbc SHA512 8b510eca153c546d9ed25466652b5318b220f9fb6ca3c07c61ecdc5595366bece42d6aeb938d3c522f775d6dd4ad54d60749b43d84dad1441d782628aa70dc3f
+EBUILD audacious-plugins-4.0.4.ebuild 4070 BLAKE2B 720c0ce91402ad2fef3c60411eb675c09c173f2bd7fb50213ff244c86a1eb67713a8d8d4db7adebb1012465321659a623eeb83e98f6009e4d65e729a910c541b SHA512 7c84ea8b62ad9d9d570ce182ddf35391a547bb3a6990d536de157b08eeea4af2e2ffcd5fa8a707b701472d28f194eaefa182eb37b5d464daf3a5697c9124d3e8
+EBUILD audacious-plugins-9999.ebuild 4128 BLAKE2B a4d64f7a16659e1cc4c939a9503756dfdc9f1297cdcf82e65204e768df1e6599596d4633ed2f2fdb406a01ca01c225ff73340051a92a81dcff63bc76a2b984d8 SHA512 c7c8861f1af4d563326ca9513101d48148c92fc0b90a545303cc8849e30debf689beb757dbb305f48606e3788832cb84dcda0af1a4e9511ae44ba0914ba7c3ac
+MISC metadata.xml 1251 BLAKE2B 1b67d43427b19c320e46b134c1780048def69a124aaa0c6d47ee1a55c7738a896cffae3a1f52fc2c5103d9d064fe6281d50f6bdcc839c046118b41b59f353d75 SHA512 145522b449bda87e294a0a63e95f4d12634695feea5d9d6f703079c9f742e7736cc232ecc7726e1d14740689b188ee473299d4fa5045e488f2fea5a4b4071d8e
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
new file mode 100644
index 000000000000..76a54c61081b
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+#   alarm
+#   albumart
+#   delete-files
+#   ladspa
+#   playlist-manager
+#   search-tool
+#   skins
+#   vtx
+# Plugins with a configure option:
+#   glspectrum
+#   gtkui
+#   hotkey
+#   notify
+#   statusicon
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	app-arch/unzip
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
+	aac? ( >=media-libs/faad2-2.7 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( =media-libs/ampache_browser-1* )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia:=
+		>=media-libs/libcddb-1.2.1
+	)
+	cue? ( media-libs/libcue:= )
+	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
+	flac? (
+		>=media-libs/flac-1.2.1-r1
+		>=media-libs/libvorbis-1.0
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	http? ( >=net-libs/neon-0.26.4 )
+	jack? (
+		>=media-libs/bio2jack-0.4
+		virtual/jack
+	)
+	lame? ( media-sound/lame )
+	libnotify? ( x11-libs/libnotify )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lirc? ( app-misc/lirc )
+	mms? ( >=media-libs/libmms-0.3 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	opengl? ( dev-qt/qtopengl:5 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
+	streamtuner? ( dev-qt/qtnetwork:5 )
+	vorbis? (
+		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-mpris2
+		--enable-qt
+		--enable-qtaudio
+		--enable-songchange
+		--disable-adplug # not packaged
+		--disable-gtk
+		--disable-openmpt # not packaged
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable alsa)
+		$(use_enable ampache)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(use_enable lame filewriter_mp3)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate resample)
+		$(use_enable lirc)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable nls)
+		$(use_enable opengl qtglspectrum)
+		$(use_enable pulseaudio pulse)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable streamtuner)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_with ffmpeg ffmpeg ffmpeg)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index f9b1ea0ec287..b915d2ebe95b 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,14 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http
-	jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
-	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
-	vorbis wavpack"
-REQUIRED_USE="
-	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( http ) streamtuner? ( http )
-	gtk? ( !ampache !qtmedia !streamtuner )"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack X"
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -53,7 +49,11 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[gtk=]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( =media-libs/ampache_browser-1* )
@@ -70,17 +70,6 @@ DEPEND="
 		>=media-libs/libvorbis-1.0
 	)
 	fluidsynth? ( media-sound/fluidsynth:= )
-	gtk? (
-		x11-libs/gtk+:2
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-	)
-	!gtk? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
 	http? ( >=net-libs/neon-0.26.4 )
 	jack? (
 		>=media-libs/bio2jack-0.4
@@ -93,8 +82,8 @@ DEPEND="
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
+	opengl? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -107,6 +96,7 @@ DEPEND="
 		>=media-libs/libvorbis-1.2.0
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+	X? ( dev-qt/qtx11extras:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -127,8 +117,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-mpris2
+		--enable-qt
+		--enable-qtaudio
 		--enable-songchange
 		--disable-adplug # not packaged
+		--disable-gtk
 		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
@@ -143,10 +136,6 @@ src_configure() {
 		$(use_enable flac filewriter)
 		$(use_enable fluidsynth amidiplug)
 		$(use_enable gme console)
-		$(use_enable gtk aosd)
-		$(use_enable gtk gtk)
-		$(use_enable gtk hotkey)
-		$(use_enable !gtk qt)
 		$(use_enable http neon)
 		$(use_enable jack)
 		$(use_enable lame filewriter_mp3)
@@ -157,8 +146,8 @@ src_configure() {
 		$(use_enable modplug)
 		$(use_enable mp3 mpg123)
 		$(use_enable nls)
+		$(use_enable opengl qtglspectrum)
 		$(use_enable pulseaudio pulse)
-		$(use_enable qtmedia qtaudio)
 		$(use_enable scrobbler scrobbler2)
 		$(use_enable sdl sdlout)
 		$(use_enable sid)
@@ -168,10 +157,8 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
-	)
-	use !gtk && myeconfargs+=(
-		$(usex opengl --enable-qtglspectrum --disable-qtglspectrum)
+		$(use_enable X qthotkey)
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 02bd0208b848..30eb5c5c92d9 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
-		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
diff --git a/media-plugins/gimp-lensfun/Manifest b/media-plugins/gimp-lensfun/Manifest
deleted file mode 100644
index e1b3823530d9..000000000000
--- a/media-plugins/gimp-lensfun/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gimp-lensfun-0.2.4-exiv2-0.27.1.patch 243 BLAKE2B b2b113981da41bb7421481fde90d40624855f1a3a920dbcdae96ceb7e4fee512ce8559842b2189fbee8e00c13f7495e0def8955fc8b065950b348ecfb0902324 SHA512 58d486b26c8c55af4a9cbb9c087ae44d9d16100ac7e0fadab84eaa62e165c0a7cff66fc6f7ad0d0c0eafd471b029e344a0fea8b065760c1cc8edaacc895479ed
-DIST gimp-lensfun-0.2.4.tar.gz 29039 BLAKE2B 30c5abac6e00e74e008a94f0fa23391d9dc336b5a6540ec7a0deb33e250cc2df66821db67b4bd76b36c9745a600838c834c01c27db741f8349f2ac13dc60e963 SHA512 5a73a00d71c28d92881bfc2b15be7e8adef8756af808f8ae19f0e3208287853fe4f735b1bef23b658f660da8393b68cbe8416804173944d0c844ac284be77671
-EBUILD gimp-lensfun-0.2.4-r1.ebuild 946 BLAKE2B aa8cdb12f08eeff21f289f0e498673b98e9061e916ef23567a6f5fd1c8ab6b1d0475c7e5442c907f17fe701d12b1d7b686c2e9bd6ce1c7452c869d4ce30045e5 SHA512 13c2401faf147316cc73f51076f171b74c1c3369dac1184327a0828770bc32a82b9a3d5a2e0eb6076048792b5f34eb7f3695971ec7f6da8f6781ddf64695cff2
-MISC metadata.xml 249 BLAKE2B 30a93482d9da433af6ed4cabb5bdcc20e297296af8b5e58a4ee18942514d4cae56462b5e61e23db269a20dfdd3b956ba0dc22488e03e4a8222f8d6d64df9918e SHA512 f0120dd9871a00b101f65f11eec65f7bde96cc2641f7913fb24f1633b09f4af36ab70ca48422dd8ce89c81b5819c79d4eb3b04950821816fbc0520525959f8d1
diff --git a/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch b/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch
deleted file mode 100644
index d62f1790d5de..000000000000
--- a/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/gimplensfun.cpp
-+++ b/src/gimplensfun.cpp
-@@ -31,8 +31,7 @@
- #include <libgimp/gimp.h>
- #include <libgimp/gimpui.h>
- 
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- #define VERSIONSTR "0.2.4"
- 
diff --git a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild b/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild
deleted file mode 100644
index 2756553cbcfa..000000000000
--- a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Gimp plugin to correct lens distortions"
-HOMEPAGE="https://seebk.github.io/GIMP-Lensfun/"
-SRC_URI="https://github.com/seebk/GIMP-Lensfun/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openmp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	media-gfx/exiv2
-	<media-gfx/gimp-2.10.0
-	>=media-libs/lensfun-0.3.2
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" )
-
-S=${WORKDIR}/GIMP-Lensfun-${PV}
-
-pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	if ! use openmp; then
-		sed -i "s/-fopenmp//g" Makefile || die
-	fi
-
-	tc-export CXX
-}
-
-src_install() {
-	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-	doexe ${PN}
-}
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index c094e9829fdc..9dd8c328fa60 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,7 +1,4 @@
-AUX config.gentoo-r1 499 BLAKE2B 8a4f1261f09e613c2bd666b070c4f5848a5b30ed48cf5668623274a4aaaeb525ded1ac83f8b5e0d6a7ec7c149c1959651e15ca3223a29e7a9487ce206c972b95 SHA512 4fab673258f340f00a79ced3106b6f32b74eaa7c691447422890ef66ae5ac82f703b3ad08178d656823d9cd51510521ff92c41866e629657a6e67c53279c0752
-AUX config.gentoo-so-r2 524 BLAKE2B b540de1163b9eb6014bd421c62d582bb6b4341866e6fb8212bc0c38c7fc3c9bf4f5cf6e1bd95a9e30879384dfad3232361985b10a093b900b52bb6ca01216577 SHA512 03d6a8712c0c2c4b7b7ebcdcada9ab6ece6fd19ffafc61c864821d19671001efb7c91b77fcf35ed38275c46d305ade3a7a655922fdec3ab6e7e00785242ee5fd
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
-AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc5754ae7712def7e90c55040c9e1c80dafc0d30555751e183c2b9d92de4410d8cb95d8707414cb17f641acbb6f SHA512 98992859d1f8149e337adbf42c13276e6bf40d5497399ab4f82351cd5caf78ecd60e28df24d36b34cfd02e83365cb37ae1b264afcb52334f304695b400bce622
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
 EBUILD live-2020.03.06.ebuild 3052 BLAKE2B fefa656dca0f1ebde2bb5ecccee03c0e5ca2abb1efed3a0921bfefd975cc4cb5eb59197fef1fa8086a03614e024465d64567f0a39909a4c83d6d3c76449c688e SHA512 0d306cb3123b1ee15828c3ae77f782c74a1b408989a80d5a7b16dfe869cff67d8cb3dc4a7ded87aa86d56d173c34ff3474732bb3e4dbc2ac24c127e8c828581e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/files/config.gentoo-r1 b/media-plugins/live/files/config.gentoo-r1
deleted file mode 100644
index d77fb19758a5..000000000000
--- a/media-plugins/live/files/config.gentoo-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(LD) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
-LIB_SUFFIX =			a
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/config.gentoo-so-r2 b/media-plugins/live/files/config.gentoo-so-r2
deleted file mode 100644
index fb9241ef3e86..000000000000
--- a/media-plugins/live/files/config.gentoo-so-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CXX) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/live-recursive3.patch b/media-plugins/live/files/live-recursive3.patch
deleted file mode 100644
index 29afe86e8197..000000000000
--- a/media-plugins/live/files/live-recursive3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: live/Makefile.tail
-===================================================================
---- live.orig/Makefile.tail
-+++ live/Makefile.tail
-@@ -16,9 +16,6 @@ all:
- 	cd $(GROUPSOCK_DIR) ; $(MAKE)
- 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
- 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
--	cd $(TESTPROGS_DIR) ; $(MAKE)
--	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
--	cd $(PROXY_SERVER_DIR) ; $(MAKE)
- 	@echo
- 	@echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html"
- 
diff --git a/media-plugins/vdr-permashift/Manifest b/media-plugins/vdr-permashift/Manifest
index 1c844a629a1a..64fbe63b8097 100644
--- a/media-plugins/vdr-permashift/Manifest
+++ b/media-plugins/vdr-permashift/Manifest
@@ -1,5 +1,5 @@
 DIST vdr-permashift-1.0.1.tgz 49184 BLAKE2B 2342f0d071afd7f38b6109a514f124760aaf0058c9ef974974ee31f282a5ede8ee3636431e0c7e30a39f2da5ec966471b9c6ca073a8a13054052fbc8418fb3dc SHA512 b69e492e42f9ba2123f45e5ea1de8db937c3569a35da53429a4c97222e8a1aff0d4a5ab22920e65796d173e2963a9feda02a5a558309784b6296cd041352f252
 DIST vdr-permashift-1.0.4_pre20200301.tar.gz 52894 BLAKE2B 710a8373fb1bfb8d51eabb43db56c79a29c3fbd34f730f02bc73bfde6f1da68a3fdae221e06f71c25108bba6b5dc87b0a975d6dd62beef64738649c0e796a191 SHA512 a9e78df00d43ef692092ea299e13520ebc71766a7ebdbf3c0963e535014c837b3556b2fa81b444680830c703b56f459ef2ec01904282c0f34b80e20cba96a5f8
-EBUILD vdr-permashift-1.0.1-r1.ebuild 540 BLAKE2B ef2fe87c051809b0f0188a0bf92a6c886fe011bef1eb023c512f7a5041c1d3d499cecf635460375ccc01825ecd63660e03fb0f337ed7cd9274403a36807f0fd3 SHA512 c012e5ece5755afb8e61f48981637711d45bb537d3a54fc4f8ae6b665eaa23cd00dbc2a915dc9a1f6276d22752f05ae24863140957d917b6b07f50412a1ed4b1
-EBUILD vdr-permashift-1.0.4_pre20200301.ebuild 727 BLAKE2B 06a0a3b0b17ffd4a3c6c0a11aef2eacdb26e7d0d332134eefb58034c3451f6cb13f8ef648c2b282744b0a65346f2321f63d1658a74065c5dd783ebca057eebba SHA512 ba81c37e53bd80401a2568cfbf745eeb21aa2db7885efa8b08a5a6353752ec8dd09388aa3059e4bb3248a5852d45b7cf7319299536a689a1027735e66071d83c
+EBUILD vdr-permashift-1.0.1-r1.ebuild 542 BLAKE2B b4e9a67bfe416d0edb93bde06d87779291b478cd024a96bfe6cc553637b23b23b108ddd463665e7deaa2a56b1459c63faaad2e56cb8baad26922fdea7e4e9f52 SHA512 6336d6e88a6da5e580e8fd0fbf2b19cd58c01bee3d4b4184dd70eb79ef1fea79521a3a5684ec040073e7a052da6e004f3936d36b7613054d9ee0d61d725d3429
+EBUILD vdr-permashift-1.0.4_pre20200301.ebuild 728 BLAKE2B e0be0f58afc96a95725de8ae97e2cd546a9644940df9f81982ae7696bd16736d23d2d2c0e53dd054c90210200eedd53ac64c4137da13c4fca6e2d7f74b6a36b3 SHA512 171d7f77db285e7e022be7ce85dedda47be59b7e89ac4a43a464cba73817295c924b6eb5215cbac2ae37194f0e9a354a8fb371943d80f313308d20487810333c
 MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
diff --git a/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild b/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
index e0ea35303d93..cea4c6abf918 100644
--- a/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
+++ b/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: permanent timeshift by recording live TV on RAM"
-HOMEPAGE="http://ein-eike.de/vdr-plugin-permashift-english/"
-SRC_URI="http://ein-eike.de/wordpress/wp-content/uploads/2014/11/${P}.tgz"
+HOMEPAGE="https://ein-eike.de/vdr-plugin-permashift-english/"
+SRC_URI="https://ein-eike.de/wordpress/wp-content/uploads/2014/11/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild b/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
index 94863818ef20..ece2759181fb 100644
--- a/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
+++ b/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
@@ -9,7 +9,7 @@ inherit vdr-plugin-2
 GIT_VERSION="f3541d7c0e3e201daf06a49304db0a0d7d5f8dd1"
 
 DESCRIPTION="VDR Plugin: permanent timeshift by recording live TV on RAM"
-HOMEPAGE="http://ein-eike.de/vdr-plugin-permashift-english/"
+HOMEPAGE="https://ein-eike.de/vdr-plugin-permashift-english/"
 SRC_URI="https://github.com/eikesauer/Permashift/archive/${GIT_VERSION}.tar.gz -> ${PF}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index e0e20fdf2b09..6fc1fdacb9c2 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 40c22d6b687d..547559a81890 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -5,5 +5,5 @@ AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c7
 DIST wsjtx-2.1.0.tgz 44904654 BLAKE2B 4d36a9099356225ff2cf12108c0f42da67396a2602c1dbcabcbb001684212fbc81a7f4be23b8d35e32903119cdf04a41fe199429dd8693452b17084481691d74 SHA512 3a76b879586d285d570d05ae5ecca4a27b2da2153d4845c5b3b0a047721ef153af8745764403cb85555097c6778032f559e5848bad7e1cc7d469a874858ad40e
 DIST wsjtx-2.1.2.tgz 44928980 BLAKE2B de4e4e892893e5087199385aaee8753c0f71eb36cd23734ae430f50d8a09520bf2bf3df7038bcf03ba4e9ca24534c98a1b6cb5dc444d68d3183279231cf18974 SHA512 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
 EBUILD wsjtx-2.1.0.ebuild 1423 BLAKE2B 443a5e12525b1684bb1baf19ccea642e7a708f2022bbb141bb2338e2126c464140980eae9339fd82560972e25dfc67d8df81671820d63af8207a3a525fc7ceb2 SHA512 64964a8a9158aa12f617b99bef4c7df7c24dba5a257bc887295e0969a109d6f64a24fc0855e5dc484f3fd973c55661701b18b4290050f3a1a756a4cb693ba9ca
-EBUILD wsjtx-2.1.2.ebuild 1471 BLAKE2B 43fe9f0737d8cd450e805dc14dcdc661fb8f23042fcadb44eb575f979ff9a977bfdc1f4e1f717c9b61ea6c8a6e691c83f60ff3ae3c82158252d503a2608cfb54 SHA512 32fc6e795a423076401dbb84f5fbf1013b62a082c187d57b1f5792a9cd6d6ede50f6bd4f7ac2dd029e10aeb7cc405925220d53e120925274359c7b0cda6df275
+EBUILD wsjtx-2.1.2.ebuild 1470 BLAKE2B 7ce4185d8be8dd273f5ca2dd4221e29f97b0903478db6eca3f11041ca8d6ca895c1b598c9a8e3cd4bc9a4850d6b6f4447997b4b868a96db1c4183b48c5b28b4f SHA512 07456e1c31711466dce9f611f8d6ce34f9c09172fd4128f876c070add742dcc923ca8988728435aa3f3f6822308fd5a0cf1d949562401aedff788b05210039cf
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/wsjtx-2.1.2.ebuild b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
index c5c72c6d3455..92b441112d0b 100644
--- a/media-radio/wsjtx/wsjtx-2.1.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c058a5e9c34b..3f94b3b68e1f 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 1ba4a8d39cd7..f2480b5b0393 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,6 +1,4 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
-DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
-EBUILD alsa-tools-1.1.7.ebuild 3582 BLAKE2B 11ac1868daffdd46fa1b2773d30df9e8549a25da2fc7758ae1ae300951a259622819ea5b09074ed41d9349344afd1b07c871498f403ceaaf4554390e4ffa8f31 SHA512 f2f631c6b3d9b11df7cc7a1fdb89f3453fd51771a4b2a6237a922887ad462e83b9739dc38ca48c42f039b855b3df48b36c30cd49f6b9f3904c35234cc37fb180
 EBUILD alsa-tools-1.2.2-r1.ebuild 3406 BLAKE2B 96ba11cb4d70c6231b0a1b41251969b343276ae6b6678a260b1b38c8c2ecfde681e2f6a97f1ed7b4032d234748d98e3f1858d282008d9d3e9b075de0042765a5 SHA512 4036014c982680d69f5d337f597d79d5e42ba4fb1ae88abfd866f996cc4b042dfc6f04621697c22b1990918491734ff4eb5eb15d3b18312ea182a92ea85e7d5b
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
deleted file mode 100644
index 71a66dbc3ad8..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ /dev/null
@@ -1,160 +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 gnome2-utils xdg-utils
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
-
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-1.0.26
-	fltk? ( >=x11-libs/fltk-1.3.0:1 )
-	gtk? (
-		>=dev-python/pygtk-2
-		x11-libs/gtk+:2
-		x11-libs/gtk+:3
-	)" #468294
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/envy24control-config-dir.patch
-)
-
-pkg_setup() {
-	ALSA_TOOLS=(
-		seq/sbiload
-		us428control
-		hwmixvolume
-		hda-verb
-		$(usex alsa_cards_mixart mixartloader '')
-		$(usex alsa_cards_vx222 vxloader '')
-		$(usex alsa_cards_usb-usx2y usx2yloader '')
-		$(usex alsa_cards_pcxhr pcxhrloader '')
-		$(usex alsa_cards_sscape sscape_ctl '')
-	)
-
-	if use gtk; then
-		ALSA_TOOLS+=(
-			echomixer
-			hdajackretask
-			$(usex alsa_cards_ice1712 envy24control '')
-		)
-		# Perhaps a typo the following && logic?
-		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
-			ALSA_TOOLS+=( rmedigicontrol )
-		fi
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
-		ALSA_TOOLS+=(
-			hdsploader
-			$(usex fltk 'hdspconf hdspmixer' '')
-		)
-	fi
-
-	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
-		ALSA_TOOLS+=( sb16_csp )
-	fi
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS+=( as10k1 ld10k1 )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS[*]}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS[*]}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		cd "${S}/${f}" || die
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-			;;
-			* )
-				econf
-			;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		cd "${S}/${f}" || die
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		# Install the main stuff
-		cd "${S}/${f}" || die
-		# hotplugdir is for usx2yloader/Makefile.am
-		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS; do
-			if [[ -f "${doc}" ]]; then
-				mv "${doc}" "${doc}.$(basename ${f})" || die
-				dodoc "${doc}.$(basename ${f})"
-			fi
-		done
-	done
-
-	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0fb9c63629e8..2625f0ab02d1 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -3,8 +3,6 @@ AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
-EBUILD alsa-utils-1.2.1.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
 EBUILD alsa-utils-1.2.2.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
deleted file mode 100644
index 13b172c0891b..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 510b98efcde0..cd4fabb9933f 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,9 @@
 DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
 DIST audacious-4.0.3.tar.bz2 577512 BLAKE2B 55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18 SHA512 e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd
+DIST audacious-4.0.4.tar.bz2 577440 BLAKE2B a51766ea61e91244eda39f77710f5489641d7e8a12332eb2e5b254b2dbc5360196beba040fa453fbb992d8815cd002604fd542d88f53dec3651645cc5e697dcc SHA512 76bafb2cece861b58650e52cc8c338a0645387e43b7d3548b23528024195605c11789479d8fb2ae25d5986cd5ccb03182eb2427c9ba394d4fd6611f06359f94d
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1-r1.ebuild 1696 BLAKE2B 09463aa9d83d1d610ea48321f81783dc2127d3be5b8d4574cc96d7edaebbbe8b88cf025aa4a8606cb2c6a4ce6745a59bc0f787203c66f07735dfd5732152aa5a SHA512 f31880f63020fb113020bf60a59f187117d1f60e545102da755615419affbd5599ce97c856e80541b1db67346855081ee0ec220584effa252d5f534534fe98aa
 EBUILD audacious-4.0.3.ebuild 1766 BLAKE2B 4977dcdedca220fd9de9760af086e9195aa4fdd9bb7fc3547b529cdb569b73fc5c9fc5b0ffaccfd4d3e725f82d602f4e161d85c41996ba1103272cad2771714d SHA512 1f983f029630e6da151a176ee69968983e5abd6c9cb7164c783c1296353c7d633aab4f09410751a9dc7d3276128606c06b57f7198693039b9cdfe217aaa424e4
-EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
-MISC metadata.xml 448 BLAKE2B e90c79db8c6985ab2da4be826285a87e8835d25227bf36e912a9d28c230336a09b7fb10f9421f5a465ad22e1c60b4efa011d8917ee8024e60ff256a85534c7d9 SHA512 6e66d8e10bfa07d68a7ca02a6064959f77c7d698473b27eff114b9646e470810a5c115da3fbda71589fcd355db579edc77ae594c4f89f89267c18e7461d03401
+EBUILD audacious-4.0.4.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+EBUILD audacious-9999.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+MISC metadata.xml 367 BLAKE2B 3178261eacb8e350e8930e69bc03206952775a7cf98bc2da66d6b28413940bb00c2c485302637a70fdd4591ee0cc324d0c92934f403b844928bc2a5c17e98da8 SHA512 557d6cef39796075cf75208ef91e02ed32e6906929fa4f4408798e4a56ced6e472069aedcdda7c2276d89c2732d7c2832b79f514bd77b7147b25487e3f217b87
diff --git a/media-sound/audacious/audacious-4.0.4.ebuild b/media-sound/audacious/audacious-4.0.4.ebuild
new file mode 100644
index 000000000000..13924b39fcb0
--- /dev/null
+++ b/media-sound/audacious/audacious-4.0.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	local myeconfargs=(
+		--disable-valgrind
+		--disable-gtk
+		--enable-dbus
+		--enable-qt
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index edf35f502de2..13924b39fcb0 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk nls"
+IUSE="nls"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -29,15 +29,12 @@ BDEPEND="
 DEPEND="
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.28
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
 "
 RDEPEND="${DEPEND}"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
@@ -65,9 +62,9 @@ src_configure() {
 	# Bugs #197894, #199069, #207330, #208606
 	local myeconfargs=(
 		--disable-valgrind
+		--disable-gtk
 		--enable-dbus
-		$(use_enable gtk gtk)
-		$(use_enable !gtk qt)
+		--enable-qt
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 42ef143d3440..30869dd2bbde 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -9,7 +9,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<use>
-		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index fa2e8706b214..2ac6c0bc7a90 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -2,5 +2,5 @@ AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114
 AUX din-43.0.1-makefile.patch 552 BLAKE2B c73746b64789dc54f4186777d507fc77c9a0b25e025be4adb48c4620adf4560ef600a445a8822ac045b0a39b4003c5b9007b5a36ed97fd61cdc6a1b8d96bdf74 SHA512 408d71e3b1e262eb83cc6cf0cd3ab4ee164bb9a6fda5244a6445d627c53b23e3d3d3e64bfb9f2c69e8168ecda0a46f8b4768100710f219a8b78325d238af4207
 AUX din-44.0.2-makefile.patch 590 BLAKE2B 6fedfe655ae6a977da3b94d4e7ec9863ea679860a23f6bc7dacfc7e9099a63c9cf0f7b264e13544ea13b2ec491a0b561fe757dc67f40ac373fecda6c3a76ff2a SHA512 30ac7595fe33a8ce3b32df857f610719ff55fa97a8f3fbb90cffa17cdbddcdf4f90e282ec1e5619440301ac34c0474c28ec891a71c169772d9d0fe6bf36e6e74
 DIST din-44.0.2.tar.gz 3652445 BLAKE2B 2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c SHA512 a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8
-EBUILD din-44.0.2.ebuild 1083 BLAKE2B 776a2e4500e817862b024749a0ba26e1a153838bceb50d5939dc2d471a8d5fb9d24ac0396dfee166358696a2cd1037f93d6c0bb9062c2b01e718df8e78410f7c SHA512 a958b2547c0e4ea3768c5efb666e13c3ff1f16f7f70a48b2f1c52eebef46b33ec3217209055fbee7c5874e34dbb818ef14f7bc3da6c5b184b8a46e3639f35398
+EBUILD din-44.0.2.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-44.0.2.ebuild b/media-sound/din/din-44.0.2.ebuild
index eaec2db6bdc2..a67d55f2e191 100644
--- a/media-sound/din/din-44.0.2.ebuild
+++ b/media-sound/din/din-44.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools eutils xdg
 
 DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="http://dinisnoise.org/"
+HOMEPAGE="https://dinisnoise.org/"
 SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index f305d9432cc6..503c769ccee1 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..fde8cf288529
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.34.6.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} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=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_gen_cond_dep '
+		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.9:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.9:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		>=app-misc/tracker-miners-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
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 52bbbf188db4..a445d85c572d 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,5 +1,3 @@
-DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
 DIST grip-4.1.1.tar.gz 1211196 BLAKE2B 677ace9ef740db150a2cfc9b597b148b50015dda79cb41b53cd656451b038ff71d6efdf3e17bea65accc071ec0116c6025a7c9619cb09a3782eeb94904e431a9 SHA512 c6af48b0fa89fb342c73614c6193973811ccf72837a46eb1a3971ffcfa9a20bb4fb8705ba674b093e2c4f6f78f9ded323cf5453cdecf53c467238430f98ba267
-EBUILD grip-4.0.1-r1.ebuild 1141 BLAKE2B ec212c5bdcfabdafa9205f8880c01c50a8404c864243dd54474333a7c479b6eafb3e27e17afc9093a46efd5c8127185c01f30e62c4a11cb2ca9481b17188f872 SHA512 fd45655be378d498cc16ad51c2ab141d72dbf5924bcef19f3d8ee0a9088629cfae10427ffad6356f4c7509df5a3176633f1c0d99edcd42482f7e2b26871b4f9c
-EBUILD grip-4.1.1.ebuild 1077 BLAKE2B a6f56d13e778378eae796dc090b04152d148db998a0ee1416ca8d680e57a618298a8a2428d80d9d029fee64962fdf74230f9ed84cbce82ab57a1a5ee0b5a3edd SHA512 136db8127b80a40c0e19abd3ba59a597b190c1e81337e1aae4e304c83a4dc8f243c1eea3c96e60a647d321d497a21acd43be8090cbe8d14ec02943af1bb5e73d
+EBUILD grip-4.1.1.ebuild 1072 BLAKE2B 1b7d04469b4266a000a6b079f93fac4c0a3107d226fd051d1dc651abe54a07b55b1087f143dc5ea6914d326d4d58c5eabebbb3e2e0762bfd3a25c0da15d29f3c SHA512 b1999167ec68c632d214a899fd1b1078c8bbe4b9d2636d10a93f95dd7a8b5973613f5212d9baacbb81a4346161a18b914bd4fab363a9c4cdd671d7b024c3a92d
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-4.0.1-r1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
deleted file mode 100644
index 992f5cdd3e13..000000000000
--- a/media-sound/grip/grip-4.0.1-r1.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 eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf --disable-werror
-}
diff --git a/media-sound/grip/grip-4.1.1.ebuild b/media-sound/grip/grip-4.1.1.ebuild
index ea1d05e4b634..de4b4a0ec027 100644
--- a/media-sound/grip/grip-4.1.1.ebuild
+++ b/media-sound/grip/grip-4.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
index e7213981531b..2736605012d1 100644
--- a/media-sound/jack-rack/Manifest
+++ b/media-sound/jack-rack/Manifest
@@ -5,5 +5,5 @@ AUX jack-rack-1.4.8_rc1-noxml.patch 492 BLAKE2B bfb74018767f8e08dd27b93531e848d5
 AUX jack-rack-1.4.8_rc1-underlinking.patch 315 BLAKE2B 656898ba9367cd0eeecc1f4183c852676cff35de4350e42db75c8dbede502511b94fa34813e8fd5b5281e04d1d9df684a2c1e5c4bc61e92147c478f3910f3203 SHA512 db0353aab452a5f59b411085740f8fd2a115afb690c481eb2dd2ea6609887ad36114bea9148c73ff1bfea2cd04a34f01d2c5b16a4f8a411f854d53431df31163
 DIST jack-rack_1.4.8~rc1-1.debian.tar.gz 6742 BLAKE2B 51d5336878b7a6957822395dd282872c1681dfce9c54af569d311c40f612240f0db90812fc6dc2364c0a259f6c1ed8623e9fe5be6dd21fc4574674048d6b13f6 SHA512 4e0503a0b1fa080bed0f9730929d820d173d886f4d4801016419d33729ec453f1f4e0f96fe102d83731169b91c54939663e9529516fdc09bca5d347be3e18715
 DIST jack-rack_1.4.8~rc1.orig.tar.gz 122400 BLAKE2B 93367eb01c5079a855a55f976205901b0f9536929424e04b1c4a7c6d620d2d7e93c3475cd46cd6bd17995d2c2b77ca5b1b342166c7098b817a3a53843b48a51a SHA512 8c7be402b6c8ad02a6ad7379d98c49a00bf5a3c70e5e5c174d786e77bf72592cf2eec6b346ce77d1dabb3787a6d028f4d02a1dd18daa5bf3daa297ac7bd7ad38
-EBUILD jack-rack-1.4.8_rc1.ebuild 1583 BLAKE2B 082d8840b6f5bddb4575efe246e0e8eb98b0872f1cd2c9caf6029cca24949f447a9b83dad0ae6b854e7d47e94da303a622bd3ff4079fe939dcc5cdb2738450f2 SHA512 dcd83c9992147ac9e72cd7796c1ff90df12bb8c9c9870856ed62e2d96b6f241d1ed91055083dee6601d730950b4d88d342b0564ed5a7813caf6ce8fe9bce0906
+EBUILD jack-rack-1.4.8_rc1-r1.ebuild 1537 BLAKE2B 3ef413b66e565a7a7b181c41abff9a49b7bb1a66d33350c688a63317909dc3f2f644d71c5d95ea1dea60111516f78b2ecaeddd1c8d8ddf35a943fc3a3f32a7ae SHA512 935f0a1ecfbd70a41d8f56bd741ccd04ad9c30edfd36cb518a1c3a4ec692a95a2e05182fe74ba9702f0d961b415e837acc1025f4809fe85e437f1c897fde058c
 MISC metadata.xml 338 BLAKE2B 0f7169d20fe0dd2ebd07b886c6f3973283e61e0ccfcfba61a9065209666d3ec1e0b14f3367f283d57d320f4006ae8b9ffc454390e2d5f5df494b691b74eaa23a SHA512 5274213ba5e9a2710d7e0d1e11150e45d902e2ac263ef21359046afc774d7fc4b7aea86705a49a0ae39b9adfd6c4103d450ccb737defe2eee1078bf3d3819c51
diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
similarity index 92%
rename from media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
rename to media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
index 002b6ccc6f6d..f92eced8b109 100644
--- a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1-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
@@ -15,7 +15,7 @@ SRC_URI="${DEB_URI}/${MY_P}.orig.tar.gz ${DEB_URI}/${MY_P}-1.debian.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa gnome lash +xml"
+IUSE="alsa lash +xml"
 
 RDEPEND="
 	media-libs/ladspa-sdk
@@ -23,7 +23,6 @@ RDEPEND="
 	virtual/libintl
 	x11-libs/gtk+:2
 	alsa? ( media-libs/alsa-lib:= )
-	gnome? ( gnome-base/libgnomeui:= )
 	lash? ( media-sound/lash:= )
 	xml? (
 		dev-libs/libxml2:=
@@ -59,7 +58,7 @@ src_configure() {
 
 	econf \
 		$(use_enable alsa aseq) \
-		$(use_enable gnome) \
+		--disable-gnome \
 		$(use_enable lash) \
 		$(use_enable xml) \
 		$(use_enable xml lrdf)
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 1ecb2bdd402b..152b0de680af 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
-EBUILD jack2-1.9.14.ebuild 2365 BLAKE2B 74db2267ceac7e74f31685257150300fcd797e8b0bbc95e985285ae51d33c025d87ae232996301e13e41db6ab0bb1b4171114cea5653a72807aa0d5f3c491b63 SHA512 fef8b7107cc6009d88406cb8c55982364cfe5dca6daa41186474cbd63b91b633556fe5f349bcb686ca8791835993aba30f4af89bf60a5f9e043f6822b706d692
-EBUILD jack2-9999.ebuild 2405 BLAKE2B b7596a88181d71921c48b5e72542fc454cde1d94f3694304bb9f8edc6a920ba9e21a0b8be9ff47924ef16311cfaddca8ce7d6b9b30676ccdea55eb6dd5459776 SHA512 afc96552b9592ac158259fd1b107317040102f8609d138638009df9307cddf6b10223a9d382b51ddbcac31d5a03fe8093be584d5b483e5761909fb980fdc9d9b
+EBUILD jack2-1.9.14.ebuild 2366 BLAKE2B f4c6acad4ecfc5b5810adcfb8a4e71208295e2fc7ebaeaf776758792df978496310af3af9fce36b890b3436ef2618fafb7dc40fa4f42459e470759b1e6441130 SHA512 fcf627cadbba9eec3021f599d6051791a8e3cefb28ee668691e2f9cd007a2dd1735fb863936af1d83bc5626dd1416e8c270ef3e1405d537a9ea5b2e51b19687b
+EBUILD jack2-9999.ebuild 2406 BLAKE2B 4cf6581a7cf3bf8e9a60dd063fbe8d0dd2cad8734e91ff09c08c4af5431502d9f30f65a3571bf3f5e2b589a31da31b3aecf8f62338496a52d1caa20caa480744 SHA512 0abe0f5bee6a76730cd21737e6391783b1f2109b82a0b80ccf9cd2d72d5b6e2dcb52daf55465d5032882968c41da0e0f154c97386cb1c4d66e4d3d2c39aa8132
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.14.ebuild b/media-sound/jack2/jack2-1.9.14.ebuild
index 82190f07ebaf..828b602a1d16 100644
--- a/media-sound/jack2/jack2-1.9.14.ebuild
+++ b/media-sound/jack2/jack2-1.9.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
+HOMEPAGE="https://jackaudio.org/"
 
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 4259cdfc0dfa..a05c1b121090 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
+HOMEPAGE="https://jackaudio.org/"
 
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 178eb7f664ec..7abb05debdbd 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,7 @@
+AUX mumble-1.3.1_rc1-qt-5.15.patch 937 BLAKE2B 1afb11851d3645a805190ab1094c054fb11e4de742f2ddf0b93e918d2cf75f192691d42b51be686714b0c5d4b61d000921ffb011f1dc58fdff8273dc427ac5a9 SHA512 e634e9736b21fcf4f652221428f8426476e229871c5da690ccac51f4b261bfad3d52ce313b96ce6bd82dc31b4d1197ec0099796bb747a8f6047c21249710fa12
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
 EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
-EBUILD mumble-1.3.1_rc1.ebuild 3786 BLAKE2B 2ec4700d67e5c7f33687147b3771b47d8cdae0279122d2fcfd003b8fec29227ce9c9c56e00344af332d9758474b7c53a1d97971af179c1b905dcf0fed6d97d64 SHA512 2d59f8fe221997fc0f1bd5157f2a5eb55f4e4de5ee2bc33510ee39cfb69a0a42b35e507142cb2fff0c5e429606fd190264a6bd2a218201be7a934b1d5faf2978
+EBUILD mumble-1.3.1_rc1.ebuild 3861 BLAKE2B 2214f7db3b1d97a9c64dbc869c20e964db9185343b417223e287debefdacb4d130bcc73228494daf8fa5ec82e61e566430d6ce5cbc0a0e1dfdd9843ef19eda16 SHA512 9c1641d264db4eddbd48d9565f5bdf5b973f2b0db6c83f069291a7adbdcfe534eea4b8518411fbc972cc00689d3e8b775c982a89a36f1829e3da013e953d69af
 EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
new file mode 100644
index 000000000000..4268d56e8290
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
@@ -0,0 +1,28 @@
+From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001
+From: Marco Genasci <fedeliallalinea@gmail.com>
+Date: Mon, 1 Jun 2020 21:01:00 +0200
+Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath>
+ include for Qt 5.15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’
+   42 |   QPainterPath qpp;
+      |                ^~~
+---
+ src/mumble/OverlayText.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
+index f06f2b63a8..c1cd9efdd7 100644
+--- a/src/mumble/OverlayText.h
++++ b/src/mumble/OverlayText.h
+@@ -6,6 +6,7 @@
+ #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
+ #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
+ 
++#include <QtGui/QPainterPath>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QFont>
+ 
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
index 69f5d7055e0d..f23f44786ac9 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
@@ -64,6 +64,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692
+
 # NB: qmake does not support multilib but it's fine to configure
 # for the native ABI here
 src_configure() {
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 5bdd4b8936f1..099a2efd979a 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a
-EBUILD openmpt123-0.4.12.ebuild 1722 BLAKE2B 40fc9e664030922463ecb3a899ff83e5f4a338ca698e6c191ccbbd81cbc956aaada491052ae57364b3d0b04d772be8937c13ccee57b753843049ce8f4d59b289 SHA512 7e128e38f365cb8077bfe6ce661b59839e2ddfd69312d95dae8a0a8006e930bb7dcce9e263372484d7b6cd5031aab635b19c4e71bc401a3d3c4ecfc1de16a8b3
+DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
+EBUILD openmpt123-0.5.0.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.4.12.ebuild b/media-sound/openmpt123/openmpt123-0.5.0.ebuild
similarity index 97%
rename from media-sound/openmpt123/openmpt123-0.4.12.ebuild
rename to media-sound/openmpt123/openmpt123-0.5.0.ebuild
index f015fab023a7..e80baefa2b25 100644
--- a/media-sound/openmpt123/openmpt123-0.4.12.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	~media-libs/libopenmpt-${PV}
 	flac? ( media-libs/flac )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )
+	sdl? ( >=media-libs/libsdl2-2.0.4 )
 	sndfile? ( media-libs/libsndfile )
 "
 
@@ -60,7 +60,6 @@ src_configure() {
 		$(use_with portaudio) \
 		--without-portaudiocpp \
 		$(use_with sdl sdl2) \
-		--without-sdl \
 		$(use_with sndfile) \
 		$(use_with flac)
 }
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index a1d3f32750a7..617f01ed91da 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,3 @@
-DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce
 DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
-EBUILD yoshimi-1.7.0.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116
-EBUILD yoshimi-1.7.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7
+EBUILD yoshimi-1.7.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116
 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152
diff --git a/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
deleted file mode 100644
index d9faf9344bfe..000000000000
--- a/media-sound/yoshimi/yoshimi-1.7.0.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
-
-inherit cmake xdg flag-o-matic
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/mxml-2.5
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-DOCS=( Changelog README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}
diff --git a/media-sound/yoshimi/yoshimi-1.7.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1.ebuild
index e4c00e99a9c0..d9faf9344bfe 100644
--- a/media-sound/yoshimi/yoshimi-1.7.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index e07219ace45a..73252d112d09 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index c240575b4efa..94beb5153e51 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -17,5 +17,5 @@ EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c20
 EBUILD kodi-18.6.ebuild 9594 BLAKE2B c0fedf0f0cf931fdc8745d6e29e2c8cfd3504355a3ebb34b8f36724c12c16d4f5eb5b4e76cbbaa66c98cfc9427b4724ab14c81c9d8cbbed4d48501e6b6444c0b SHA512 a50b9edaa6adffd9ee8673f2036e302b9d67e979068270d3fdefc0892b4e16e01204902fc6e773b4e417d259a99500f30bcb99ba5bbbae574c7f5fb3b959df4e
 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 9260 BLAKE2B 39157029c42cbc8e92a66ae35d31793e951df69ca26bf0dd80c77db8efb305e51766a783d6e0de7de6cb2f504ce72794a2b4f677693f1235dbb3d049c39437b0 SHA512 9f1930e92a214922525ee0b369ea9f3b4f01994a7b1f47a1186295d9d2de8f7df854a3cd2bf8e09c4436189fd428b0c99a6c466951d5a2fcc2e1e9c3b3e72df7
+EBUILD kodi-9999.ebuild 9262 BLAKE2B 4bda0a3da5bf0ce4488a9d4022d62d5a4a0f9704fe2c35619677e1893e3df3e3a4566f4ba24684cf7e7b7ac36193efbd251dad6b9d7a7506563c79043b216b5a SHA512 049605d099a3eefd2474fee4348cf83f361d6f88bc36ebaac1f3547d2d8ea641f4ab1150f4b0c1158a6a303ae56e3e86b5eed2d534d0cd25c94eed0065ad288e
 MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 11b1d97b1ed3..4cbbacae878f 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=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/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index f8cf42657373..5f97d0ad21f8 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -12,5 +12,5 @@ AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5
 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-9999.ebuild 4189 BLAKE2B c6ce41179522cb6f51d72aa7f8060857d27cfd6b58738b6a6040893a7d825883aab68910911f72a98a0d2b256bf3662778a67953093e012970de5f41f08e351a SHA512 0e1e1a226aaee4acf962c9ee3132cb86b3a6a8b2a444ebe694bdb1f7c76cd44a750ab8e9160985487d6482e11fd6b46f4b17086a6122730d94bd9700634656b7
+EBUILD tvheadend-9999.ebuild 4101 BLAKE2B 4f8bd479b030c990d37c88dcb2524f02e17e3d1cc561127b7df56fc9cc9b865c9e13144bd498753521155837265defe9a8803706d8a46e5fe8cfea1db6e89c2b SHA512 ce0daed28e6762b4c6eb255710936cd9338c4dac6171641dd5d12b5ab0dea6db30fddb4cadc50a0daae95ead329a106cb9bad62817f0618e47fe9ba3099fad02
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 43d6c88ec8d1..ddd46284395b 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -61,8 +61,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-hdhomerun.patch
 	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 	"${FILESDIR}"/${PN}-4.2.7-python3.patch
-	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
-	"${FILESDIR}"/${PN}-4.2.8-fno-common.patch
 )
 
 DOCS=( README.md )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b1f0adeaa212..1e211de933c0 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 0ed1728afc62..002966f833f3 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -14,6 +14,6 @@ EBUILD ffmpeg-4.1.3.ebuild 17097 BLAKE2B 012ac555ce9f91e37ffdc579084d2ec3050843b
 EBUILD ffmpeg-4.1.4.ebuild 17103 BLAKE2B 8c4217cc2f5bb4bc4894095c3d67ef2bf907a728c1034d0a00eab8f79cbd5008b6ad70dfdcb726ac6a11c0fb99bcee4e7687eaaa04cf87a03897712817b64ea4 SHA512 50e4913092edc950a33407142c914f30b58110037b53d4ba070696781bef8af3b9abce128d31becf11554e104d2cbcd4ac9899f2146b7647969192a69c7bc37b
 EBUILD ffmpeg-4.2.1.ebuild 17777 BLAKE2B 2e93d80a4456e21b354800139daee83de54ec747aef7b6fcbb35e01ae47f5fb9a954fc45bcd89b4c7a7345e32cf64b3ce709ef57eb0f2d17a8159b3e88622a0c SHA512 97fc9fc791e9f3484f1752ce4e096b64ce9401742b5eb52e83d6d61b7a88670f76f38e1ac0c6bb6d1efcebd2efd85e5dd0560918401541665b8d901c3e84e87c
 EBUILD ffmpeg-4.2.2.ebuild 18046 BLAKE2B 8262423f9cd9e21e96632d0f96d62db53161e432875b7f3f115da846e916d12130690b7d2e00b84f8b919aaaa376258e3ae46f5767fa249f6a5b3efcb0fb1a71 SHA512 b09211f4d19dac2442420249528b998c420d48a915ae7eca294a13136f4a1eef742e7268f43656b00b51a2e53fd315327222ecfed47a8d4bae16251bca46f1e0
-EBUILD ffmpeg-4.2.3.ebuild 18049 BLAKE2B 44520ec15e590afcc67f9bbad8388185882874106c7f310b958b186ddc153be7c758e72e9b2905c48f0dad88f8580f97f1c3bd912959c64187936111eae92ca2 SHA512 6efe2864eaecad5b1cf647fd4432dddee41e7e5a9c93ce351a6fcdbcd5622a371be5dea47983aaa9a79aa62a70b088f1de4024ea1456c77e606b571ec9deccaf
+EBUILD ffmpeg-4.2.3.ebuild 18047 BLAKE2B 2e87aabd8b8ee772e3c5d0ff00084a3ea574e72e47440f4c1f3de7fc64962a9fef2f2212a624b394fe158226f8c5c9c50432c966d21e8187a91fc7af02994f3e SHA512 558e1f1faec358c9d0dd12d371bb9a7226a08087ab3e3938326933ffc884bab27f5e3193d2cd758acb84b894a429b0fc9e48839d64e29ea1ae8b4361459d8dd5
 EBUILD ffmpeg-9999.ebuild 17875 BLAKE2B a9355777c63046ba069ddf31f33efd1fe212bb6abc0e9531bc88e04933352d9f456db2217e78a572f82dc7a17e0a9790faf02147a064ca1561c7902ccc6bc701 SHA512 24d5f0df6573cfcfd6a12603588a473300e2314193de4b5c34f50109622aa658f28effe9bcb0fb5fa60f6d94baef31fa7db23227e3a31e6b2a73b98d9b371be1
 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc
diff --git a/media-video/ffmpeg/ffmpeg-4.2.3.ebuild b/media-video/ffmpeg/ffmpeg-4.2.3.ebuild
index fab119d4e8fb..e1816cc90c93 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.3.ebuild
@@ -62,7 +62,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	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"
+	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
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mkclean/Manifest b/media-video/mkclean/Manifest
index 779f8331912b..fae619fb812c 100644
--- a/media-video/mkclean/Manifest
+++ b/media-video/mkclean/Manifest
@@ -1,3 +1,3 @@
 DIST mkclean-0.8.10.tar.bz2 764380 BLAKE2B 94ce2f7eda5865312e6fdc48b001d824b2216625c36a3a728dd78e93444e23a02e07cacb67281f97e77009e15348c99cdfab19f1c066c4b675c124373196fae9 SHA512 8e12ac906205b14c162f0fd29d9e1a56ee854e7946706adf22c3df40376ddeb2c23a02c499d8146aeafc945381eabb96e16ca33da1323dda5929a1fc1f337892
-EBUILD mkclean-0.8.10.ebuild 1060 BLAKE2B 98f2e5e808a08590f3f696b52d439abe46ab6b885108bae4a10341d01fc367926dc48d891bb912b355e5b10b3ec812cfba313595925a852d1ecc9593ed81208c SHA512 dfe899cffdc281cddc1fb08f5f817c6f67e53ebc4341c4ed1795f0483e4db16a34159a756fd492228262b26ee596385163a4d739dbcafb0a05fba6308906d8d4
+EBUILD mkclean-0.8.10.ebuild 1062 BLAKE2B 361eef4e832426f474985bfd4e4728affa2654096e71a21bcbbc81864c06fdffb5af104c4d665d3e52b7ce7a1185ee7783f588422b485f39e66f43901d8f6047 SHA512 906710e27bbb95b8a21f396ef915c4d4772cc8c511df41c5079d64ad68983655edc142af90366368e315f88ea78e980822f933f5bba7dc0047e4a0617d832f85
 MISC metadata.xml 948 BLAKE2B 4aa66a16ce8416c47366bf03dc09846ddf74ccafa4559521c75f63725c7efa9c33a836671db63eec2fda997fdee713cfb6a96b57d8e356c3152721d401f461ef SHA512 c246ead2ee597aaf369567b30e4577d6865befa0ef89877f512b1e192913459800d980c84e81f43a06d006e9a8f35204c8d484713a24c2886fa39b5201d226a2
diff --git a/media-video/mkclean/mkclean-0.8.10.ebuild b/media-video/mkclean/mkclean-0.8.10.ebuild
index 35ddf2b4dfca..ffa8489edb8c 100644
--- a/media-video/mkclean/mkclean-0.8.10.ebuild
+++ b/media-video/mkclean/mkclean-0.8.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=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
-HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.matroska.org/downloads/mkclean.html"
+SRC_URI="https://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 6a9b53dcfc70..ea41b1a5cbfe 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,8 +1,13 @@
 AUX 4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch 1768 BLAKE2B d2ec71166a4c3779007aabd975e3bd003b17713ff1bcd3c94e57183936c5f6fc24abd6ed5231dca94d1d37f66db7a13358c5dc52795200d190d848f0360ec1e6 SHA512 bee1af2f32215b2abc006b9f12c77e138dbe9bb2de41ae9f1022b6c10340cb8e2eb2831459b241c44e3a0789a9df81b7227dfc07beb3e7e3af6f718fb4a4c56d
 AUX motion.conf 37 BLAKE2B 0a30bc830b519022f8c3bfdedb274329ecb506f3b3e42fb3de1f61513b9ef86c7884a9298c17b19b4afbb83b33ceb4f35f85fd377775e2485bbbfa2feb76833e SHA512 06e2dd29b946f35c78e7cf0ddeca727ca7f3f84e57e38b6688b2a493d487061ea6c959c5b365305a7813e0d3315f719003c681c26265566f46faa6ff88606853
 AUX motion.confd-r1 272 BLAKE2B bb395beafecf0498158ff0358b489ab251d79e005148715ef89ea882dec945f82faec60c2650e703d4db82e0bef3ccc8abd9768adf23dc8df5161f7fd8f24714 SHA512 8a67b5b0360924e58ba3136a737ce73bb43201a49b2b6e2c632426561b830f6ab55cbbeaa89be7f1683aa8fd322b4f31b9f560e67a93eaceb964c9f56ceef363
+AUX motion.confd-r4 773 BLAKE2B 1a7f0128ec385751d75152c4a36cc2afe57a36b55cd5efe5035af3e78df775edf11568f8bae3acbf7c986b967087cb8b633724bb08bbbf24a0102a082dc5a55f SHA512 4aff16be6fd77909751b034ada9611522acb3c8de0fd160fe67c415eb54cb63a8adad055972ffc3ea7428588a6f5673bb9b311be4660c180796d6067eb3c45e5
 AUX motion.initd-r3 1163 BLAKE2B 1926b3468c1b49651377c2704fe8f5cb65c9eed5a4bd11efe365aa01b9acd5300d7dae2f22c93748c2e1c1c49be9d707ad7d1c14d49dc092f18e6ddfe0e06ac5 SHA512 7c7201768fd868f851bb35b8df5e22d43688f1729178fd94d10f21436db6d5c178811bcef8b51c5b79b426bb92d542892edd65ee0414acaa799639a3a226934e
-AUX motion.service 356 BLAKE2B 089fa555b8de569824ff7c063961d13db811cb44cdf7dacee9638a72b95c5db047f93f1387b0067ee7e61816e9af29aec8215bc76e6838a2e12b404299817175 SHA512 03f875b1e0c7051496eaa28a0af50164b20c6f7646d40ec09e1a360e81747135299fe092c91e57a28464bac826a0ace54267ceecd9abf41e63fe505d58ecf7ed
+AUX motion.initd-r4 975 BLAKE2B a9f001318783f793474ef295d5724ff207d646051783d9927b2949c5c3adf65fef11ca63071f1401cab017ba1cf676f39bb2298b848e9f57185a1875c7e4c316 SHA512 ee0b471da01f7a7bb6a19fb974ec775e5d830b4970b5a690b2ba8043bddfe79245c72546d4a41b5d3bb50adbe03b79373ecc643161b50bd88386e66ee318b9ef
+AUX motion.service 358 BLAKE2B 8f118322ec347472d1aec2d89e37335ecce594b1c0f194b3adfad3ce3d68cb5d6f4db6f2f932769e4adbc3b3c2094e1426f1d7c64d3985267a4558f549d6f4ed SHA512 b87bb9edd8d3b53e14eb0292358d05ea6c81f25c9d2b5b2208b5208ba57054dec64e1057f3bfbf5b2b490f643bd2ee497da038aad56e1274b9bf513f1366c8ca
+AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
 DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc95c6a8bd85d4bd333f66638b2e815b3c59b2e42dd93811601b2ee7870100a0a21eaa789633056f74a5cc9f39f4f92229f SHA512 3b08d464f9243ccfc4b53b16cfc2001d1e0d206bf0295d55d8914914bc14ad0248ce5ac622cb7eb89ed32e1913a9a10add1b56497c4094ba876f7f85d6ad4143
+DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 EBUILD motion-4.1.1-r1.ebuild 2147 BLAKE2B e777945ae02d5ce78163e263a57285b285a0f6f0b16ead212b35282ff9f363f44ca8ed97dcdbcfac39eb83d4ce29cae69b8dd7ac452afdb391f03583343e2367 SHA512 c2a33ccbc3c7e234084a6c1485357bd389e44f0312fbfaad91dee899248da85328a7df513bfc53aa3d6ccbfa3ba635731452984d718dfe665998416b7c9f3238
-MISC metadata.xml 450 BLAKE2B 39d7909c8d8dc5c691540bdbc0e1971e9e04131208ec74a9750dcf09e607a160d6b7beceaab9325c58ecf4c6e92da3ab3dc0ffb059d9b917bb4ccc87582a3ff7 SHA512 75ad87d6a0a305f87ac034413698fc33c3d564e580a76626d9a9867a5bc691180838e96d7198c330b75b209a014be8f836170a7cce668ab590b8ee3ceaff44e8
+EBUILD motion-4.3.1.ebuild 2857 BLAKE2B 2f96411a45c56934371879ffc3e93f719c7502d831c06e949e15d42a732476444ae2a2bcee87efb4b7177a1a8b7909ab908cf1d4aeb3cd996f1cc3dcfebd1416 SHA512 10df83a2b553e3f35e7b1f7a61827550fd2b4baa258d55b1eb72f0df518f833114e61690498dbd67c74a9a36bde66bc702b72585533138323abc865d74384f4f
+MISC metadata.xml 850 BLAKE2B b9ead6c9f74bb359c2bb282c0f6f8c33707fbd42aa458314c93bc754e2f707dc51fcfe5e0e0e2216af8435c2aa10d9e1c5885a838236b1ea274453c84f95f303 SHA512 419521643cbaefd58973bc764594ec44fdc927890c837eda0733af575073a8655e58da76f4a22467ae1d014898d828b84e9de85bb442cd9505911af1a04395b1
diff --git a/media-video/motion/files/motion.confd-r4 b/media-video/motion/files/motion.confd-r4
new file mode 100644
index 000000000000..8a200d14928c
--- /dev/null
+++ b/media-video/motion/files/motion.confd-r4
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Motion OpenRC conf.d file
+# All settings are optional
+
+# Set the user and group under which motion will be run
+#MOTION_USER="motion"
+#MOTION_GROUP="motion"
+
+#Set motion's config file:
+#MOTION_CONFIGFILE="/etc/motion/motion.conf"
+
+#Set motion's log file. Leave unset for syslog:
+#MOTION_LOGFILE="/var/log/motion/motion.log"
+
+#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
+#MOTION_LOGTYPE="9"
+
+#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
+#MOTION_LOGLEVEL="6"
+
+#Set a default dir where motion places its output
+#MOTION_DIR="/var/lib/motion"
+
+#Set the umask for the output files, for additonal security
+#MOTION_UMASK="007"
+
diff --git a/media-video/motion/files/motion.initd-r4 b/media-video/motion/files/motion.initd-r4
new file mode 100644
index 000000000000..30d5e25cb08e
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r4
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${MOTION_USER:="motion"}
+: ${MOTION_GROUP:="motion"}
+
+[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
+[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
+[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
+[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
+[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
+
+command=/usr/bin/motion
+command_user="${MOTION_USER}:${MOTION_GROUP}"
+
+start_pre() {
+  if [ "${MOTION_DIR}" ] ; then
+    mkdir -p "${MOTION_DIR}"
+    checkpath -d -o "${MOTION_USER}" "${MOTION_DIR}"
+    directory="${MOTION_DIR}"
+  fi
+  if [ "${MOTION_LOGFILE}" ] ; then
+    local LOGFILE=${MOTION_LOGFILE##*/}
+    local LOGDIR=${MOTION_LOGFILE%$LOGFILE} 
+    mkdir -p "${LOGDIR}"
+    checkpath -d -o "${MOTION_USER}" "${LOGDIR}"
+  fi
+}
+
diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service
index 559b94b6b29a..d4755bdb48ea 100644
--- a/media-video/motion/files/motion.service
+++ b/media-video/motion/files/motion.service
@@ -8,13 +8,13 @@ Type=simple
 ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
 StandardError=null
 
-User=motion
+#User=motion
 Group=video
 
 #RuntimeDirectory=motion
 #RuntimeDirectoryMode=0750
 
-WorkingDirectory=/var/lib/motion
+#WorkingDirectory=/var/lib/motion
 
 [Install]
 WantedBy=multi-user.target
diff --git a/media-video/motion/files/motion.service-r4 b/media-video/motion/files/motion.service-r4
new file mode 100644
index 000000000000..1564fb2699c4
--- /dev/null
+++ b/media-video/motion/files/motion.service-r4
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Motion OpenRC systemd service file
+
+
+[Unit]
+Description=Motion detection daemon
+After=local-fs.target network.target
+Documentation=man:motion(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
+StandardError=null
+
+User=motion
+Group=motion
+
+UMask=007
+WorkingDirectory=-/var/lib/motion
+
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index b1389a2954b4..301a7616abbe 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>hfern@fernhout.info</email>
+		<name>Hans Fernhout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="mariadb">Add mariadb database support</flag>
 		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
+		<flag name="supervise-daemon">Add experimental suppport for OpenRC's supervise-daemon process supervision</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Motion-Project/motion</remote-id>
diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
new file mode 100644
index 000000000000..efd01fca9653
--- /dev/null
+++ b/media-video/motion/motion-4.3.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
+
+RDEPEND="
+	acct-group/motion
+	acct-user/motion
+	virtual/jpeg:=
+	ffmpeg? ( media-video/ffmpeg:0= )
+	mariadb? ( dev-db/mariadb-connector-c )
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}
+	net-libs/libmicrohttpd
+	v4l? (
+		media-libs/libv4l
+		virtual/os-headers
+	)
+"
+
+# Breaks src_install(), #727056
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to setup a configuraton file (/etc/motion/motion.conf) before
+running motion for the first time.
+
+If motion is built with the mysql or mariadb use flags then please make
+sure to configure a matching database_type in the config file.
+
+Motion runs by default under user motion and group motion:
+- change this if needed in /etc/conf.d/motion
+- or add users who need access to the output files to the motion group
+
+To install motion as a service, use:
+- rc-update add motion default # with OpenRC
+- systemctl enable motion.service # with systemd
+"
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mariadb) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3) \
+		$(use_with v4l v4l2) \
+		$(use_with webp) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	# build INITDAD string cwto be added to initd based on use flags, eg
+	# "depend() {
+	#   use mysql
+	# }
+	#
+	# supervisor=supervise-daemon"
+	local INITDADJ=""
+	( use mysql || use mariadb ) && INITDADJ=" use mysql\n"
+	use postgres && INITDADJ="${INITDADJ}  use postgresql\n"
+	[ "${#INITDADJ}" -gt 0 ] && INITDADJ="depend() {\n${INITDADJ}}\n"
+	if use supervise-daemon ; then
+		INITDADJ="${INITDADJ}\nsupervisor=supervise-daemon\n"
+	else
+		INITDADJ="${INITDADJ}\npidfile=/run/\${RC_SVCNAME}.pid\ncommand_background=true\n"
+	fi
+	cp "${FILESDIR}/${PN}.initd-r4" "${T}/initd" || die
+	echo -e ${INITDADJ} >> "${T}/initd" || die
+
+	newinitd "${T}/initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	readme.gentoo_create_doc
+	readme.gentoo_print_elog
+}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 30a50037e2b7..49ffcee608b0 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -2,7 +2,7 @@ DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc
 DIST movit-1.2.0.tar.gz 534145 BLAKE2B 6409bd2d1e85e21dbce00c36152275553594f0c9d809802b5f96e8b7e56c03ccda9588631c156e34da1d54962bbdbbd03d9e78c60062bc01a04896b7fd88410f SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154
 DIST movit-1.6.1.tar.gz 870278 BLAKE2B 736b34cf4d5a9d9b59e56dc994d467ffc33e86c8bd04a8062362e76f4d7a4c973252a65258d6b29753942c0f320e778a4a1ae4484795b3129de779a51770f936 SHA512 36e425cc1bcfce9afd9124c696d95f2f6c74279161c178195d9f4d22a34acb1919aac5f51c29aa13b95d0a7343beacb41b1686fb4ad92acd136c6a25ccb4044d
 DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
-EBUILD movit-1.2.0.ebuild 750 BLAKE2B 73e786af169f9ef8cf00ff84e0de2a0ec9447eac79c99e609bbcd6b9636f54b6438bbef0d8e022f42c6e7765a824c64d45b21fcfd9c5a1d3536c566d469e8ba0 SHA512 9afdcef285b790f47358946e81a731e07f2e7d78dfc0824d162789fef4b8bb8f056b24cb16da3195f31a7e9a2a75a015238d9fcd0eeac05d9b5a871349ba062d
-EBUILD movit-1.6.1.ebuild 769 BLAKE2B 24408b89d61c5f1906b6984ab96c670247f5671b8825fc20609b1cd5779ed0575d5963b03c90ef896e38305e7f9c14daeb84ca52618681ecac457f1e9048e11b SHA512 373b280233db085556e2ee56a9c2ea1777023b61aaabb302b059487fbda491b602571b55369a3a0d28b100912595ce832681c4fd6885871b79ceb6c7a5ec1963
-EBUILD movit-1.6.2.ebuild 770 BLAKE2B d9eae27b907bb2b461227685adffd633c4f978e507ab648d8b85e10c348c7d832782169bbf419d8fcba8d2156c92ce4fcc4c9d7049d833d1af2a92272504886c SHA512 6732ddbd8bf380e59e1d7f9e0afcc1d12ab171d7738d149761a10dac690ec8e28b835ba8ee444982b9d26385b8fc07e20194d7250d284a8977a378e69d1ece3e
+EBUILD movit-1.2.0.ebuild 752 BLAKE2B de9c67e720f23eb67dc878061bf662a57d697becf1d999a9e44a5df663661562b4271c7efecaa7921e070ac82796598a6c6d9ad67f9fe1d7110d1734954d2fb3 SHA512 1c22573762ac2d6ee6a18afb2065c8d86447859073602c1dc55e9f892444914576bf8ad12e4f99db66100bf43634a58a48952f1bad124cce8600d3523972ad13
+EBUILD movit-1.6.1.ebuild 768 BLAKE2B acdb06cc0a3c57aa4e81c76c5d32ee24dbf23ae4e4e039aa8d7399fb779dd0fef70d9274a06a25a88929a8f630c37f128d3a427f337e9d422310baefdb01e63c SHA512 915970da5b8fec2d160c158de9985209d1345c0b03a3910efb66d57cd74c852600dd6a621050d1597e79d7c2cbd27027f13ac4b24060ebc2bfb558d580d8971b
+EBUILD movit-1.6.2.ebuild 772 BLAKE2B 2bac6a96d190e5f5b137d81d4f3230e8364f0d83875aa7ba453d0406ad57bb9c5e8ce9f1a69054a0dfb8525aa2204a96cc86c2be3c588a5985b582d6669148cc SHA512 85114446cb31e770c29243b42dc5b0fcb8322f39b6398d594e53bdc66ba33cf60bac459268abc62ce1a8768b9104930d662f03a5ac9cc1e8b8be21a0b7642b40
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/media-video/movit/movit-1.2.0.ebuild b/media-video/movit/movit-1.2.0.ebuild
index 0408883d3b5b..2559f5d8e549 100644
--- a/media-video/movit/movit-1.2.0.ebuild
+++ b/media-video/movit/movit-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,9 +7,9 @@ EAPI=5
 RESTRICT="test"
 
 DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
+HOMEPAGE="https://movit.sesse.net/"
 # Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
+SRC_URI="https://movit.sesse.net/${P}.tar.gz
 	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-video/movit/movit-1.6.1.ebuild b/media-video/movit/movit-1.6.1.ebuild
index 4da6285ade13..461e4f729bf1 100644
--- a/media-video/movit/movit-1.6.1.ebuild
+++ b/media-video/movit/movit-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,9 @@ inherit eutils
 RESTRICT="test"
 
 DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
+HOMEPAGE="https://movit.sesse.net/"
 # Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
+SRC_URI="https://movit.sesse.net/${P}.tar.gz
 	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index 3e85ddf5b02e..4dd215db4660 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,9 @@ inherit eutils
 RESTRICT="test"
 
 DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
+HOMEPAGE="https://movit.sesse.net/"
 # Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
+SRC_URI="https://movit.sesse.net/${P}.tar.gz
 	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index eff3eac35f74..dfa7b3da7bb0 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,10 +3,6 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
-DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
-DIST smplayer-19.10.2.tar.bz2 5178186 BLAKE2B e87efa8e433a304d4579bd852590690d23eb3cc93a50bb4aa2bfb1a4c2cbc6db63d4c8cb996b44018fb5b155d3f98104c8842d604a626fd76b39fdfa89866e91 SHA512 46327a1f988cfe8fe4e04f456057c2395f5ad011513988c1ffecf5c91cf2fdedbe8095cfba15f0f61c3e1cabc7f34b78d676bce430a79fcf542d74e14a33ec62
 DIST smplayer-20.4.2.tar.bz2 5197394 BLAKE2B fe5f3ce279be478f93a71c521070e2564df331c56c6ac9410e0707101b7e662a16cbe65b439a194d253d3c4f49ce8e735eb19ad9a195e0e1f5d42461d3162925 SHA512 03404c2e7ba00d257ab2db82fe837eb4ab314c2b32a262ad18e75b245d43f812533f7e4609a6fe335c5c2e370cfb5fac8f0b3b8917c33a22c5b84f0074039156
-EBUILD smplayer-18.6.0.ebuild 3198 BLAKE2B 9308361b80dda582ba1894bed9e47e2fd66a48be962d21fb267fa5909f1b73cc523aac8cc87f4d2ecc43be9044a18c5585be0e54da2935cd57e0336be068754b SHA512 c9f8da664cc37fdb2e7ac780f15ed87d4b6089a6c4015ad747f36e3a9ae0b96e4fd66c2ace62a15cb9b42887cd81b6f7e83dafd59b215f71117ea90e77f714a2
-EBUILD smplayer-19.10.2.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
-EBUILD smplayer-20.4.2.ebuild 3274 BLAKE2B 817e93f3ea94eb78a05597689527a1ec2181a65fc57c23e58a03df0a10de437cc973cc737536393b467406b1db27bf55fc3f8ca18606776a2f3d96a6950c35ce SHA512 fd3b0a56bbe83a954f8d2295225d60c25aaca9439ca0f9c8e868654505bc4d83ea70f7692e677089842838e3bcf2c731dbf09fcbb6961a6083228ab6f7c65002
+EBUILD smplayer-20.4.2.ebuild 3273 BLAKE2B 47bc3ac35ea98ac614e32afaa171053feb98caa4e91b0c0127f339b78daf11ad7904c041eafbc43b542768dff90fcd98470daad864f81c479e09820eeba20817 SHA512 cf6f603862f198db19ecadb815f7ae8fd88194e17fecf8518dbf6f20c601df3765706e6a3aef17cc3341de018aaf23666015e210ec3088e6104c3253a8a6c066
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-18.6.0.ebuild b/media-video/smplayer/smplayer-18.6.0.ebuild
deleted file mode 100644
index 0176daf8f1c2..000000000000
--- a/media-video/smplayer/smplayer-18.6.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.15.0[libass,X]
-			>=net-misc/youtube-dl-2014.11.26
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/smplayer/smplayer-19.10.2.ebuild b/media-video/smplayer/smplayer-19.10.2.ebuild
deleted file mode 100644
index 1863a883169d..000000000000
--- a/media-video/smplayer/smplayer-19.10.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2007-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit l10n qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-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/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass,X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "If you want URL support with media-video/mpv, please install"
-	elog "net-misc/youtube-dl."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-video/smplayer/smplayer-20.4.2.ebuild b/media-video/smplayer/smplayer-20.4.2.ebuild
index 411550ccc7d4..9152ba49d33b 100644
--- a/media-video/smplayer/smplayer-20.4.2.ebuild
+++ b/media-video/smplayer/smplayer-20.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-video/streamdeck-ui/Manifest b/media-video/streamdeck-ui/Manifest
index d140f54e6e9c..9a887f7a6a66 100644
--- a/media-video/streamdeck-ui/Manifest
+++ b/media-video/streamdeck-ui/Manifest
@@ -1,4 +1,4 @@
 DIST streamdeck-ui-0.0_p20200102.tar.gz 2512712 BLAKE2B f5abad75c77410127f51de0e4ad7ce112f59ff3652afa32f9aefe44cbb69e16a09991322091ba39d259d9bb1e35dd0833a1b58457d095f21eec258b8967ded9e SHA512 345d0a2cfadb23e20925749e06e99976d533968fffe8b6db77dfeffbb1716c4042f84e6c1c616e0986e7da3592be2046f2a6e0de1942da34b6712de70cdce649
 EBUILD streamdeck-ui-0.0_p20200102-r1.ebuild 1225 BLAKE2B d18f735ce7208c191374b724118ac558d243d77d2a7886c097a787758cb139cba8c93483cda574d2efe1d3be7cff2d09240320415fde97f0cfedf23058a1fe52 SHA512 046930d66d877326f358d81f738709b014d7ab2cfe771e95be34b9f1d312c5a0d76e272161516cf29d06c7b2b363690ef1765fba2998095a2bd9c61fd9294630
 EBUILD streamdeck-ui-9999.ebuild 1225 BLAKE2B d18f735ce7208c191374b724118ac558d243d77d2a7886c097a787758cb139cba8c93483cda574d2efe1d3be7cff2d09240320415fde97f0cfedf23058a1fe52 SHA512 046930d66d877326f358d81f738709b014d7ab2cfe771e95be34b9f1d312c5a0d76e272161516cf29d06c7b2b363690ef1765fba2998095a2bd9c61fd9294630
-MISC metadata.xml 337 BLAKE2B b3a6948c70d02d280e606193de4834cbd22ad83c611dc38a000d8fedf0e3b283bd55a67a997070b8accb4a2e8058d42e7251eff07674011ae49533dedf5dc929 SHA512 c90b856e15519e66601cce878ab0df0372f2bdb707069e34588d2d138027ab5827d697cd05637e385cbf08f29e87cc077aac85a8e5a90a8ec78decd2c96950df
+MISC metadata.xml 340 BLAKE2B 0821dca2b83a5da9b0d87daaa2b3e835439a508a41eaf2adf173a3cca666fa4fa1b49ba0d571f0193c09004ef7fe42565ed75e29946ea08b2a8a5e2bd0835911 SHA512 2d31fac58ef66d6634c562565fa0d17b1c565b3c96fa75f98f86250ea206b7a98856e34ae4915087d6441c3efcd10e9775181b5609aafe5772dd2a863e88d2ea
diff --git a/media-video/streamdeck-ui/metadata.xml b/media-video/streamdeck-ui/metadata.xml
index 64951f439f8a..80b33db65cbe 100644
--- a/media-video/streamdeck-ui/metadata.xml
+++ b/media-video/streamdeck-ui/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sidhayn@gmail.com</email>
+		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
 	<upstream>
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 4e51e48df724..5a099e0bfb54 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -11,5 +11,5 @@ AUX ushare.init.d 2050 BLAKE2B d0a71f1c5db918887b549847471455ae1d4e78b5a08db937e
 AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7fea5dd34a69e58a993fbafb43ab3b7feab474cdd736c6978d8cd149f919b758dc972e33508918376a SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98
 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15
 DIST ushare-1.1a.tar.bz2 65864 BLAKE2B 2a6d6922ee46c96d89a6f9a3238a1cded04194c4e7b80432e87a1c2344dcbf36484959d4601a7da8dc599531334b15a0547fc571af72630f25562e07a4116ea9 SHA512 2144ef96e58960d4d11bcefcd857c7eb7adab8df4ff815772d3b9d668f9f9daa1312707eb00a770c461b2a316e094e6697a004723ea02e86ee872fbe60b4797c
-EBUILD ushare-1.1a-r9.ebuild 1676 BLAKE2B 917b6409d215b26c0e5d09ef9869d8791b70f6b979fa46aa126e1b2ba87411ad782b4cb14f2a3249c76e97f096c951e86b9e6814624e9b0c29e622126f999d3d SHA512 afd5a6c2f40ac6668577a21c8e78d92858eed332b245c98cc177d6f10af09d2b5048b942480b7158bff68797fa50f3eafe5b376b2591a07ca89e4432af54d037
+EBUILD ushare-1.1a-r9.ebuild 1678 BLAKE2B 30730ff60210edfae2c31b7d8faa4d5e4e01be677574074b495bf3d1615ab75f50505cdb74e57993917cbc6658eb87cd51e9cb2ecbf66fe1b72a317853ac5346 SHA512 c3649b1a3e4c0d8364a6b998e5579c78f1746099dc516fc6c4453f32f92c4939b3eb4ec4d0e4c5fc3f46903bd2ff2916601b8a3fe92746efaf5b7264a0b673e3
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/ushare/ushare-1.1a-r9.ebuild b/media-video/ushare/ushare-1.1a-r9.ebuild
index cc9171b8ad97..263068d6c15f 100644
--- a/media-video/ushare/ushare-1.1a-r9.ebuild
+++ b/media-video/ushare/ushare-1.1a-r9.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils multilib readme.gentoo toolchain-funcs user systemd
 
 DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
-HOMEPAGE="http://ushare.geexbox.org/"
-SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
+HOMEPAGE="https://ushare.geexbox.org/"
+SRC_URI="https://ushare.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/v4l2loopback/Manifest b/media-video/v4l2loopback/Manifest
index 01ad9f2caf75..df56c491bf02 100644
--- a/media-video/v4l2loopback/Manifest
+++ b/media-video/v4l2loopback/Manifest
@@ -1,6 +1,8 @@
 DIST v4l2loopback-0.12.0.tar.gz 48723 BLAKE2B 6d62b7839889f43422623e1cfc52142846e796ca184b567906ab950642012a5c581ac656d3e4a71d806786e7ff347298f1f7aabba33743508ba388beb590c03f SHA512 e951fcc2b0a55ec5cd9812c2c26c0cab6e37b99bbb5b8512e28c67b3c59e981b776cb3285a0275f027dbddc010855f12134b9f3fa92f20e19e4de713f77289a1
 DIST v4l2loopback-0.12.1.1_pre.tar.gz 49060 BLAKE2B 6caa3d8fed14beea599d05a18ea0cbcc2e1522fb32dcf80b35d1de057a8a2ea4239da2f123acf9969f571d32e6696fa8d12b81c877ca5b1aa31d84b6ab5c27da SHA512 0d2af7fa86d0730d227f067dc53c281817eea327f707fea2b60386afde39ff094dd8197f39fb140685e4e3024f0730f3e5185dea3da5224195e4cb50faa846b6
+DIST v4l2loopback-0.12.5.tar.gz 51484 BLAKE2B 5ae2decce3bbd1fd06592dd283f06796c02beeab066c7f1e16e6a72f8074a765ad6b1a017879095c3058852168f58fe27dedbcb32d3eb9f4097e02823f264ec8 SHA512 5545e83d95ec63a7d984641fc354c9146b4cf3bd7695d47606206ec43e45f63b099d1667491dc97295bc0f3fb16387f80ba8c12ce6d63608e8774c5c7fdf4168
 EBUILD v4l2loopback-0.12.0.ebuild 1146 BLAKE2B feffacf81094b0f3c44684b83647cfcd89a0da3c36e5e97cd64ba0b51fc87da6c1f057ccb3b30b73a4c41d06aabd42198ab8911b7390d6065a74c1a6425e5532 SHA512 5f37991d56c3a1a9f80c30e61c40eaf09455387bffae0ddcec57d0c100d6dea68d4ed329bb7373b6f140791a5f27fbe7cc27f752e3cb4333e360835c8bfa67a2
 EBUILD v4l2loopback-0.12.1.1_pre.ebuild 1222 BLAKE2B 5888ac3afee857552fd1f346b1afc47c580800a27298b27bfea4734662937b2b243b40bac0bf75f73abc8d5cca289eccae2387746912ed497731e68d1a2acc11 SHA512 ef697aee7dcd44a5b25a794dcf5b6d7254c56488b6e639c85156275da80db0d880e6b2e1205cc895959111c7536045823b81703d696058a57c5d175e4b7c9a74
-EBUILD v4l2loopback-9999.ebuild 1146 BLAKE2B feffacf81094b0f3c44684b83647cfcd89a0da3c36e5e97cd64ba0b51fc87da6c1f057ccb3b30b73a4c41d06aabd42198ab8911b7390d6065a74c1a6425e5532 SHA512 5f37991d56c3a1a9f80c30e61c40eaf09455387bffae0ddcec57d0c100d6dea68d4ed329bb7373b6f140791a5f27fbe7cc27f752e3cb4333e360835c8bfa67a2
-MISC metadata.xml 409 BLAKE2B 4984f700c73efd018324e1ad5439c39f495bb91ccbdc26235f47aeef0806ce641353db485b234d35e6c316807b41c0b0b3baa9496773d5d758eb3c257750952d SHA512 49c5467e89452ca7499d6653dd519a5aff28f80a1b50c26e1332ee1f5ee24b6dbd87af5089da443d0e30571e9e7a72befcf1bbfc561d6503f84b9148084ce851
+EBUILD v4l2loopback-0.12.5.ebuild 1145 BLAKE2B 1536a4c9693ec8b0692a5863bc9ff790fe04da002db12733e796311e3a25b99e87eb941ab1060f7267f3fcb6b0fbb6f3b5cb7616af1f7caa1c539329812995c6 SHA512 358757adfd4d819a24edf2cabadc085a6d9c4fe9ce8e6a67be8235b4bbb6a9fdc352f87ce7357c6f1627f3a72f424243f7d83930dbcbc36dfb517c85e8ee5cc3
+EBUILD v4l2loopback-9999.ebuild 1145 BLAKE2B 1536a4c9693ec8b0692a5863bc9ff790fe04da002db12733e796311e3a25b99e87eb941ab1060f7267f3fcb6b0fbb6f3b5cb7616af1f7caa1c539329812995c6 SHA512 358757adfd4d819a24edf2cabadc085a6d9c4fe9ce8e6a67be8235b4bbb6a9fdc352f87ce7357c6f1627f3a72f424243f7d83930dbcbc36dfb517c85e8ee5cc3
+MISC metadata.xml 349 BLAKE2B 3d01fef9c5aea0fb59b4f4d1fc1b87f9eec504e8823dce691388a14cc6bda469ccfb813445f33478ef5ac0b17af8c6015919e7457f7311dbe622307a578b043b SHA512 989fa5ebbafd0fed16313d326e595a7f19032e164062b2a441a536666c85c01533ad8b34c7676e539308388116742a1da1403989a8df3ceef2b9cf1a19eb3a6d
diff --git a/media-video/v4l2loopback/metadata.xml b/media-video/v4l2loopback/metadata.xml
index 04c233e404cb..ee641349e08f 100644
--- a/media-video/v4l2loopback/metadata.xml
+++ b/media-video/v4l2loopback/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>grknight@gentoo.org</email>
-		<name>Brian Evans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">umlaeute/v4l2loopback</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">umlaeute/v4l2loopback</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-video/v4l2loopback/v4l2loopback-0.12.5.ebuild b/media-video/v4l2loopback/v4l2loopback-0.12.5.ebuild
new file mode 100644
index 000000000000..2b3e48ff0fc8
--- /dev/null
+++ b/media-video/v4l2loopback/v4l2loopback-0.12.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+case ${PV} in
+9999)
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/umlaeute/v4l2loopback.git"
+	;;
+*)
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/umlaeute/v4l2loopback/tarball/v${PV} -> ${P}.tar.gz"
+	;;
+esac
+
+DESCRIPTION="v4l2 loopback device which output is it's own input"
+HOMEPAGE="https://github.com/umlaeute/v4l2loopback"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+
+CONFIG_CHECK="VIDEO_DEV"
+MODULE_NAMES="v4l2loopback(video:)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	export KERNELRELEASE=${KV_FULL}
+}
+
+src_prepare() {
+	default
+	sed -i -e 's/gcc /$(CC) /' examples/Makefile || die
+}
+
+src_compile() {
+	linux-mod_src_compile
+	if use examples; then
+		emake CC=$(tc-getCC) -C examples
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dosbin utils/v4l2loopback-ctl
+	dodoc doc/kernel_debugging.txt
+	dodoc doc/docs.txt
+	if use examples; then
+		dosbin examples/yuv4mpeg_to_v4l2
+		docinto examples
+		dodoc examples/{*.sh,*.c,Makefile}
+	fi
+}
diff --git a/media-video/v4l2loopback/v4l2loopback-9999.ebuild b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
index c2f92d34a0f1..2b3e48ff0fc8 100644
--- a/media-video/v4l2loopback/v4l2loopback-9999.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit linux-mod toolchain-funcs
 
@@ -9,7 +9,7 @@ case ${PV} in
 9999)
 	inherit git-r3
 	KEYWORDS=""
-	EGIT_REPO_URI="git://github.com/umlaeute/v4l2loopback.git"
+	EGIT_REPO_URI="https://github.com/umlaeute/v4l2loopback.git"
 	;;
 *)
 	inherit vcs-snapshot
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index acf096566cec..901c75a757f9 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 47caad3feb70..cf9bcf099dbe 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jun 2020 16:38:11 +0000
+Thu, 04 Jun 2020 09:38:19 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 66a239319a92..277421bde7e3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 465570 BLAKE2B a62e99817e32fd8ff7f82db3f63ecd455d8d078254d12926bca9349cd7d4cb7525d19b5ca213653d7ca3a28e5f51b7e4f978944f6a7c39fec3994650ada13ff2 SHA512 ee24891578ae08c29634185ea42adbf62dff9fd502bd411c413a0b0088f0d305dd4dba72180ac6793f6d434a7cc1a30d883831d3d40443eae468994ac283a7ef
-TIMESTAMP 2020-06-01T16:38:14Z
+TIMESTAMP 2020-06-04T09:38:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7VLvZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7YwQ9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCOuA/+I3KH4wVC7WS/wAMyt3+KiZy3kb9hM+2XjnzAEzhPOlopbhRclkWKj9ZT
-qgUmBHsyADhJqVZsSJR7snaUDzFKP/I4py+3yRfiz9Nu369qy/H2SJQPm7RlqRob
-hg6zb+B6CjgOXNeQCLeXEav1qri5U061/TYR0DZOWtGFq88lxvGlGub8nZ6SDmC6
-0ek429YCmk61qUVzGStK0Tilr1+ywBA7w5VVCGWtCwtp7pPTv6ADjQAey/XrOxD5
-TxK61pvlG4pH1MfuaHepGtl0kqax4MpypxyPm7GDsVHs/MfAjBV5Q3dBLNqAhM6I
-Tf/boLteHI51PoRICHKL8+oK1uTUqPf6gQXnjvQxcVzuq3TKDs7XTHm6d2IEfbpH
-lH42OWdxJu9gxthojuz6IiuLh/XEdc47g3fgB4oL+N31OctOZL67BhCRsqf2qZRa
-8nW/G3xyDZapN3vD80fAvhsjb+6VAu+OkifKmKPM9ib7g7AfpcVUxwtDltauP0QX
-d75VNSXqTeCvklrVECYKbEdgCNU3PTu7gcQWAbEpEfHzC0RpGckguns2OB8KogFp
-/9KaJ0YI75MhLmQkgYonJF01D8tWIfbaPSGBo6f4RxKHQrhgwqShYBnPGrSMyuUd
-xxAU5dwWXmd970ptC1/WxtDj1ZNsAn++1ray2shA3gWQ+DJyjf8=
-=BLc0
+klB0IQ//XtF0T4Cj34MomVg/mYvuxl6cJor1pxWp5itPs03pQyrt2g6/M6KSbTXs
+8mtxEUGhvPUzeq6X5wtjM8x6gU39JuicbYFO3o8b4Cun7Rce37Ue2VCdiQYOUTg/
+NEfnmvK5/384OhzsbPfbzEampLxBRny2V4cZ9RK3azuGRB0UYWq2/CCrkl2075wf
+jXPaYgEkh66a3o2O+0z8c0E0DTOhKIPrMIKKlC1qNmBCDQ0AlUAMQkYdBdOckTJi
+opoAl2AW7yB0hQPP8dl3LXwnCJAkaumgFS1K7p4nyU2/FjLtKJkBE7mlz2UWbijX
+r1aheE5ONRt3nx+gM5ABF5GV1DdpC6TWN+j7MxDkwKMwJx+uq59KDFlpogb2BKi3
+C/tHLOkcZhLnf99j1CbGFXJ5dfNMAwZ8O7TbblG0Q1osJMzEA9xKlzo92/jsukfc
+jTZZADUfwc+0lNCFMGLfLSMtxArLNSbjHOSQWe58dsDqvFaZRaJCBQmYODntkpm9
+9I2uY+XHzEpIvC02KWwTgnjJvbVENbssGAdDGA17CkMl7g5lZF6ph5f1gc42vSXk
+3nrOkWQp2MCUe4WCwrMGSvmNZ5NKvtWnl3NSwaiTFea2A8wtAYj0FXwklrAdLEgX
++zUHJ0bASJjD0mMUwtcq8e5qlD42l6YYkdIBEiaVApBBqVVrzkA=
+=DZ79
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 47caad3feb70..43337e71d4f0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jun 2020 16:38:11 +0000
+Thu, 04 Jun 2020 09:38:20 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1414c0f0c2d0..625fd8fe337a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 9538a08b9860..0440d16433ad 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/motion-0 b/metadata/md5-cache/acct-group/motion-0
new file mode 100644
index 000000000000..961000b8401c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/motion-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: motion
+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_=3830275cd7a4c71ee27217edea3bc413
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 18fbbaf2f85f..5deacd1b4fc6 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/motion-0 b/metadata/md5-cache/acct-user/motion-0
new file mode 100644
index 000000000000..7415b57cfdcf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/motion-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=added by portage for motion, a software motion detector
+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/motion acct-group/video
+SLOT=0
+_eclasses_=acct-user	4c04090a102bda57f50a5e6e4f8bd973	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9a6a7905a6682b51b9984aa63c558b09
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index fc950cbc427a..1b161ea1d8ed 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
index aaff4cfd09d8..313e9af18ca7 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
@@ -5,11 +5,11 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.33.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(-)?] >=app-accessibility/at-spi2-core-2.33.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98ea68887508a386c605bcf63d2219bb
+_md5_=95c92b3233f5959da05830141533c00e
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0
index 039361e1bf1e..79129a051144 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0
@@ -5,11 +5,11 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.34/at-spi2-core-2.34.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9917e2c4712fe44854c6b1a63bcbe28b
+_md5_=23ab0f28831898fd11cada4cca9b46da
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index fb3a5e283e04..5b6e1998f519 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.4 b/metadata/md5-cache/app-admin/clsync-0.4.4
index 2691c3fe5356..3b4bd32700c7 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.4
+++ b/metadata/md5-cache/app-admin/clsync-0.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Live sync tool based on inotify, written in GNU C
 EAPI=7
 HOMEPAGE=https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync
 IUSE=+caps cluster control-socket cgroups debug extra-debug extra-hardened gio hardened +highload-locks +inotify mhash namespaces seccomp kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) mhash? ( app-crypt/mhash ) ~app-doc/clsync-docs-0.4.4
 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	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ef0c6bf42b9f6a13e7962ac685563869
+_md5_=15b24335a5ecfbc91c1d934ac8aabcf5
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0-r2 b/metadata/md5-cache/app-admin/denyhosts-3.0-r2
new file mode 100644
index 000000000000..2b77273ef6b1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0-r2
@@ -0,0 +1,14 @@
+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(-)] virtual/pkgconfig
+DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
+EAPI=6
+HOMEPAGE=https://github.com/denyhosts/denyhosts
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1dd37276214c70ad5ee8fe92506a7597
diff --git a/metadata/md5-cache/app-admin/puppet-6.14.0 b/metadata/md5-cache/app-admin/puppet-6.14.0
deleted file mode 100644
index 0b11f8a8244e..000000000000
--- a/metadata/md5-cache/app-admin/puppet-6.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24(-)] dev-ruby/json:=[ruby_targets_ruby24(-)] dev-ruby/semantic_puppet[ruby_targets_ruby24(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24(-)] ) virtual/ruby-ssl[ruby_targets_ruby24(-)] dev-ruby/hocon[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby24(-)] dev-ruby/rack[ruby_targets_ruby24(-)] dev-ruby/rspec-its[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[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/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24(-)] dev-ruby/json:=[ruby_targets_ruby24(-)] dev-ruby/semantic_puppet[ruby_targets_ruby24(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24(-)] ) virtual/ruby-ssl[ruby_targets_ruby24(-)] dev-ruby/hocon[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24(-)] dev-ruby/json:=[ruby_targets_ruby24(-)] dev-ruby/semantic_puppet[ruby_targets_ruby24(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24(-)] ) virtual/ruby-ssl[ruby_targets_ruby24(-)] dev-ruby/hocon[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet 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 )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.14.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b4ab026ca1101e238be6e8e15daf799
diff --git a/metadata/md5-cache/app-admin/puppet-6.15.0 b/metadata/md5-cache/app-admin/puppet-6.15.0
index 970c7500c583..4faa4257adc9 100644
--- a/metadata/md5-cache/app-admin/puppet-6.15.0
+++ b/metadata/md5-cache/app-admin/puppet-6.15.0
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24(-)] dev-ruby/json:=[ruby_targets_ruby24(-)] dev-ruby/semantic_puppet[ruby_targets_ruby24(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24(-)] ) virtual/ruby-ssl[ruby_targets_ruby24(-)] dev-ruby/hocon[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24(-)] dev-ruby/json:=[ruby_targets_ruby24(-)] dev-ruby/semantic_puppet[ruby_targets_ruby24(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24(-)] ) virtual/ruby-ssl[ruby_targets_ruby24(-)] dev-ruby/hocon[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet 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(-)] )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.15.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37eb3f16f2eec3064d96a6645ceda5b4
+_md5_=5b4ab026ca1101e238be6e8e15daf799
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 2b7eaaee24da..541da7af9069 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.15.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.15.0
@@ -5,11 +5,11 @@ DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.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	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=922d8a0aa430ad524d8522106168eb28
+_md5_=0f8a4e7bbef2a39a6f64cbe7dbab22ff
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.14.0 b/metadata/md5-cache/app-admin/puppet-agent-6.16.0
similarity index 71%
rename from metadata/md5-cache/app-admin/puppet-agent-6.14.0
rename to metadata/md5-cache/app-admin/puppet-agent-6.16.0
index 866102b9510f..e60a2f52c6b0 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.14.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.16.0
@@ -5,11 +5,11 @@ DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
+RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
 RESTRICT=strip
 SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.14.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.14.0-1stretch_i386.deb )
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.16.0-1focal_amd64.deb
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=0f8a4e7bbef2a39a6f64cbe7dbab22ff
+_md5_=580192e6da8d2dfad0802d18a9de6113
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.10.0 b/metadata/md5-cache/app-admin/puppetdb-6.10.0
index 98959300830f..59d23886b6c5 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.10.0
+++ b/metadata/md5-cache/app-admin/puppetdb-6.10.0
@@ -4,10 +4,10 @@ DEPEND=acct-user/puppetdb acct-group/puppetdb
 DESCRIPTION=PuppetDB collects data generated by Puppet.
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.10.0.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4776119ce214f1fe4704f8096506d5ba
+_md5_=117bfa6795d547838c5fb6d5afb2a673
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.9.1 b/metadata/md5-cache/app-admin/puppetdb-6.9.1
deleted file mode 100644
index 6a0002bb6068..000000000000
--- a/metadata/md5-cache/app-admin/puppetdb-6.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppetdb acct-group/puppetdb
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.9.1.tar.gz
-_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=117bfa6795d547838c5fb6d5afb2a673
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.11.0 b/metadata/md5-cache/app-admin/puppetserver-6.11.0
index ba09968cfa59..cc867d7b7f1b 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.11.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.11.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.11.0.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ae75e2a4bcc0d9f18d84adea9b3a8ff8
+_md5_=877c34d1e198cd2d10b7bd42ea575f3b
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.9.1-r1 b/metadata/md5-cache/app-admin/puppetserver-6.9.1-r1
deleted file mode 100644
index 601a3ce41203..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-6.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppet acct-group/puppet
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.9.1.tar.gz
-_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=877c34d1e198cd2d10b7bd42ea575f3b
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index d43cfa67f5fe..bb228c18d2a0 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.03 b/metadata/md5-cache/app-antivirus/clamtk-6.03
index 3e993356020e..4c9d255aed5f 100644
--- a/metadata/md5-cache/app-antivirus/clamtk-6.03
+++ b/metadata/md5-cache/app-antivirus/clamtk-6.03
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical front-end for ClamAV
 EAPI=7
 HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
 IUSE=kde nautilus nemo +nls thunar +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/nautilus-python[python_single_target_python2_7(-)?] )
 REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.03.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.03.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4a1365f53e1d1a692e9bed1947b3b3e
+_md5_=8f6366962e258df01d730e14453d47ef
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 515b4bb3cb41..36c32924bca6 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/gcab-1.4 b/metadata/md5-cache/app-arch/gcab-1.4
index e33725c8e268..9e6cfbd25dec 100644
--- a/metadata/md5-cache/app-arch/gcab-1.4
+++ b/metadata/md5-cache/app-arch/gcab-1.4
@@ -5,7 +5,7 @@ DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/msitools
 IUSE=gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.4/gcab-1.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95c6757a9b6d9892d2d32ad5cef57c35
+_md5_=76b2883377c44471b8fca93605036f98
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 297ef147e9ba..7822d8ba94fe 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.4-r3 b/metadata/md5-cache/app-backup/bacula-9.4.4-r3
new file mode 100644
index 000000000000..e784b9676b4f
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.4.4-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=6
+HOMEPAGE=https://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.4.4.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=3d5d9c27a5ae7e690bcfe1eae07c7249
diff --git a/metadata/md5-cache/app-backup/bacula-9.6.3-r1 b/metadata/md5-cache/app-backup/bacula-9.6.3-r1
new file mode 100644
index 000000000000..165c725883fa
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.6.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=6
+HOMEPAGE=https://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.6.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=6e6825c064370d061f4f60151e202aa4
diff --git a/metadata/md5-cache/app-backup/dar-2.6.10 b/metadata/md5-cache/app-backup/dar-2.6.10
new file mode 100644
index 000000000000..0bfc0972f71c
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.6.10
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=7
+HOMEPAGE=http://dar.linux.free.fr/
+IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.6.10.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=0fc7c37269931e83c8f40799f06cf488
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.09-r1 b/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
deleted file mode 100644
index 37c1564045da..000000000000
--- a/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
+++ /dev/null
@@ -1,16 +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 postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=7
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] s3? ( dev-python/boto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.09/+download/duplicity-0.8.09.tar.gz
-_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=53f9785ddf31a0862d9fc8869173e670
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.11.1596 b/metadata/md5-cache/app-backup/duplicity-0.8.11.1596
deleted file mode 100644
index a2f8fb240b84..000000000000
--- a/metadata/md5-cache/app-backup/duplicity-0.8.11.1596
+++ /dev/null
@@ -1,16 +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 postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=7
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] s3? ( dev-python/boto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.11/+download/duplicity-0.8.11.1596.tar.gz
-_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0a2a2173c7617f8e25431d8768af6501
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.12.1612 b/metadata/md5-cache/app-backup/duplicity-0.8.12.1612
deleted file mode 100644
index a01cd65006ee..000000000000
--- a/metadata/md5-cache/app-backup/duplicity-0.8.12.1612
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=7
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] s3? ( dev-python/boto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.12/+download/duplicity-0.8.12.1612.tar.gz
-_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1f168a9e2efe834cac094fb37f9d4ddd
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.11.1596-r1 b/metadata/md5-cache/app-backup/duplicity-0.8.13
similarity index 93%
rename from metadata/md5-cache/app-backup/duplicity-0.8.11.1596-r1
rename to metadata/md5-cache/app-backup/duplicity-0.8.13
index c27b7bdc94c5..1bcc05503cef 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.11.1596-r1
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.13
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Secure backup system using gnupg to encrypt data
 EAPI=7
-HOMEPAGE=http://www.nongnu.org/duplicity/
+HOMEPAGE=https://www.nongnu.org/duplicity/
 IUSE=s3 test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3
@@ -11,6 +11,6 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.11/+download/duplicity-0.8.11.1596.tar.gz
+SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.13/+download/duplicity-0.8.13.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1f168a9e2efe834cac094fb37f9d4ddd
+_md5_=4fc2259a422d5115f7929dc59e7adbb8
diff --git a/metadata/md5-cache/app-backup/kup-0.8.0 b/metadata/md5-cache/app-backup/kup-0.8.0
new file mode 100644
index 000000000000..dcef1dc522b9
--- /dev/null
+++ b/metadata/md5-cache/app-backup/kup-0.8.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgit2:= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/kinit:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/plasma:5 kde-frameworks/solid:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Backup scheduler for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://www.linux-apps.com/p/1127689
+IUSE=debug +handbook
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libgit2:= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/kinit:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/plasma:5 kde-frameworks/solid:5 dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 net-misc/rsync || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kup/kup-0.8.0.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6ff6ced050ea6a46d9adde0585f5312
diff --git a/metadata/md5-cache/app-backup/rdedup-1.0.2 b/metadata/md5-cache/app-backup/rdedup-1.0.2
index 0e9e2df01242..31ffb6f413c5 100644
--- a/metadata/md5-cache/app-backup/rdedup-1.0.2
+++ b/metadata/md5-cache/app-backup/rdedup-1.0.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0 Unlicense
 RDEPEND=>=dev-libs/libsodium-1.0.11:=
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/fs2/0.2.5/download -> fs2-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.20/download -> libc-0.2.20.crate https://crates.io/api/v1/crates/libsodium-sys/0.0.12/download -> libsodium-sys-0.0.12.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rollsum/0.2.1/download -> rollsum-0.2.1.crate https://crates.io/api/v1/crates/rpassword/0.2.3/download -> rpassword-0.2.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/serde/0.7.15/download -> serde-0.7.15.crate https://crates.io/api/v1/crates/sodiumoxide/0.0.12/download -> sodiumoxide-0.0.12.crate https://crates.io/api/v1/crates/termios/0.2.2/download -> termios-0.2.2.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.36/download -> time-0.1.36.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/rdedup/1.0.2/download -> rdedup-1.0.2.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.16/download -> redox_syscall-0.1.16.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=28eeef711827c48dcc855b2a969ad6ef
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.9 b/metadata/md5-cache/app-backup/snapper-0.8.9-r1
similarity index 87%
rename from metadata/md5-cache/app-backup/snapper-0.8.9
rename to metadata/md5-cache/app-backup/snapper-0.8.9-r1
index 08de09705c1c..a2945f18c732 100644
--- a/metadata/md5-cache/app-backup/snapper-0.8.9
+++ b/metadata/md5-cache/app-backup/snapper-0.8.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
+DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Command-line program for btrfs and lvm snapshot management
 EAPI=7
 HOMEPAGE=http://snapper.io/
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl s
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.8.9.tar.gz -> snapper-0.8.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=162aefc836ad0992407d5574569afdd9
+_md5_=7083f61656c559ae206906e56a279a2c
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e8bbaae73ec4..a21e78185a15 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-1.5.0 b/metadata/md5-cache/app-crypt/acme-1.5.0
new file mode 100644
index 000000000000..0014dbc2eefb
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.5.0.tar.gz -> certbot-1.5.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=d64277656328b941925c506153a0e9a2
diff --git a/metadata/md5-cache/app-crypt/certbot-1.5.0 b/metadata/md5-cache/app-crypt/certbot-1.5.0
new file mode 100644
index 000000000000..fb7a60eb5428
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( 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(-)] >=app-crypt/acme-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/configargparse-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/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.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/distro-1.0.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/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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[python_targets_python3_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=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/acme-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/configargparse-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/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.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/distro-1.0.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/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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://github.com/certbot/certbot/archive/v1.5.0.tar.gz -> certbot-1.5.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=1e838c04476b85dea6cf5f13fe90c7fb
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index fed7bb83b8b8..e61765195c12 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( 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(-)] >=app-crypt/acme-0.40.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.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/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.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/distro-1.0.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/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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/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(-)] >=app-crypt/acme-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/configargparse-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/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.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/distro-1.0.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/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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
 DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-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(-)] >=app-crypt/acme-0.40.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.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/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.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/distro-1.0.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/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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=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(-)] >=app-crypt/acme-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/configargparse-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/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.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/distro-1.0.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/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5cc6686189d5f67e694b384a730e9853
+_md5_=1e838c04476b85dea6cf5f13fe90c7fb
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.5.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.5.0
new file mode 100644
index 000000000000..7f232c9fe6f7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.5.0.tar.gz -> certbot-1.5.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=b59361e3e884903f4be8d52faa915adf
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
new file mode 100644
index 000000000000..16cde272ffdd
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.5.0.tar.gz -> certbot-1.5.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=0ce3c1c6501e6a386e1a10f433e7699b
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.1 b/metadata/md5-cache/app-crypt/nitrocli-0.3.1
index 756a323da20b..38d89c3209d5 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.1
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.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/getrandom/0.1.13/download -> getrandom-0.1.13.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/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nitrocli/0.3.1/download -> nitrocli-0.3.1.crate https://crates.io/api/v1/crates/nitrokey/0.4.0/download -> nitrokey-0.4.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/syn/1.0.13/download -> syn-1.0.13.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=8e37ec93a6c368e2f59d9be5db0ebffa
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.2 b/metadata/md5-cache/app-crypt/nitrocli-0.3.2
index 888575601ea2..7ac45fbc271d 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.2
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.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.48/download -> cc-1.0.48.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/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/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nitrocli/0.3.2/download -> nitrocli-0.3.2.crate https://crates.io/api/v1/crates/nitrokey/0.6.0/download -> nitrokey-0.6.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.12/download -> proc-macro-error-0.4.12.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.12/download -> proc-macro-error-attr-0.4.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/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/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=fd64a9cc9ffbba95be9f2f5dffa5d1a3
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.3 b/metadata/md5-cache/app-crypt/nitrocli-0.3.3
index 18a2c6e7a081..62efdc9c47c7 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.3
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.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.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nitrocli/0.3.3/download -> nitrocli-0.3.3.crate https://crates.io/api/v1/crates/nitrokey/0.6.0/download -> nitrokey-0.6.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.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/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/structopt/0.3.13/download -> structopt-0.3.13.crate https://crates.io/api/v1/crates/structopt-derive/0.4.6/download -> structopt-derive-0.4.6.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/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/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=bde98e784a296cef74fb90824c297494
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3 b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
index f1781d8103c9..81051e44b64c 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=7
 HOMEPAGE=https://gnupg.org/aegypten2/index.html
 IUSE=caps emacs gnome-keyring fltk gtk ncurses qt5 static
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) fltk? ( x11-libs/fltk ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=6ddd82c0d9ff3f5597a20f702bfa4960
+_md5_=02922a2180f38db205056ed2c659c944
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 9ae0536e1834..65c285465c25 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1 b/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
index a2c329983f11..54c1c0112ec7 100644
--- a/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
+++ b/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=French dictionaries for myspell/hunspell
 EAPI=6
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/dictionnaires-francais
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/dictionnaires-francais
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~x86-macos
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-moderne-v4.5.oxt http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-v4.5.oxt http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-reforme1990-v4.5.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-moderne-v4.5.oxt https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-v4.5.oxt https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-reforme1990-v4.5.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=1ca06f6ce510398f7198b4c4a903ab07
+_md5_=3e00f0df403d715d42a1d39ff906980a
diff --git a/metadata/md5-cache/app-dicts/myspell-id-2.0 b/metadata/md5-cache/app-dicts/myspell-id-2.0
index 20995ad0c42f..68ac96b32f13 100644
--- a/metadata/md5-cache/app-dicts/myspell-id-2.0
+++ b/metadata/md5-cache/app-dicts/myspell-id-2.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Indonesian dictionaries for myspell/hunspell
 EAPI=6
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/2.0/id_id.oxt -> myspell-id-2.0.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/2.0/id_id.oxt -> myspell-id-2.0.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=0f240acb8808c06df1b8c84ed81c5be2
+_md5_=9df07e01423a147a285c93d0b1c30a8e
diff --git a/metadata/md5-cache/app-dicts/myspell-is-2012.09.01 b/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
index b48e4ad88950..2283d6637cd1 100644
--- a/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
+++ b/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Icelandic dictionaries for myspell/hunspell
 EAPI=6
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/2012.09.01/hunspell-is-2012.09.01.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/2012.09.01/hunspell-is-2012.09.01.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=9e70bdcf7e9d82cf9c7ad2fb53752600
+_md5_=3bf267fe6ceacf00e69babfa78250c4a
diff --git a/metadata/md5-cache/app-dicts/myspell-km-1.6 b/metadata/md5-cache/app-dicts/myspell-km-1.6
index 5cefc50c2c91..c11eea777b7f 100644
--- a/metadata/md5-cache/app-dicts/myspell-km-1.6
+++ b/metadata/md5-cache/app-dicts/myspell-km-1.6
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Khmer dictionaries for myspell/hunspell
 EAPI=6
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/1.6/sbbic-khmer-spelling-checker-1.6.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/1.6/sbbic-khmer-spelling-checker-1.6.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=bd9a7368447ddfc311a75abb1ef90837
+_md5_=73c5f8e6bf7c051abb514e1f302c67ef
diff --git a/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04 b/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
index 44c33cd6bb9f..b67db82e52ee 100644
--- a/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
+++ b/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Slovenian dictionaries for myspell/hunspell
 EAPI=6
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3 LGPL-2.1
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/2012.01.04/pack-sl.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/2012.01.04/pack-sl.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=b4414dc2989bbacd226a3e5a26a35113
+_md5_=a900b075ae347735587a69b116cff1a8
diff --git a/metadata/md5-cache/app-dicts/myspell-sv-2.14 b/metadata/md5-cache/app-dicts/myspell-sv-2.14
index 8a683de84999..3fb6bbfecd35 100644
--- a/metadata/md5-cache/app-dicts/myspell-sv-2.14
+++ b/metadata/md5-cache/app-dicts/myspell-sv-2.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Swedish dictionaries for myspell/hunspell
 EAPI=5
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan http://extensions.libreoffice.org/extension-center/swedish-hyphenation http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan https://extensions.libreoffice.org/extension-center/swedish-hyphenation https://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=CC-BY-SA-3.0 GPL-2 LGPL-3
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/2.14/ooo_swedish_dict_2.14.oxt http://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> myspell-sv-2.14-hyph.oxt http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> myspell-sv-2.14-thes.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/2.14/ooo_swedish_dict_2.14.oxt https://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> myspell-sv-2.14-hyph.oxt https://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> myspell-sv-2.14-thes.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=01ec06ab80d6d0c20444b437c0edc58f
+_md5_=5fdbf5b4f1ab818adb6306d0021f3341
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-1.6.5 b/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
index 0bbc4c29d460..c88a9dc2a9dc 100644
--- a/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
+++ b/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
 EAPI=6
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3 LGPL-2.1 MPL-1.1
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/1.6.5/dict-uk_ua-1.6.5.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/1.6.5/dict-uk_ua-1.6.5.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=5b3ed77014b89af0bb0f38d8b0af4e5f
+_md5_=18f2fb5ec09eba9513b324256a61406d
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index a8bdb4047311..aafaa86ba567 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/clsync-docs-0.4.4-r1 b/metadata/md5-cache/app-doc/clsync-docs-0.4.4-r1
index 52b4c1a0acbb..44ec77fe11cd 100644
--- a/metadata/md5-cache/app-doc/clsync-docs-0.4.4-r1
+++ b/metadata/md5-cache/app-doc/clsync-docs-0.4.4-r1
@@ -4,8 +4,8 @@ DESCRIPTION=Clsync and libclsync API documentation
 EAPI=7
 HOMEPAGE=http://ut.mephi.ru/oss/clsync https://github.com/clsync/clsync
 IUSE=api +examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/clsync/clsync/archive/v0.4.4.tar.gz -> clsync-0.4.4.tar.gz
-_md5_=9d42ce2bc82407aedbe06f84c600fd61
+_md5_=994fa8f397888820a6927d2caa368ac2
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 2b035275341c..e68b011ab53c 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/auctex-12.2 b/metadata/md5-cache/app-emacs/auctex-12.2
index 5fb8fdb23d6c..cb71cbe1de59 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.2
+++ b/metadata/md5-cache/app-emacs/auctex-12.2
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/auctex/
 IUSE=preview-latex
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.2.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709
-_md5_=efcdca88e6bfbe449d762d219b30bbaa
+_md5_=109648ca6706591fc8f782c665e5d07d
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f73c619f6331..2b00a63a719f 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/crun-0.10.6 b/metadata/md5-cache/app-emulation/crun-0.10.6
deleted file mode 100644
index d37303567437..000000000000
--- a/metadata/md5-cache/app-emulation/crun-0.10.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( dev-go/go-md2man )
-DEFINED_PHASES=compile configure install setup
-DEPEND=dev-libs/yajl sys-libs/libseccomp caps? ( sys-libs/libcap ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
-EAPI=7
-HOMEPAGE=https://github.com/containers/crun
-IUSE=bpf +caps doc seccomp systemd static-libs
-KEYWORDS=~amd64
-LICENSE=GPL-3 LGPL-3+
-RDEPEND=dev-libs/yajl sys-libs/libseccomp caps? ( sys-libs/libcap ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/crun/releases/download/0.10.6/crun-0.10.6.tar.gz
-_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a6e87f362867659a2174bf08a8804b1c
diff --git a/metadata/md5-cache/app-emulation/crun-0.13 b/metadata/md5-cache/app-emulation/crun-0.13
new file mode 100644
index 000000000000..97d1366b0358
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crun-0.13
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( dev-go/go-md2man ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/yajl caps? ( sys-libs/libcap ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
+EAPI=7
+HOMEPAGE=https://github.com/containers/crun
+IUSE=bpf +caps doc seccomp systemd static-libs
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/yajl caps? ( sys-libs/libcap ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/crun/releases/download/0.13/crun-0.13.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=1e8504b688b871c2ae4ccc7a8c7a7f57
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.0.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.0.0
new file mode 100644
index 000000000000..4297b87fe59a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.0.0
@@ -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/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(-)?,python_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=Golden Disk Image builder.
+EAPI=7
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+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(-)?,python_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-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/Babel-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/networkx-1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.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(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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/d/diskimage-builder/diskimage-builder-3.0.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=507e3fefb195f2387cce7ff0ae45408b
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.26.0 b/metadata/md5-cache/app-emulation/docker-compose-1.26.0
new file mode 100644
index 000000000000..36038f9a2054
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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/cached-property-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docker-py-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dockerpty-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docopt-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dotenv-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PySocks-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/texttable-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pytest-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ddt-1.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=7
+HOMEPAGE=https://github.com/docker/compose
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cached-property-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docker-py-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dockerpty-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docopt-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dotenv-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PySocks-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/texttable-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/1.26.0.tar.gz -> docker-compose-1.26.0.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=ef44d37880cb84841b2a713f2c74e400
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.18.0 b/metadata/md5-cache/app-emulation/firecracker-0.18.0
index 68e984f47a32..17bd3ae35608 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.18.0
+++ b/metadata/md5-cache/app-emulation/firecracker-0.18.0
@@ -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.18.0.tar.gz -> firecracker-0.18.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/backtrace/0.3.35/download -> backtrace-0.3.35.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bitflags/0.5.0/download -> bitflags-0.5.0.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/byteorder/1.2.1/download -> byteorder-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.41/download -> cc-1.0.41.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.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.0.1/download -> epoll-4.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.18/download -> futures-0.1.18.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/getrandom/0.1.11/download -> getrandom-0.1.11.crate https://crates.io/api/v1/crates/getrandom_package/0.1.20/download -> getrandom_package-0.1.20.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.11.16/download -> hyper-0.11.16.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/ipnetwork/0.14.0/download -> ipnetwork-0.14.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kvm-bindings/0.1.1/download -> kvm-bindings-0.1.1.crate https://crates.io/api/v1/crates/kvm-ioctls/0.2.0/download -> kvm-ioctls-0.2.0.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.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.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/mime/0.3.13/download -> mime-0.3.13.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pnet/0.22.0/download -> pnet-0.22.0.crate https://crates.io/api/v1/crates/pnet_base/0.22.0/download -> pnet_base-0.22.0.crate https://crates.io/api/v1/crates/pnet_datalink/0.22.0/download -> pnet_datalink-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros/0.22.0/download -> pnet_macros-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros_support/0.22.0/download -> pnet_macros_support-0.22.0.crate https://crates.io/api/v1/crates/pnet_packet/0.22.0/download -> pnet_packet-0.22.0.crate https://crates.io/api/v1/crates/pnet_sys/0.22.0/download -> pnet_sys-0.22.0.crate https://crates.io/api/v1/crates/pnet_transport/0.22.0/download -> pnet_transport-0.22.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.2/download -> proc-macro2-1.0.2.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.0/download -> rand-0.7.0.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/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.11/download -> regex-syntax-0.6.11.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/safemem/0.3.2/download -> safemem-0.3.2.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.99/download -> serde-1.0.99.crate https://crates.io/api/v1/crates/serde_derive/1.0.99/download -> serde_derive-1.0.99.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/syntex/0.42.2/download -> syntex-0.42.2.crate https://crates.io/api/v1/crates/syntex_errors/0.42.0/download -> syntex_errors-0.42.0.crate https://crates.io/api/v1/crates/syntex_pos/0.42.0/download -> syntex_pos-0.42.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.42.0/download -> syntex_syntax-0.42.0.crate https://crates.io/api/v1/crates/sys_util/0.1.0/download -> sys_util-0.1.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.4.6/download -> term-0.4.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timerfd/1.0.0/download -> timerfd-1.0.0.crate https://crates.io/api/v1/crates/tokio-core/0.1.12/download -> tokio-core-0.1.12.crate https://crates.io/api/v1/crates/tokio-io/0.1.5/download -> tokio-io-0.1.5.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/unicase/2.4.0/download -> unicase-2.4.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wasi/0.5.0/download -> wasi-0.5.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/rust-libcore/0.0.3/download -> rust-libcore-0.0.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=13245325460eabfaf7a5681877474976
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.18.1 b/metadata/md5-cache/app-emulation/firecracker-0.18.1
index c094addda526..93c79167f22b 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.18.1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.18.1
@@ -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.18.1.tar.gz -> firecracker-0.18.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/backtrace/0.3.35/download -> backtrace-0.3.35.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bitflags/0.5.0/download -> bitflags-0.5.0.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/byteorder/1.2.1/download -> byteorder-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.41/download -> cc-1.0.41.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.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.0.1/download -> epoll-4.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.18/download -> futures-0.1.18.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/getrandom/0.1.11/download -> getrandom-0.1.11.crate https://crates.io/api/v1/crates/getrandom_package/0.1.20/download -> getrandom_package-0.1.20.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.11.16/download -> hyper-0.11.16.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/ipnetwork/0.14.0/download -> ipnetwork-0.14.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kvm-bindings/0.1.1/download -> kvm-bindings-0.1.1.crate https://crates.io/api/v1/crates/kvm-ioctls/0.2.0/download -> kvm-ioctls-0.2.0.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.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.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/mime/0.3.13/download -> mime-0.3.13.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pnet/0.22.0/download -> pnet-0.22.0.crate https://crates.io/api/v1/crates/pnet_base/0.22.0/download -> pnet_base-0.22.0.crate https://crates.io/api/v1/crates/pnet_datalink/0.22.0/download -> pnet_datalink-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros/0.22.0/download -> pnet_macros-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros_support/0.22.0/download -> pnet_macros_support-0.22.0.crate https://crates.io/api/v1/crates/pnet_packet/0.22.0/download -> pnet_packet-0.22.0.crate https://crates.io/api/v1/crates/pnet_sys/0.22.0/download -> pnet_sys-0.22.0.crate https://crates.io/api/v1/crates/pnet_transport/0.22.0/download -> pnet_transport-0.22.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.2/download -> proc-macro2-1.0.2.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.0/download -> rand-0.7.0.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/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.11/download -> regex-syntax-0.6.11.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/safemem/0.3.2/download -> safemem-0.3.2.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.99/download -> serde-1.0.99.crate https://crates.io/api/v1/crates/serde_derive/1.0.99/download -> serde_derive-1.0.99.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/syntex/0.42.2/download -> syntex-0.42.2.crate https://crates.io/api/v1/crates/syntex_errors/0.42.0/download -> syntex_errors-0.42.0.crate https://crates.io/api/v1/crates/syntex_pos/0.42.0/download -> syntex_pos-0.42.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.42.0/download -> syntex_syntax-0.42.0.crate https://crates.io/api/v1/crates/sys_util/0.1.0/download -> sys_util-0.1.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.4.6/download -> term-0.4.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timerfd/1.0.0/download -> timerfd-1.0.0.crate https://crates.io/api/v1/crates/tokio-core/0.1.12/download -> tokio-core-0.1.12.crate https://crates.io/api/v1/crates/tokio-io/0.1.5/download -> tokio-io-0.1.5.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/unicase/2.4.0/download -> unicase-2.4.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wasi/0.5.0/download -> wasi-0.5.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/rust-libcore/0.0.3/download -> rust-libcore-0.0.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=a70cd553711c600406310f8ef45e4648
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.19.0 b/metadata/md5-cache/app-emulation/firecracker-0.19.0
index f04df5436750..3a0ee3f25ac6 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.19.0
+++ b/metadata/md5-cache/app-emulation/firecracker-0.19.0
@@ -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.19.0.tar.gz -> firecracker-0.19.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/backtrace/0.3.35/download -> backtrace-0.3.35.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bitflags/0.5.0/download -> bitflags-0.5.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.1/download -> byteorder-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.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/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.0.1/download -> epoll-4.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.18/download -> futures-0.1.18.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.11.16/download -> hyper-0.11.16.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnetwork/0.14.0/download -> ipnetwork-0.14.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kvm-bindings/0.1.1/download -> kvm-bindings-0.1.1.crate https://crates.io/api/v1/crates/kvm-ioctls/0.2.0/download -> kvm-ioctls-0.2.0.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.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.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/mime/0.3.14/download -> mime-0.3.14.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pnet/0.22.0/download -> pnet-0.22.0.crate https://crates.io/api/v1/crates/pnet_base/0.22.0/download -> pnet_base-0.22.0.crate https://crates.io/api/v1/crates/pnet_datalink/0.22.0/download -> pnet_datalink-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros/0.22.0/download -> pnet_macros-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros_support/0.22.0/download -> pnet_macros_support-0.22.0.crate https://crates.io/api/v1/crates/pnet_packet/0.22.0/download -> pnet_packet-0.22.0.crate https://crates.io/api/v1/crates/pnet_sys/0.22.0/download -> pnet_sys-0.22.0.crate https://crates.io/api/v1/crates/pnet_transport/0.22.0/download -> pnet_transport-0.22.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.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/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/ryu/1.0.1/download -> ryu-1.0.1.crate https://crates.io/api/v1/crates/safemem/0.3.2/download -> safemem-0.3.2.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/syntex/0.42.2/download -> syntex-0.42.2.crate https://crates.io/api/v1/crates/syntex_errors/0.42.0/download -> syntex_errors-0.42.0.crate https://crates.io/api/v1/crates/syntex_pos/0.42.0/download -> syntex_pos-0.42.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.42.0/download -> syntex_syntax-0.42.0.crate https://crates.io/api/v1/crates/sys_util/0.1.0/download -> sys_util-0.1.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.4.6/download -> term-0.4.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timerfd/1.0.0/download -> timerfd-1.0.0.crate https://crates.io/api/v1/crates/tokio-core/0.1.12/download -> tokio-core-0.1.12.crate https://crates.io/api/v1/crates/tokio-io/0.1.5/download -> tokio-io-0.1.5.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/unicase/2.5.1/download -> unicase-2.5.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.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.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=36221b12c6f2756170d9190c6e421ad1
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.19.1 b/metadata/md5-cache/app-emulation/firecracker-0.19.1
index 9628aabc54e9..8e68835cd5a2 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.19.1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.19.1
@@ -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.19.1.tar.gz -> firecracker-0.19.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/backtrace/0.3.35/download -> backtrace-0.3.35.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bitflags/0.5.0/download -> bitflags-0.5.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.1/download -> byteorder-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.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/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.0.1/download -> epoll-4.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.18/download -> futures-0.1.18.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.11.16/download -> hyper-0.11.16.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnetwork/0.14.0/download -> ipnetwork-0.14.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kvm-bindings/0.1.1/download -> kvm-bindings-0.1.1.crate https://crates.io/api/v1/crates/kvm-ioctls/0.2.0/download -> kvm-ioctls-0.2.0.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.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.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/mime/0.3.14/download -> mime-0.3.14.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pnet/0.22.0/download -> pnet-0.22.0.crate https://crates.io/api/v1/crates/pnet_base/0.22.0/download -> pnet_base-0.22.0.crate https://crates.io/api/v1/crates/pnet_datalink/0.22.0/download -> pnet_datalink-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros/0.22.0/download -> pnet_macros-0.22.0.crate https://crates.io/api/v1/crates/pnet_macros_support/0.22.0/download -> pnet_macros_support-0.22.0.crate https://crates.io/api/v1/crates/pnet_packet/0.22.0/download -> pnet_packet-0.22.0.crate https://crates.io/api/v1/crates/pnet_sys/0.22.0/download -> pnet_sys-0.22.0.crate https://crates.io/api/v1/crates/pnet_transport/0.22.0/download -> pnet_transport-0.22.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.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/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/ryu/1.0.1/download -> ryu-1.0.1.crate https://crates.io/api/v1/crates/safemem/0.3.2/download -> safemem-0.3.2.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/syntex/0.42.2/download -> syntex-0.42.2.crate https://crates.io/api/v1/crates/syntex_errors/0.42.0/download -> syntex_errors-0.42.0.crate https://crates.io/api/v1/crates/syntex_pos/0.42.0/download -> syntex_pos-0.42.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.42.0/download -> syntex_syntax-0.42.0.crate https://crates.io/api/v1/crates/sys_util/0.1.0/download -> sys_util-0.1.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.4.6/download -> term-0.4.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timerfd/1.0.0/download -> timerfd-1.0.0.crate https://crates.io/api/v1/crates/tokio-core/0.1.12/download -> tokio-core-0.1.12.crate https://crates.io/api/v1/crates/tokio-io/0.1.5/download -> tokio-io-0.1.5.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/unicase/2.5.1/download -> unicase-2.5.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.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.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=36221b12c6f2756170d9190c6e421ad1
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.21.1 b/metadata/md5-cache/app-emulation/firecracker-0.21.1
index 7ac90d47da63..a56e0a5ae5c0 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.21.1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.21.1
@@ -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	4cfad681317daaca938cc223bc0166a3	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=467b35ad0201aae708782e4520ef8873
diff --git a/metadata/md5-cache/app-emulation/nemu-2.1.0 b/metadata/md5-cache/app-emulation/nemu-2.1.0
deleted file mode 100644
index c971c884caa8..000000000000
--- a/metadata/md5-cache/app-emulation/nemu-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ncurses interface for QEMU
-EAPI=6
-HOMEPAGE=https://lib.void.so/nemu
-IUSE=+vnc-client +ovf savevm debug kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
-SLOT=0
-SRC_URI=http://lib.void.so/src/nemu-2.1.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ebed69a116a5602d2d8547ac1d7a62c
diff --git a/metadata/md5-cache/app-emulation/nemu-2.2.0 b/metadata/md5-cache/app-emulation/nemu-2.2.0
deleted file mode 100644
index 825e1d23e5d3..000000000000
--- a/metadata/md5-cache/app-emulation/nemu-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=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 )
-DESCRIPTION=ncurses interface for QEMU
-EAPI=7
-HOMEPAGE=https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/
-IUSE=debug network-map +ovf savevm spice +vnc-client kernel_linux
-KEYWORDS=~amd64 ~x86
-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.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0dda136eefd3543efb93dd53c85817b
diff --git a/metadata/md5-cache/app-emulation/nemu-2.2.1 b/metadata/md5-cache/app-emulation/nemu-2.2.1
index d828a5bb3252..c2bc0e9aeac3 100644
--- a/metadata/md5-cache/app-emulation/nemu-2.2.1
+++ b/metadata/md5-cache/app-emulation/nemu-2.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=ncurses interface for QEMU
 EAPI=7
 HOMEPAGE=https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/
 IUSE=debug network-map +ovf savevm spice +vnc-client kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0dda136eefd3543efb93dd53c85817b
+_md5_=83f9b4345078c47ac7de9ef061a7e658
diff --git a/metadata/md5-cache/app-emulation/nemu-9999 b/metadata/md5-cache/app-emulation/nemu-9999
index 6d8a0d962db6..4fb3060459a4 100644
--- a/metadata/md5-cache/app-emulation/nemu-9999
+++ b/metadata/md5-cache/app-emulation/nemu-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/ncurses:0=[unicode] dev-db/sqlite:3= virtual/libusb:1 || ( sys-fs/eudev sys-fs/udev ) app-emulation/qemu[vnc,virtfs] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=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] ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=ncurses interface for QEMU
 EAPI=6
-HOMEPAGE=https://lib.void.so/nemu
-IUSE=+vnc-client +ovf savevm debug kernel_linux
+HOMEPAGE=https://github.com/nemuTUI/nemu
+IUSE=+vnc-client +ovf +spice savevm svg debug kernel_linux
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0=[unicode] dev-db/sqlite:3= virtual/libusb:1 || ( sys-fs/eudev sys-fs/udev ) app-emulation/qemu[vnc,virtfs] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
+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	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b5a41e2df84db2777c88f2118fc1ab84
+_md5_=ee380907e92c23b39b31976a36fa0871
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.20 b/metadata/md5-cache/app-emulation/virtualbox-6.0.20
index d36361635ee2..257c3536b3df 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.20
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 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	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8099beafc5b00c0129236d5a821294a7
+_md5_=58bc3aec037da63a26467f9a0d437f60
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.6 b/metadata/md5-cache/app-emulation/virtualbox-6.1.6
index c4f74465805c..17f074cb8c77 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.6
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 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.14-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	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1157c4191383451a81581121246026d
+_md5_=79651714f30a7542eb701ed8bb923a44
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
new file mode 100644
index 000000000000..a8784a3a9d4e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] ) udev? ( 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(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,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? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] ) udev? ( 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(-)?] ) udisks? ( 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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=5.0.1
+SRC_URI=https://dl.winehq.org/wine/source/5.0/wine-5.0.1.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=814fdf0ba2850fb68b92e48a433ca0c5
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 59dd1b31d215..c08a04160fc6 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-blas-0.2 b/metadata/md5-cache/app-eselect/eselect-blas-0.2
index 5d764363797d..2aa065b98ace 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.2
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.2
@@ -3,8 +3,8 @@ DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS/CBLAS module for eselect
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-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=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=591b7e493165f1962c79c18d7a0e2e8f
+_md5_=fd80c71add8e88bef9bc0a8e5f6f0854
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 8d5aa5e6a1e3..43743911e7e3 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.22 b/metadata/md5-cache/app-i18n/ibus-1.5.22
index 1019716f9636..3fc8ba4c2474 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.22
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.22
@@ -5,7 +5,7 @@ DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-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=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject: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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) introspection ) test? ( gtk ) vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.22/ibus-1.5.22.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86db27adca93315c71f8d9780b01326b
+_md5_=2a4eb4e99fb1fda504c061234031825d
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
new file mode 100644
index 000000000000..a1438a77b510
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
@@ -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 prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python2_7? ( app-i18n/ibus[python(+),python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl ) dev-util/intltool sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Chinese Pinyin and Bopomofo engines for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=boost lua nls python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python2_7? ( app-i18n/ibus[python(+),python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=dc167f6aec162cc7d131bd9e4348b5a8
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 6f143d03fa55..2f400bfe139f 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/abduco-0.5 b/metadata/md5-cache/app-misc/abduco-0.5
index c2a6da5d533b..204f03fa296c 100644
--- a/metadata/md5-cache/app-misc/abduco-0.5
+++ b/metadata/md5-cache/app-misc/abduco-0.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst prepare test
 DESCRIPTION=lightweight session manager with {de,at}tach support
 EAPI=5
-HOMEPAGE=http://www.brain-dump.org/projects/abduco/
+HOMEPAGE=https://www.brain-dump.org/projects/abduco/
 IUSE=savedconfig
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/abduco/abduco-0.5.tar.gz
+SRC_URI=https://www.brain-dump.org/projects/abduco/abduco-0.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34c5eb6cd97936c5572c047227432e8e
+_md5_=6dbe150922e2397738a51acbb4c013fc
diff --git a/metadata/md5-cache/app-misc/abduco-0.6 b/metadata/md5-cache/app-misc/abduco-0.6
index 3d5c76658a88..452ed06f062a 100644
--- a/metadata/md5-cache/app-misc/abduco-0.6
+++ b/metadata/md5-cache/app-misc/abduco-0.6
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst prepare test
 DESCRIPTION=lightweight session manager with {de,at}tach support
 EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/abduco/
+HOMEPAGE=https://www.brain-dump.org/projects/abduco/
 IUSE=savedconfig
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/abduco/abduco-0.6.tar.gz
+SRC_URI=https://www.brain-dump.org/projects/abduco/abduco-0.6.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=05518e0cb411cff01a811c8d6308b2c6
+_md5_=4a1fb3798996b45f55cb8dbb1865698c
diff --git a/metadata/md5-cache/app-misc/abook-0.6.1-r2 b/metadata/md5-cache/app-misc/abook-0.6.1-r2
index 7aaa0764d879..a68459311e90 100644
--- a/metadata/md5-cache/app-misc/abook-0.6.1-r2
+++ b/metadata/md5-cache/app-misc/abook-0.6.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt
 EAPI=6
 HOMEPAGE=http://abook.sourceforge.net/
 IUSE=nls
-KEYWORDS=~alpha amd64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline dev-libs/libvformat nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1bf870d0ce0498728c345cba9250cbff
+_md5_=455b6640ffb44a895765e2bf2b436e67
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20190110.3.53 b/metadata/md5-cache/app-misc/ca-certificates-20190110.3.53
new file mode 100644
index 000000000000..2bd883a1b0b0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20190110.3.53
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=6
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+IUSE=cacert
+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=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20190110.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_53_RTM/src/nss-3.53.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bcdbb9c238329b8df0d9b87300203367
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20200601.3.53 b/metadata/md5-cache/app-misc/ca-certificates-20200601.3.53
new file mode 100644
index 000000000000..45be3cedb946
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20200601.3.53
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=6
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+IUSE=cacert
+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=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20200601.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_53_RTM/src/nss-3.53.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1618376c49db1ba1612184f72b90c78d
diff --git a/metadata/md5-cache/app-misc/cargo-license-0.3.0 b/metadata/md5-cache/app-misc/cargo-license-0.3.0
index 094837d27f78..58f6d7864e60 100644
--- a/metadata/md5-cache/app-misc/cargo-license-0.3.0
+++ b/metadata/md5-cache/app-misc/cargo-license-0.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 MIT
 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/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.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/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cargo-license/0.3.0/download -> cargo-license-0.3.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.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/csv/1.1.1/download -> csv-1.1.1.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.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/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/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-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/regex-automata/0.1.8/download -> regex-automata-0.1.8.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/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.103/download -> serde-1.0.103.crate https://crates.io/api/v1/crates/serde_derive/1.0.103/download -> serde_derive-1.0.103.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/structopt/0.3.5/download -> structopt-0.3.5.crate https://crates.io/api/v1/crates/structopt-derive/0.3.5/download -> structopt-derive-0.3.5.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.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.4.10/download -> toml-0.4.10.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/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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=1b500b59947fb3b4f394cd660b31ee7d
diff --git a/metadata/md5-cache/app-misc/dvtm-0.14-r1 b/metadata/md5-cache/app-misc/dvtm-0.14-r1
index 2320f0afc9b5..59ef7704a86b 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.14-r1
+++ b/metadata/md5-cache/app-misc/dvtm-0.14-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=sys-libs/ncurses:0=[unicode?]
 DESCRIPTION=Dynamic virtual terminal manager
 EAPI=5
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
+HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
 IUSE=unicode savedconfig
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode?] !>=sys-libs/ncurses-6.1
 SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.14.tar.gz
+SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.14.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=53fc65036f33d89a7987c9cf95b2a52d
+_md5_=91ea341ff5eec2bf4e6d5542c2388abe
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r2 b/metadata/md5-cache/app-misc/dvtm-0.15-r2
index 73627d30fb11..5c1f0f9f3508 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r2
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
 DESCRIPTION=Dynamic virtual terminal manager
 EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
+HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
 IUSE=savedconfig
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode] !>=sys-libs/ncurses-6.1
 SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
+SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=470971de030fe6df3347d71673c8e126
+_md5_=9c1a1ca773f56e575304dccf7975c8f7
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r3 b/metadata/md5-cache/app-misc/dvtm-0.15-r3
index 7e397458aa6e..e498df58b6b6 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r3
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=>=sys-libs/ncurses-6.1:0=[unicode] virtual/pkgconfig
 DESCRIPTION=Dynamic virtual terminal manager
 EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
+HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
 IUSE=savedconfig
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
 SLOT=0
-SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
+SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=01d4cde55ac7efd2b6e3e6442965a125
+_md5_=c9e51b16b907f70327708255ec995d94
diff --git a/metadata/md5-cache/app-misc/dvtm-9999 b/metadata/md5-cache/app-misc/dvtm-9999
index 344ae5dad284..2fd3f8cb58b9 100644
--- a/metadata/md5-cache/app-misc/dvtm-9999
+++ b/metadata/md5-cache/app-misc/dvtm-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DEPEND=>=sys-libs/ncurses-6.1:0=[unicode] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Dynamic virtual terminal manager
 EAPI=6
-HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
+HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
 IUSE=savedconfig
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4b12ea99c85427fc87f4ad82855f6a66
+_md5_=2193516a32065f2fbb2a54ddfdb6dbd8
diff --git a/metadata/md5-cache/app-misc/gnote-3.36.1 b/metadata/md5-cache/app-misc/gnote-3.36.1
new file mode 100644
index 000000000000..b55957a511b7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gnote-3.36.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35.0 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Desktop note-taking application
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
+IUSE=debug
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfd3f52d89c1ff3fcb5ff3fec2e4c63a
diff --git a/metadata/md5-cache/app-misc/i2bits-0.1.0 b/metadata/md5-cache/app-misc/i2bits-0.1.0
index 7b3143e3681e..561dbbeb3c0f 100644
--- a/metadata/md5-cache/app-misc/i2bits-0.1.0
+++ b/metadata/md5-cache/app-misc/i2bits-0.1.0
@@ -8,4 +8,4 @@ LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=http://unixdev.ru/src/i2bits-0.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74c37dab205628b3588b47a956275aee
+_md5_=522717c6af5c768b25068565129773b6
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 e23308cd78d3..70c8c082abf8 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r3
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst preinst setup
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=7
-HOMEPAGE=http://www.lirc.org/
+HOMEPAGE=https://www.lirc.org/
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0b76fca22dbd94ba207d3a4298bb3a3
+_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 099494eb66d3..3ec895b4ac5b 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r4
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst preinst setup
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=7
-HOMEPAGE=http://www.lirc.org/
+HOMEPAGE=https://www.lirc.org/
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=856eee46b270a3a9fab9f2c4a93e499f
+_md5_=d62ddaa52a3618c03bb656b6842bbbea
diff --git a/metadata/md5-cache/app-misc/rpick-0.5.0 b/metadata/md5-cache/app-misc/rpick-0.5.0
index 22382bf02a11..b1457ada0497 100644
--- a/metadata/md5-cache/app-misc/rpick-0.5.0
+++ b/metadata/md5-cache/app-misc/rpick-0.5.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT
 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/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.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/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.9/download -> blake2b_simd-0.5.9.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.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/cc/1.0.48/download -> cc-1.0.48.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/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dtoa/0.4.4/download -> dtoa-0.4.4.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.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/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/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.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-macro-error/0.2.6/download -> proc-macro-error-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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.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_distr/0.2.2/download -> rand_distr-0.2.2.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/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/redox_users/0.3.1/download -> redox_users-0.3.1.crate https://crates.io/api/v1/crates/rpick/0.5.0/download -> rpick-0.5.0.crate https://crates.io/api/v1/crates/rust-argon2/0.5.1/download -> rust-argon2-0.5.1.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/serde/1.0.103/download -> serde-1.0.103.crate https://crates.io/api/v1/crates/serde_derive/1.0.103/download -> serde_derive-1.0.103.crate https://crates.io/api/v1/crates/serde_yaml/0.8.11/download -> serde_yaml-0.8.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.5/download -> structopt-0.3.5.crate https://crates.io/api/v1/crates/structopt-derive/0.3.5/download -> structopt-derive-0.3.5.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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 https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=5dbfd9382eb397dab8d579655ea87efd
diff --git a/metadata/md5-cache/app-misc/rpick-0.5.1 b/metadata/md5-cache/app-misc/rpick-0.5.1
index bc50e0b483b9..a3bb58a5329d 100644
--- a/metadata/md5-cache/app-misc/rpick-0.5.1
+++ b/metadata/md5-cache/app-misc/rpick-0.5.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 ~x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT
 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/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.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/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.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.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.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-macro-error/0.4.11/download -> proc-macro-error-0.4.11.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.11/download -> proc-macro-error-attr-0.4.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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_distr/0.2.2/download -> rand_distr-0.2.2.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/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/rpick/0.5.1/download -> rpick-0.5.1.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.crate https://crates.io/api/v1/crates/serde_yaml/0.8.11/download -> serde_yaml-0.8.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.16/download -> syn-1.0.16.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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 https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=1308633b35737214996ab88fd825f3a8
diff --git a/metadata/md5-cache/app-misc/rpick-0.6.1 b/metadata/md5-cache/app-misc/rpick-0.6.1
index aee043dd217c..b747a3ee8322 100644
--- a/metadata/md5-cache/app-misc/rpick-0.6.1
+++ b/metadata/md5-cache/app-misc/rpick-0.6.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT
 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/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.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/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.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.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.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-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.4/download -> quote-1.0.4.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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_distr/0.2.2/download -> rand_distr-0.2.2.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/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/rpick/0.6.1/download -> rpick-0.6.1.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/serde_derive/1.0.106/download -> serde_derive-1.0.106.crate https://crates.io/api/v1/crates/serde_yaml/0.8.11/download -> serde_yaml-0.8.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.14/download -> structopt-0.3.14.crate https://crates.io/api/v1/crates/structopt-derive/0.4.7/download -> structopt-derive-0.4.7.crate https://crates.io/api/v1/crates/syn/1.0.19/download -> syn-1.0.19.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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 https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6e439e46ea2c984ceebb9af40fec8fe9
diff --git a/metadata/md5-cache/app-misc/skim-0.6.9 b/metadata/md5-cache/app-misc/skim-0.6.9
index 0e0b9eb44bb2..0ac6c25c9469 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.9
+++ b/metadata/md5-cache/app-misc/skim-0.6.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.6.9/download -> skim-0.6.9.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.9/download -> tuikit-0.2.9.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e4b96670287a9c25354f82755d0d017d
diff --git a/metadata/md5-cache/app-misc/skim-0.7.0 b/metadata/md5-cache/app-misc/skim-0.7.0
index f5e13c3d6ab7..e36920968297 100644
--- a/metadata/md5-cache/app-misc/skim-0.7.0
+++ b/metadata/md5-cache/app-misc/skim-0.7.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.3.1/download -> fuzzy-matcher-0.3.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.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/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.7.0/download -> skim-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/thread_local/1.0.0/download -> thread_local-1.0.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.9/download -> tuikit-0.2.9.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f67ec60429e32c39f96510dae8b80f80
diff --git a/metadata/md5-cache/app-misc/skim-0.8.1 b/metadata/md5-cache/app-misc/skim-0.8.1
index 13cc4c869392..9f0d392cd56a 100644
--- a/metadata/md5-cache/app-misc/skim-0.8.1
+++ b/metadata/md5-cache/app-misc/skim-0.8.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.0/download -> crossbeam-channel-0.4.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.3.4/download -> fuzzy-matcher-0.3.4.crate https://crates.io/api/v1/crates/getrandom/0.1.6/download -> getrandom-0.1.6.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.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/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.8.1/download -> skim-0.8.1.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/term/0.6.1/download -> term-0.6.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/thread_local/1.0.0/download -> thread_local-1.0.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.3.2/download -> tuikit-0.3.2.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=838da3b791836de37abf9680150626b7
diff --git a/metadata/md5-cache/app-misc/sl-5.02 b/metadata/md5-cache/app-misc/sl-5.02
index 7719225400b0..25c13366779a 100644
--- a/metadata/md5-cache/app-misc/sl-5.02
+++ b/metadata/md5-cache/app-misc/sl-5.02
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=sophisticated graphical program which corrects your miss typing
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/mtoyoda/sl/archive/5.02.tar.gz -> sl-5.02.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=dcef93ca7ac1a51b6f293a9cbec56c49
+_md5_=f2b0936ee2c52eda829b665ce105faf8
diff --git a/metadata/md5-cache/app-misc/ttyload-0.5.3 b/metadata/md5-cache/app-misc/ttyload-0.5.3
index 38d74e27ffab..62d1b1368a56 100644
--- a/metadata/md5-cache/app-misc/ttyload-0.5.3
+++ b/metadata/md5-cache/app-misc/ttyload-0.5.3
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.daveltd.com/src/util/ttyload/ttyload-0.5.3.tar.bz2
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7fb748b37749619d30aa484e99b65de3
+_md5_=a91757c7ec47e330d3a8b50f9879c440
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index f2192e8291c6..eb6b99185b88 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/texstudio-3.0.0_pre20200601 b/metadata/md5-cache/app-office/texstudio-3.0.0_pre20200601
new file mode 100644
index 000000000000..793523558cdb
--- /dev/null
+++ b/metadata/md5-cache/app-office/texstudio-3.0.0_pre20200601
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] )
+DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
+EAPI=7
+HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
+IUSE=video
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/texstudio-org/texstudio/archive/3.0.0alpha6.tar.gz -> texstudio-3.0.0_pre20200601.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6c23e4fcdd18075583794a24457b906
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index 03e453cf44d6..fbd3fa56900d 100644
Binary files a/metadata/md5-cache/app-officeext/Manifest.gz and b/metadata/md5-cache/app-officeext/Manifest.gz differ
diff --git a/metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1 b/metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
index b06fffbef36c..d90c047e2d22 100644
--- a/metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
+++ b/metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=install postinst prerm unpack
 DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
 DESCRIPTION=Extension for reading barcodes
 EAPI=5
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/barcode
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/barcode
 IUSE=office_implementation_libreoffice office_implementation_openoffice
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/barcode/releases/1.3.5.0/barcode_1.3.5.0.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/barcode/releases/1.3.5.0/barcode_1.3.5.0.oxt
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	office-ext-r1	c5599254918ad9dfc276c949247566af	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6c0f18c4ad8c171f2cc4aa690377f1f
+_md5_=c42c9b24d6e1273671864fadac198427
diff --git a/metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1 b/metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
index cc7fc5af8885..2a203b902ddf 100644
--- a/metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
+++ b/metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=install postinst prerm unpack
 DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
 DESCRIPTION=Mathematics Formula Editor Extension
 EAPI=5
-HOMEPAGE=http://extensions.libreoffice.org/extension-center/dmaths
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/dmaths
 IUSE=office_implementation_libreoffice office_implementation_openoffice
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/dmaths/releases/3.4.9.0/dmathsaddon.oxt
+SRC_URI=https://extensions.libreoffice.org/extension-center/dmaths/releases/3.4.9.0/dmathsaddon.oxt
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	office-ext-r1	c5599254918ad9dfc276c949247566af	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f195fae9105547367af66e786dac212
+_md5_=12f033842574cf652b9c54b30160c270
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 0a2c2869a36b..1f7f55c38e09 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/dash-0.5.11 b/metadata/md5-cache/app-shells/dash-0.5.11
new file mode 100644
index 000000000000..639e2268f1f8
--- /dev/null
+++ b/metadata/md5-cache/app-shells/dash-0.5.11
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) libedit? ( static? ( dev-libs/libedit[static-libs] ) )
+DESCRIPTION=Debian Almquist Shell
+EAPI=7
+HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
+IUSE=libedit static
+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=BSD
+RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
+SLOT=0
+SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=9e33716a331cb4402b3543d203b534d5
diff --git a/metadata/md5-cache/app-shells/dash-0.5.9.1-r3 b/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
deleted file mode 100644
index a41708cb68fc..000000000000
--- a/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) )
-DESCRIPTION=Debian Almquist Shell
-EAPI=6
-HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
-IUSE=libedit static vanilla
-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=BSD
-RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
-SLOT=0
-SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=37f8c03ca210ad566d0ffec155a53a9a
diff --git a/metadata/md5-cache/app-shells/mcfly-0.3.6 b/metadata/md5-cache/app-shells/mcfly-0.3.6
index 88beaafe0734..97d9851c272c 100644
--- a/metadata/md5-cache/app-shells/mcfly-0.3.6
+++ b/metadata/md5-cache/app-shells/mcfly-0.3.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense
 RDEPEND=dev-db/sqlite:3
 SLOT=0
 SRC_URI=https://github.com/cantino/mcfly/archive/v0.3.6.tar.gz -> mcfly-0.3.6.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/csv/1.0.1/download -> csv-1.0.1.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/lru-cache/0.1.1/download -> lru-cache-0.1.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/relative-path/0.4.0/download -> relative-path-0.4.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/serde/1.0.75/download -> serde-1.0.75.crate https://crates.io/api/v1/crates/shellexpand/1.0.0/download -> shellexpand-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.1/download -> unicode-segmentation-1.2.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=138170ec8f43eecdbdcedaf01f18611c
diff --git a/metadata/md5-cache/app-shells/powerline-2.7 b/metadata/md5-cache/app-shells/powerline-2.7-r1
similarity index 97%
rename from metadata/md5-cache/app-shells/powerline-2.7
rename to metadata/md5-cache/app-shells/powerline-2.7-r1
index 7ac7b3ca4532..0bed4322524d 100644
--- a/metadata/md5-cache/app-shells/powerline-2.7
+++ b/metadata/md5-cache/app-shells/powerline-2.7-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f0a15d088ec9f4053455b4d2b5cd90cd
+_md5_=aa3256e687f611dd975d71e933361d0d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 4a2063d61c7c..91ace75c6e74 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/calibre-4.11.2 b/metadata/md5-cache/app-text/calibre-4.11.2
deleted file mode 100644
index e4be92690dcc..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.11.2/calibre-4.11.2.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cd707adbdd1859106f9a7cc743b6f26
diff --git a/metadata/md5-cache/app-text/calibre-4.12.0 b/metadata/md5-cache/app-text/calibre-4.12.0
deleted file mode 100644
index b74355614a0a..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.12.0/calibre-4.12.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1075d8d038c665be29a80f8de6bb5d0
diff --git a/metadata/md5-cache/app-text/calibre-4.15.0 b/metadata/md5-cache/app-text/calibre-4.15.0
deleted file mode 100644
index 74f25acd3f5c..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.15.0/calibre-4.15.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1075d8d038c665be29a80f8de6bb5d0
diff --git a/metadata/md5-cache/app-text/calibre-4.16.0 b/metadata/md5-cache/app-text/calibre-4.16.0
deleted file mode 100644
index 4b2b8265b0fe..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.16.0/calibre-4.16.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1075d8d038c665be29a80f8de6bb5d0
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1-r2 b/metadata/md5-cache/app-text/calibre-4.9.1-r2
index 563ea2df5055..27c7e6406c28 100644
--- a/metadata/md5-cache/app-text/calibre-4.9.1-r2
+++ b/metadata/md5-cache/app-text/calibre-4.9.1-r2
@@ -9,6 +9,6 @@ LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
+SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4943ef54f51494b54780dfdd15b3023
+_md5_=ca1598ed0e236480b1926b6f0545ef87
diff --git a/metadata/md5-cache/app-text/fblog-1.4.1 b/metadata/md5-cache/app-text/fblog-1.4.1
index dfd669714677..4fdf4fb7b799 100644
--- a/metadata/md5-cache/app-text/fblog-1.4.1
+++ b/metadata/md5-cache/app-text/fblog-1.4.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64
 LICENSE=Apache-2.0 Boost-1.0 MIT Unlicense WTFPL-2
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.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.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fblog/1.4.1/download -> fblog-1.4.1.crate https://crates.io/api/v1/crates/hlua/0.4.1/download -> hlua-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.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.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/lua52-sys/0.1.2/download -> lua52-sys-0.1.2.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/serde/1.0.100/download -> serde-1.0.100.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e13cc1cc17fea39213f23bea05c98fc4
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 bc03c7ea252c..25c5701cc96c 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+++ b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=A converter from plain text to HTML and other markup languages
 EAPI=5
-HOMEPAGE=http://triptico.com/software/grutatxt.html
+HOMEPAGE=https://triptico.com/software/grutatxt.html
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=http://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
+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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b28e59fc4081125843030800544fafb
+_md5_=1cc592c4e3fd40f366c5e617a93d2150
diff --git a/metadata/md5-cache/app-text/jo-1.3 b/metadata/md5-cache/app-text/jo-1.3
index 123f75c3b366..4bc60da659f3 100644
--- a/metadata/md5-cache/app-text/jo-1.3
+++ b/metadata/md5-cache/app-text/jo-1.3
@@ -7,4 +7,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/jpmens/jo/releases/download/1.3/jo-1.3.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=16605dad47edc335d2cddf2a043d707f
+_md5_=6de69a8de3b6ed0058ea32a7734bd027
diff --git a/metadata/md5-cache/app-text/jo-99999 b/metadata/md5-cache/app-text/jo-99999
index 924ca97af430..e78ba027210d 100644
--- a/metadata/md5-cache/app-text/jo-99999
+++ b/metadata/md5-cache/app-text/jo-99999
@@ -7,4 +7,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=fff16d31b3db1b018fb2af8fd8e3bfb1
+_md5_=aa6a81dec938771050929c3eb8f6d7fb
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.1 b/metadata/md5-cache/app-text/kbibtex-0.9.1
deleted file mode 100644
index b379b2396e69..000000000000
--- a/metadata/md5-cache/app-text/kbibtex-0.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-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/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KBibTeX
-IUSE=webengine zotero debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-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/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html || ( 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/KBibTeX/0.9.1/kbibtex-0.9.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23a9f1ec13f49c977bf591ad97afa45e
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.2 b/metadata/md5-cache/app-text/kbibtex-0.9.2
index 200d39935037..194e278e6bf8 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.9.2
+++ b/metadata/md5-cache/app-text/kbibtex-0.9.2
@@ -5,11 +5,11 @@ DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
 EAPI=7
 HOMEPAGE=https://kde.org/applications/education/org.kde.kbibtex https://userbase.kde.org/KBibTeX
 IUSE=webengine zotero debug +handbook test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-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/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) dev-tex/bibtex2html || ( 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/KBibTeX/0.9.2/kbibtex-0.9.2.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c174df2de870c5b92188dd4e45fac058
+_md5_=0d2500a034a55730bbc4af17541ec933
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.6 b/metadata/md5-cache/app-text/libnumbertext-1.0.6
new file mode 100644
index 000000000000..9bacf204fa31
--- /dev/null
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.6
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Number to number name and money text conversion libraries
+EAPI=7
+HOMEPAGE=https://github.com/Numbertext/libnumbertext
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3+
+SLOT=0
+SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.6/libnumbertext-1.0.6.tar.xz
+_md5_=8599842ff1f6b163cee4965e0bacfd1f
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.9 b/metadata/md5-cache/app-text/libspectre-0.2.9
index c8d31b82f0e1..b0e0a463d681 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.9
+++ b/metadata/md5-cache/app-text/libspectre-0.2.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=8877622ea40340062bfbbb532ca4d28c
+_md5_=f1425f921bb21aca6996cc525797a6b9
diff --git a/metadata/md5-cache/app-text/po4a-0.57 b/metadata/md5-cache/app-text/po4a-0.57
index 18d5101201cc..695033a61515 100644
--- a/metadata/md5-cache/app-text/po4a-0.57
+++ b/metadata/md5-cache/app-text/po4a-0.57
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to ease the translation of documentation
 EAPI=7
 HOMEPAGE=https://po4a.org/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.57/po4a-0.57.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=49de402c37d75685426134dfe7cd96bd
+_md5_=b9fe13839b64b172fbb7d26f31ce0b3a
diff --git a/metadata/md5-cache/app-text/yodl-4.02.02 b/metadata/md5-cache/app-text/yodl-4.02.02-r1
similarity index 78%
rename from metadata/md5-cache/app-text/yodl-4.02.02
rename to metadata/md5-cache/app-text/yodl-4.02.02-r1
index ffa9fc347333..2dfc40627c92 100644
--- a/metadata/md5-cache/app-text/yodl-4.02.02
+++ b/metadata/md5-cache/app-text/yodl-4.02.02-r1
@@ -1,5 +1,5 @@
+BDEPEND=>=dev-util/icmake-8.00.00 doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric )
 DEFINED_PHASES=compile install prepare pretend
-DEPEND=>=dev-util/icmake-8.00.00
 DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
 EAPI=7
 HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.02.02/yodl-4.02.02.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=6fe01ad07f99f2d90a034416e167a963
+_md5_=2c75933a88b2850d7673008073ad54f3
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 1da077650517..edebf04a175a 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1 b/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
new file mode 100644
index 000000000000..b5ba9660f0ab
--- /dev/null
+++ b/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Support EditorConfig files
+EAPI=7
+HOMEPAGE=https://editorconfig.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 PSF-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/editorconfig/editorconfig-vim/archive/v1.1.1.tar.gz -> editorconfig-vim-1.1.1.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=fc0e494ab53f803c7af4c4c0fc0539e0
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 7a17d7593979..b87f9b2a5ebf 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/asio-1.12.2 b/metadata/md5-cache/dev-cpp/asio-1.12.2
deleted file mode 100644
index ba38f6094915..000000000000
--- a/metadata/md5-cache/dev-cpp/asio-1.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=Asynchronous Network Library
-EAPI=7
-HOMEPAGE=https://think-async.com
-IUSE=doc examples libressl ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Boost-1.0
-RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.12.2.tar.bz2
-_md5_=5514a5a6ad83b2bd6ab5a8bb93e054a4
diff --git a/metadata/md5-cache/dev-cpp/asio-1.13.0 b/metadata/md5-cache/dev-cpp/asio-1.16.1
similarity index 82%
rename from metadata/md5-cache/dev-cpp/asio-1.13.0
rename to metadata/md5-cache/dev-cpp/asio-1.16.1
index 7802abd9faa1..334194daff6d 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.13.0
+++ b/metadata/md5-cache/dev-cpp/asio-1.16.1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.13.0.tar.bz2
-_md5_=5514a5a6ad83b2bd6ab5a8bb93e054a4
+SRC_URI=mirror://sourceforge/asio/asio/asio-1.16.1.tar.bz2
+_md5_=2d845bf35fc525c3d1b36842dadb8aa1
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r2 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r2
index 024cc2e6fa2b..2053bc996f4b 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r2
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=YAML parser and emitter in C++
 EAPI=7
 HOMEPAGE=https://github.com/jbeder/yaml-cpp
 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 ~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=MIT
 RESTRICT=test
 SLOT=0/0.6
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb80081b16ff75ba3ceea48be930806c
+_md5_=41168d189c0a2a146eaa01c4c9ec8e25
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3089879fcced..94d1e5d3f63b 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.45-r2 b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
index c6e2d03c770a..8ae5454c27b1 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.45-r2
+++ b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.45.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.45.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.45.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190822-1908Z.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf361b309f3fc2b4ecc6f9ebcc6e12f1
+_md5_=49077216f254dd6eb1ffb44cddaf8de9
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.30 b/metadata/md5-cache/dev-db/mysql-5.7.30
index 5116fd5c85f0..1296c4f11ac2 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.30
+++ b/metadata/md5-cache/dev-db/mysql-5.7.30
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.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	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1354594c0463cacb372cc94d7c8c4fcd
+_md5_=a2091af7b4fa58a542917f16aef37243
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1 b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
deleted file mode 100644
index 20c2b31d3332..000000000000
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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=PostgreSQL Extension Network Client
-EAPI=5
-HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e003a1e1f423fc2d645573997cc1a8a1
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2.1 b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
deleted file mode 100644
index d2f4edbb74ef..000000000000
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=PostgreSQL Extension Network Client
-EAPI=5
-HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
-IUSE=test python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2c1c479c10ac3667df5d2af0e17a0f9
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
index b81480fb38b5..e9570766a7a6 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 of routines for managing a database
 EAPI=5
-HOMEPAGE=http://fallabs.com/tokyocabinet/
+HOMEPAGE=https://fallabs.com/tokyocabinet/
 IUSE=bzip2 debug doc examples threads zlib
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=0
-SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
+SRC_URI=https://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8b5c50cca1757a506a5e624363854fd
+_md5_=1bad9daff48019e130670f5c4aee2582
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 7ba5234559b2..b969f9fed784 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/tiled-1.3.5 b/metadata/md5-cache/dev-games/tiled-1.3.5
new file mode 100644
index 000000000000..d7739b230786
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.3.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-qt/qtcore-5.10:5 >=dev-qt/qtdeclarative-5.10:5 >=dev-qt/qtgui-5.10:5 >=dev-qt/qtnetwork-5.10:5 >=dev-qt/qtwidgets-5.10:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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.10:5 >=dev-qt/qtdeclarative-5.10:5 >=dev-qt/qtgui-5.10:5 >=dev-qt/qtnetwork-5.10:5 >=dev-qt/qtwidgets-5.10:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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.3.5/tiled-1.3.5.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b2b539030103f6cc9af6a793d259b1c
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 384518328960..bd638161211b 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1
similarity index 97%
rename from metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10
rename to metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1
index b161a9678a4c..b7d70382b84b 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1
@@ -12,4 +12,4 @@ RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz )
 _eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82151e020ac380e6197846f227438b80
+_md5_=b09c4ad40475346697baaad30ad6a848
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10-r1
similarity index 97%
rename from metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10
rename to metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10-r1
index 5a912cc19661..30905dfc0ab5 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10-r1
@@ -12,4 +12,4 @@ RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz )
 _eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdf187ced39844d2700209876d45f017
+_md5_=c070bac6d6b72886fdcdfdc9bc1e8b6b
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r2 b/metadata/md5-cache/dev-java/swt-3.7.2-r3
similarity index 61%
rename from metadata/md5-cache/dev-java/swt-3.7.2-r2
rename to metadata/md5-cache/dev-java/swt-3.7.2-r3
index bf1a5e36f03b..6e5ec6d05cc3 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r2
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) app-arch/unzip >=virtual/jdk-1.4 virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=GTK based SWT Library
 EAPI=4
 HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+IUSE=cairo opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=3.7
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9c599ed249c43e3b37bd9bcc0a822789
+_md5_=2a9825935fef88ab7b14e11c13a21608
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r2 b/metadata/md5-cache/dev-java/swt-3.8.2-r3
similarity index 62%
rename from metadata/md5-cache/dev-java/swt-3.8.2-r2
rename to metadata/md5-cache/dev-java/swt-3.8.2-r3
index 977807a3884f..996437388232 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) app-arch/unzip >=virtual/jdk-1.4 virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=GTK based SWT Library
 EAPI=5
 HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+IUSE=cairo opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=64eeb20e208e0cf4effade81e08291e5
+_md5_=2e06b878ea87d3dc458ed37294f67168
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r3 b/metadata/md5-cache/dev-java/swt-4.2-r4
similarity index 67%
rename from metadata/md5-cache/dev-java/swt-4.2-r3
rename to metadata/md5-cache/dev-java/swt-4.2-r4
index 97447efb6312..4b5cbddb2b34 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r3
+++ b/metadata/md5-cache/dev-java/swt-4.2-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) app-arch/unzip >=virtual/jdk-1.4 virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=GTK based SWT Library
 EAPI=5
 HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo gnome opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+IUSE=cairo opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f789ebe822a7ac494784cafcc8a315e0
+_md5_=5269373d563afc22c70cc0285b4053be
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.23 b/metadata/md5-cache/dev-java/tomcat-native-1.2.23
deleted file mode 100644
index 94170232140a..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.23/source/tomcat-native-1.2.23-src.tar.gz
-_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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9951a5e3d0b7c1d00b7c522192072285
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.24 b/metadata/md5-cache/dev-java/tomcat-native-1.2.24
index 9e71927d64c7..f281b0d9c1ad 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.24
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.24
@@ -4,11 +4,11 @@ DESCRIPTION=Allows Tomcat to use certain native resources for better performance
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.24/source/tomcat-native-1.2.24-src.tar.gz
 _eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=38e20351abf2cc2d5662dcc017a74880
+_md5_=813dc0660372c55c61afef4c5102b185
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c9e5145f5bd2..7a985f2da6fe 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.18.0 b/metadata/md5-cache/dev-lang/logtalk-3.18.0
index a7e0609e5abd..01458aeaeb1d 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.18.0
+++ b/metadata/md5-cache/dev-lang/logtalk-3.18.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm prepare
 DESCRIPTION=Open source object-oriented logic programming language
 EAPI=6
-HOMEPAGE=http://logtalk.org
+HOMEPAGE=https://logtalk.org
 IUSE=fop xslt
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
-SRC_URI=http://logtalk.org/files/logtalk-3.18.0.tar.bz2
+SRC_URI=https://logtalk.org/files/logtalk-3.18.0.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb6675d48289613385a49694ca8a7a1e
+_md5_=2f7906cafb035efbfd36197bf0f8d2f1
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.36.0 b/metadata/md5-cache/dev-lang/logtalk-3.36.0
index 34fe9276a4c4..1b180bd9ff92 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.36.0
+++ b/metadata/md5-cache/dev-lang/logtalk-3.36.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm prepare
 DESCRIPTION=Open source object-oriented logic programming language
 EAPI=6
-HOMEPAGE=http://logtalk.org
+HOMEPAGE=https://logtalk.org
 IUSE=fop xslt
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
-SRC_URI=http://logtalk.org/files/logtalk-3.36.0.tar.bz2
+SRC_URI=https://logtalk.org/files/logtalk-3.36.0.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a6f21e246e42d0048ba4af5893b4444
+_md5_=2f7906cafb035efbfd36197bf0f8d2f1
diff --git a/metadata/md5-cache/dev-lang/micropython-1.11 b/metadata/md5-cache/dev-lang/micropython-1.11
index 19ab6b49add8..e3615fa42865 100644
--- a/metadata/md5-cache/dev-lang/micropython-1.11
+++ b/metadata/md5-cache/dev-lang/micropython-1.11
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/micropython/micropython/releases/download/v1.11/micropython-1.11.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=81a002ff2238d2d895801ee6710418fd
+_md5_=5bf67efcdb9a5388f4fc9af7c7155daa
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.3 b/metadata/md5-cache/dev-lang/perl-5.30.3
new file mode 100644
index 000000000000..79f7a0b92798
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/perl-5.30.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
+DESCRIPTION=Larry Wall's Practical Extraction and Report Language
+EAPI=6
+HOMEPAGE=https://www.perl.org/
+IUSE=berkdb debug doc gdbm ithreads
+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=|| ( Artistic GPL-1+ )
+PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
+SLOT=0/5.30
+SRC_URI=mirror://cpan/src/5.0/perl-5.30.3.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.tar.gz
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b4b0634d01ea3984362f77bb016e94a4
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.0.3 b/metadata/md5-cache/dev-lang/swi-prolog-8.0.3
index 03b1eba95b87..19f81b6a318a 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.0.3
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.0.3
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=6
-HOMEPAGE=http://www.swi-prolog.org/
+HOMEPAGE=https://www.swi-prolog.org/
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-8.0.3.tar.gz
+SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.0.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3307864eeb01dcb6bbf18500168d5dd7
+_md5_=482aaafdf272e63afd8d49b96ddc01c0
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.29 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.29
index a1590a7bdb64..c3b73f40a8ec 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.29
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.29
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
-HOMEPAGE=http://www.swi-prolog.org/
+HOMEPAGE=https://www.swi-prolog.org/
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.29.tar.gz
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.1.29.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=558cb1731977f1895e4a8a131f27c830
+_md5_=fdadb33812aa6f9e99a24fa3a3be73b9
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.30 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.30
index 88e3247e93de..f235aab3b9f5 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.30
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.30
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
-HOMEPAGE=http://www.swi-prolog.org/
+HOMEPAGE=https://www.swi-prolog.org/
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.30.tar.gz
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.1.30.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=558cb1731977f1895e4a8a131f27c830
+_md5_=fdadb33812aa6f9e99a24fa3a3be73b9
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.31 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.31
index 4cf1a2b1234d..6b4245463977 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.31
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.31
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
-HOMEPAGE=http://www.swi-prolog.org/
+HOMEPAGE=https://www.swi-prolog.org/
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.31.tar.gz
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.1.31.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=558cb1731977f1895e4a8a131f27c830
+_md5_=fdadb33812aa6f9e99a24fa3a3be73b9
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.20 b/metadata/md5-cache/dev-lang/vala-0.40.20
index 83b96eea6e0d..6290dcb13a33 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.20
+++ b/metadata/md5-cache/dev-lang/vala-0.40.20
@@ -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.20 valadoc? ( >=media-gfx/graphviz-2.16 )
 RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.20.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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78565cae1c39d79567e3bb79e56c4fd0
+_md5_=d00111869b7bc5dcfc60d8f5292d02b9
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.22 b/metadata/md5-cache/dev-lang/vala-0.40.23
similarity index 89%
rename from metadata/md5-cache/dev-lang/vala-0.40.22
rename to metadata/md5-cache/dev-lang/vala-0.40.23
index eae8e93d59d8..c6450d54f057 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.22
+++ b/metadata/md5-cache/dev-lang/vala-0.40.23
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.22 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.23 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=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
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.22 valadoc? ( >=media-gfx/graphviz-2.16 )
+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.22.tar.xz
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c82cf5e5afc6a150ddb04b18e663471b
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.9 b/metadata/md5-cache/dev-lang/vala-0.46.10
similarity index 69%
rename from metadata/md5-cache/dev-lang/vala-0.46.9
rename to metadata/md5-cache/dev-lang/vala-0.46.10
index 969ed9d6f615..e0a1cf33d66b 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.9
+++ b/metadata/md5-cache/dev-lang/vala-0.46.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.9 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=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] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 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
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.9 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+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.9.tar.xz
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71f2c920ebb631e67f3561e12bd1f7bc
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.7 b/metadata/md5-cache/dev-lang/vala-0.46.7
index 53193e8c98d1..1f022a58a63e 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.7
+++ b/metadata/md5-cache/dev-lang/vala-0.46.7
@@ -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.7 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.7.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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=502cd81623677c917f98fbce62747f47
+_md5_=38192c265a4bd2714fffce1226ec5266
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.5 b/metadata/md5-cache/dev-lang/vala-0.48.6
similarity index 88%
rename from metadata/md5-cache/dev-lang/vala-0.48.5
rename to metadata/md5-cache/dev-lang/vala-0.48.6
index f08d825d59e6..c8e5ccef2602 100644
--- a/metadata/md5-cache/dev-lang/vala-0.48.5
+++ b/metadata/md5-cache/dev-lang/vala-0.48.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.5 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=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] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 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
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.5 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+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.5.tar.xz
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dd48cd961ee51164de3dcd3e5395232
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4969bb1258d0..c93175616718 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.5.2 b/metadata/md5-cache/dev-libs/antlr-c-3.5.2
index d318057a1c02..fc6b8fb25d4a 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5.2
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.5.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The ANTLR3 C Runtime
 EAPI=5
-HOMEPAGE=http://www.antlr3.org/
+HOMEPAGE=https://www.antlr3.org/
 IUSE=debug debugger 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=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=312c0d7dbca52740dfa0ce9014dc21b3
+_md5_=506207a5b12fc75befe50912b6399d18
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1 b/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
index daee39fd92bf..4e50de57274f 100644
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
+++ b/metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( app-doc/doxygen[dot] )
 DESCRIPTION=The ANTLR3 C Runtime
 EAPI=7
-HOMEPAGE=http://www.antlr3.org/
+HOMEPAGE=https://www.antlr3.org/
 IUSE=debug debugger 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=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0fb15d153dd434fc700e9c3b2e4efbc2
+_md5_=638b9412efd98558ab045fe2aca279bf
diff --git a/metadata/md5-cache/dev-libs/atk-2.34.1 b/metadata/md5-cache/dev-libs/atk-2.34.1
index 2b04ac110f86..b05b5d19de99 100644
--- a/metadata/md5-cache/dev-libs/atk-2.34.1
+++ b/metadata/md5-cache/dev-libs/atk-2.34.1
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.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-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.34/atk-2.34.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5649d9d6f79c703721ba4dd2b06d800a
+_md5_=797437ec1a8191277884b72823ed4870
diff --git a/metadata/md5-cache/dev-libs/cgilib-0.7-r1 b/metadata/md5-cache/dev-libs/cgilib-0.7-r1
index b452b28d590f..7f22266bf52e 100644
--- a/metadata/md5-cache/dev-libs/cgilib-0.7-r1
+++ b/metadata/md5-cache/dev-libs/cgilib-0.7-r1
@@ -2,11 +2,11 @@ BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DEFINED_PHASES=configure prepare
 DESCRIPTION=A simple and lightweight interface to the CGI for C and C++ programs
 EAPI=7
-HOMEPAGE=http://www.infodrom.org/projects/cgilib/
+HOMEPAGE=https://www.infodrom.org/projects/cgilib/
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://www.infodrom.org/projects/cgilib/download/cgilib-0.7.tar.gz
+SRC_URI=https://www.infodrom.org/projects/cgilib/download/cgilib-0.7.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=142adb8d3a1c3a61495014bb4cd1cb5e
+_md5_=50e683b486d73a46e595fbe9f2faedc8
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.5 b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
index 875c72bc9740..b9056c4df666 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.1.5
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
 EAPI=7
 HOMEPAGE=https://github.com/google/double-conversion
-KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.1.5.tar.gz -> double-conversion-3.1.5.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e58768aad7dc94a9b20e5d6422eed6d
+_md5_=fafc4e5d2508615bc300846115f7b3b3
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
index aa8befbdfe96..b4dc04262e2e 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Memory efficient serialization library
 EAPI=7
 HOMEPAGE=https://google.github.io/flatbuffers/
 IUSE=static-libs test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz -> flatbuffers-1.12.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec5bec90f7da0fc37e2348d5865ab033
+_md5_=0a38138cd8d2c016218610f037cf872b
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.9 b/metadata/md5-cache/dev-libs/fribidi-1.0.9
index 37dd386cefcf..a05718facda6 100644
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.9
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.9
@@ -4,9 +4,9 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=7
 HOMEPAGE=https://fribidi.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 ~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=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=cd5d5b1e02172afbbe43e715eb73d8d0
+_md5_=26ff5c95924fcb4f78b7be002e1a60ac
diff --git a/metadata/md5-cache/dev-libs/gdl-3.28.0 b/metadata/md5-cache/dev-libs/gdl-3.28.0
index 6c605bfcff69..f43fa0b04c78 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.28.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.28.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME docking library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdl
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=3/5
 SRC_URI=mirror://gnome/sources/gdl/3.28/gdl-3.28.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11c5a8b5d2ab84818a9f7bff9d822a1e
+_md5_=5c5a25cd2a4664c32b376054312ad77a
diff --git a/metadata/md5-cache/dev-libs/gjs-1.58.8 b/metadata/md5-cache/dev-libs/gjs-1.58.8
new file mode 100644
index 000000000000..c19d705f5cd0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gjs-1.58.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=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] ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 ) virtual/pkgconfig test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=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
+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	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2cb44a3a9b87294d983cb0ee34883cd2
diff --git a/metadata/md5-cache/dev-libs/glib-2.62.6 b/metadata/md5-cache/dev-libs/glib-2.62.6
index 511437c31496..7390c3fac264 100644
--- a/metadata/md5-cache/dev-libs/glib-2.62.6
+++ b/metadata/md5-cache/dev-libs/glib-2.62.6
@@ -5,7 +5,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr 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=~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=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.62.6 >=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(-)?] >=dev-libs/libpcre-8.31: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(-)?,static-libs?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/libelf:0= fam? ( >=virtual/fam-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(-)?] )
@@ -13,4 +13,4 @@ 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	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=425276909c8be2526c879a450d6d5b37
+_md5_=fa649dea47d17dfd3b67c5d1c0e63239
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0
index 3be997c171a2..6292f5adf361 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.62.0
@@ -5,7 +5,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=doctool gtk-doc test 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 ~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=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.62.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ) virtual/pkgconfig 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] )
 REQUIRED_USE=^^ ( 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=mirror://gnome/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc61db972eef995bbe21811b8a7b6ff7
+_md5_=a4da4dba07642f6f35cdd8bb74ec08c5
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
index 11e263d24baf..b74a75dc71b7 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-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=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.62.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=d7f392b523b3da5da40b5e6688588ff1
+_md5_=edb74cfbc939763813970ce2d4ca3eeb
diff --git a/metadata/md5-cache/dev-libs/jthread-1.3.3 b/metadata/md5-cache/dev-libs/jthread-1.3.3
index a9b7573f8304..bca0e26564fb 100644
--- a/metadata/md5-cache/dev-libs/jthread-1.3.3
+++ b/metadata/md5-cache/dev-libs/jthread-1.3.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=JThread provides some classes to make use of threads easy on different platforms
 EAPI=6
-HOMEPAGE=http://research.edm.uhasselt.be/jori/page/CS/Jthread.html
+HOMEPAGE=https://research.edm.uhasselt.be/jori/page/CS/Jthread.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 x86
 LICENSE=MIT
 SLOT=0/1.3.3
-SRC_URI=http://research.edm.uhasselt.be/jori/jthread/jthread-1.3.3.tar.bz2
+SRC_URI=https://research.edm.uhasselt.be/jori/jthread/jthread-1.3.3.tar.bz2
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c75a7a699120e1a5d96e615f4f026a2c
+_md5_=d16e94497278348921ac453a1667d9d8
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1 b/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
index 555235418a18..dfe405266e4f 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A linkable library for Git
 EAPI=7
 HOMEPAGE=https://libgit2.org
 IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.0
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.0.0.tar.gz -> libgit2-1.0.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=609656489dc62465e200ecb831fa2c09
+_md5_=78fd461b6d9e88fbfe713c5a16dc7369
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.0.1 b/metadata/md5-cache/dev-libs/libgit2-1.0.1
new file mode 100644
index 000000000000..f7c51fe1760a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig
+DESCRIPTION=A linkable library for Git
+EAPI=7
+HOMEPAGE=https://libgit2.org
+IUSE=examples gssapi libressl +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.0
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz -> libgit2-1.0.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=609656489dc62465e200ecb831fa2c09
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r1 b/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r1
index 6976cab2c50c..a16131375c35 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Git library for GLib
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
 IUSE=gtk-doc python +ssh +vala python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-1.54:= >=dev-libs/glib-2.44.0:2 <dev-libs/libgit2-1.1:0=[ssh?] >=dev-libs/libgit2-0.26.0:0 python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c43805c08784dbb04806ae6ed209f6d4
+_md5_=7aafc3f9535f6c98f02e0cd01b31aadc
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
index b8a069dadbed..3af47cb372ee 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a C client library to the memcached server
 EAPI=5
-HOMEPAGE=http://libmemcached.org/libMemcached.html
+HOMEPAGE=https://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e19020f52d1e660b81d0d033980eef27
+_md5_=49c8473971f18a954303aca9c82b400f
diff --git a/metadata/md5-cache/dev-libs/libressl-3.2.0 b/metadata/md5-cache/dev-libs/libressl-3.2.0
new file mode 100644
index 000000000000..8c258d60019d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-3.2.0
@@ -0,0 +1,17 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0
+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
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/48
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.2.0.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=88c742d303a630e74ec0100af8250a13
diff --git a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1 b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
new file mode 100644
index 000000000000..2dd175577136
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=X? ( x11-libs/libX11 )
+DESCRIPTION=libspnav is a replacement for the magellan library with a cleaner API
+EAPI=7
+HOMEPAGE=http://spacenav.sourceforge.net/
+IUSE=static-libs X
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-misc/spacenavd[X?] X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=1eeda7af9833bd6555a07132167dd79c
diff --git a/metadata/md5-cache/dev-libs/libtommath-1.1.0 b/metadata/md5-cache/dev-libs/libtommath-1.1.0
index 06f976340ba1..a42981bde2fa 100644
--- a/metadata/md5-cache/dev-libs/libtommath-1.1.0
+++ b/metadata/md5-cache/dev-libs/libtommath-1.1.0
@@ -2,11 +2,11 @@ BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Optimized and portable routines for integer theoretic applications
 EAPI=7
-HOMEPAGE=http://www.libtom.net/
+HOMEPAGE=https://www.libtom.net/
 IUSE=doc examples static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/libtom/libtommath/releases/download/v1.1.0/ltm-1.1.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5a67b6c589fd0040e881b3cac8282d0b
+_md5_=83f1d6c9a3977b7c6eea65b5db135f1f
diff --git a/metadata/md5-cache/dev-libs/libudfread-1.0.0 b/metadata/md5-cache/dev-libs/libudfread-1.0.0-r1
similarity index 81%
rename from metadata/md5-cache/dev-libs/libudfread-1.0.0
rename to metadata/md5-cache/dev-libs/libudfread-1.0.0-r1
index f6c21cafce98..37ffc78b6539 100644
--- a/metadata/md5-cache/dev-libs/libudfread-1.0.0
+++ b/metadata/md5-cache/dev-libs/libudfread-1.0.0-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for reading UDF from raw devices and image files
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/libudfread/
-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
+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 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libudfread/-/archive/1.0.0/libudfread-1.0.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f4538f225215e176e923a055adf5edf2
+_md5_=8369341bed0da47fe1419c82da0130ed
diff --git a/metadata/md5-cache/dev-libs/libudfread-9999 b/metadata/md5-cache/dev-libs/libudfread-9999
index 75a3690588d5..cd27b0f9f608 100644
--- a/metadata/md5-cache/dev-libs/libudfread-9999
+++ b/metadata/md5-cache/dev-libs/libudfread-9999
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Library for reading UDF from raw devices and image files
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/libudfread/
-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
+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
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7cbe51d3d5f05882ed3cb47b71ec26b9
+_md5_=8369341bed0da47fe1419c82da0130ed
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.5 b/metadata/md5-cache/dev-libs/libyaml-0.2.5
new file mode 100644
index 000000000000..f1577107fd7a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.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=doc? ( app-doc/doxygen )
+DESCRIPTION=YAML 1.1 parser and emitter written in C
+EAPI=7
+HOMEPAGE=https://github.com/yaml/libyaml
+IUSE=doc static-libs test
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/yaml/libyaml/archive/0.2.5.tar.gz -> libyaml-0.2.5.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=6a053a801107aa480ec5c39418af98c9
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 a0d2baac7628..47ca26638735 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
+++ b/metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install setup
 DEPEND=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 )
 DESCRIPTION=Library of C++ classes for logging to files, syslog and other destinations
 EAPI=6
-HOMEPAGE=http://logging.apache.org/log4cxx/
+HOMEPAGE=https://logging.apache.org/log4cxx/
 IUSE=iodbc unicode odbc smtp
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos
 LICENSE=Apache-2.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 odbc? ( iodbc? ( >=dev-db/libiodbc-3.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz
-_md5_=54cde8dbc441f4b503bc2aade8153e5d
+_md5_=f21681c6e3cce2527c0297e2552ffb93
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.8.3 b/metadata/md5-cache/dev-libs/pegtl-2.8.3
new file mode 100644
index 000000000000..d23941f2c4d0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pegtl-2.8.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=header-only library for creating parsers according to Parsing Expression Grammar
+EAPI=7
+HOMEPAGE=https://github.com/taocpp/PEGTL
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/taocpp/PEGTL/archive/2.8.3.tar.gz -> pegtl-2.8.3.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=210bdd642d10175842d7fda9dca5c119
diff --git a/metadata/md5-cache/dev-libs/qcustomplot-2.0.0 b/metadata/md5-cache/dev-libs/qcustomplot-2.0.0
deleted file mode 100644
index f7a70acab84c..000000000000
--- a/metadata/md5-cache/dev-libs/qcustomplot-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-DESCRIPTION=Qt C++ widget for plotting and data visualization
-EAPI=6
-HOMEPAGE=https://www.qcustomplot.com/
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://www.qcustomplot.com/release/2.0.0/QCustomPlot-sharedlib.tar.gz -> qcustomplot-sharedlib-2.0.0.tar.gz https://www.qcustomplot.com/release/2.0.0/QCustomPlot-source.tar.gz -> qcustomplot-source-2.0.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bb0f02bd004e8dc38385b5ade42b80e9
diff --git a/metadata/md5-cache/dev-libs/qcustomplot-2.0.1 b/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
index b29e0e3eac52..7c15b2912d99 100644
--- a/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
+++ b/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 DESCRIPTION=Qt C++ widget for plotting and data visualization
 EAPI=7
 HOMEPAGE=https://www.qcustomplot.com/
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://www.qcustomplot.com/release/2.0.1/QCustomPlot-sharedlib.tar.gz -> qcustomplot-sharedlib-2.0.1.tar.gz https://www.qcustomplot.com/release/2.0.1/QCustomPlot-source.tar.gz -> qcustomplot-source-2.0.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bc6dafa2e413a51defc08feef945980e
+_md5_=59431df6141bcb625bd5321c8c650264
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.05.01 b/metadata/md5-cache/dev-libs/re2-0.2020.05.01
index 9a73cbe9f138..c02a7b6d3fa0 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2020.05.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2020.05.01
@@ -5,10 +5,10 @@ DESCRIPTION=An efficient, principled regular expression library
 EAPI=7
 HOMEPAGE=https://github.com/google/re2
 IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/7
 SRC_URI=https://github.com/google/re2/archive/2020-05-01.tar.gz -> re2-2020-05-01.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=58087b0e4162104af7ebdde520fcf16e
+_md5_=43d9d252e62d353de079bb3dc0f3d51d
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.5.0 b/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
similarity index 95%
rename from metadata/md5-cache/dev-libs/spdlog-1.5.0
rename to metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
index d8ebab43c3b7..d051b3826134 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.5.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.5.0.tar.gz -> spdlog-1.5.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f8df01fca76a01a11d09e24dfe828b7
+_md5_=384edabd53265cc59ba6da5ab696630a
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.6.0 b/metadata/md5-cache/dev-libs/spdlog-1.6.0
new file mode 100644
index 000000000000..c59ef0c72140
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/spdlog-1.6.0
@@ -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.0.tar.gz -> spdlog-1.6.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8a27801ad823694e8ca38a7a9a07def
diff --git a/metadata/md5-cache/dev-libs/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index 4991333921da..cf654cde1455 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libfmt-5.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=774f640ef61dbaa061ca2f577444a6c6
+_md5_=55844ea9ace0b0c2017e99ca0fc7e680
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.5 b/metadata/md5-cache/dev-libs/vala-common-0.46.10
similarity index 87%
rename from metadata/md5-cache/dev-libs/vala-common-0.48.5
rename to metadata/md5-cache/dev-libs/vala-common-0.46.10
index b37f445a3c34..3b8485acea2a 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.48.5
+++ b/metadata/md5-cache/dev-libs/vala-common-0.46.10
@@ -6,6 +6,6 @@ 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
 LICENSE=LGPL-2.1+
 SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.5.tar.xz
+SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.10.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
 _md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.46.7 b/metadata/md5-cache/dev-libs/vala-common-0.46.7
index 3fc5563ed87d..b7d4956d434c 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.46.7
+++ b/metadata/md5-cache/dev-libs/vala-common-0.46.7
@@ -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.46/vala-0.46.7.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=5aade13cda99068471e7b0b76ff23dfa
+_md5_=98f675cb694f5d41a4687802733ba0a2
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.46.9 b/metadata/md5-cache/dev-libs/vala-common-0.48.6
similarity index 87%
rename from metadata/md5-cache/dev-libs/vala-common-0.46.9
rename to metadata/md5-cache/dev-libs/vala-common-0.48.6
index fef4478855c3..d8477a7caf64 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.46.9
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.6
@@ -6,6 +6,6 @@ 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
 LICENSE=LGPL-2.1+
 SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.9.tar.xz
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.6.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
 _md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.0 b/metadata/md5-cache/dev-libs/vc-1.3.0
index d45c24420357..156c1ae3b821 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.0
+++ b/metadata/md5-cache/dev-libs/vc-1.3.0
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://github.com/VcDevel/Vc
 IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-3
+LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.0-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.0-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.0-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.0-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.0-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.0-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.0-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.0-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.0-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.0-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.0-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.0-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.0-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.0-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.0.tar.gz -> vc-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d91b1ec829097b9d2f707ad4db3b7ea9
+_md5_=2ed3a985df4a796aa8386cec1b8c5c9c
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.3 b/metadata/md5-cache/dev-libs/vc-1.3.3
index 9e0c3abc7f32..1b9b9b1affe1 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.3
+++ b/metadata/md5-cache/dev-libs/vc-1.3.3
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://github.com/VcDevel/Vc
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-3
+LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.3-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.3-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.3-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.3-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.3-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.3-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.3-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.3-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.3-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.3-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.3-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.3-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.3-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.3-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.3.tar.gz -> vc-1.3.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0439f8f11fc53c98a3a777fc602ee6b
+_md5_=af9b50772911c3a9fa6d823f9985262e
diff --git a/metadata/md5-cache/dev-libs/vc-1.4.1 b/metadata/md5-cache/dev-libs/vc-1.4.1
index cef8dcb39df2..0a10a64d8b96 100644
--- a/metadata/md5-cache/dev-libs/vc-1.4.1
+++ b/metadata/md5-cache/dev-libs/vc-1.4.1
@@ -4,8 +4,8 @@ DESCRIPTION=SIMD Vector Class Library for C++
 EAPI=6
 HOMEPAGE=https://github.com/VcDevel/Vc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-3
+LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/VcDevel/Vc/archive/1.4.1.tar.gz -> vc-1.4.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01fb122d1d45202fbaf91bda25551541
+_md5_=e06131fdf5ab576fcd966b732ee4f7e1
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.6.5 b/metadata/md5-cache/dev-libs/xxhash-0.6.5
index a4677cdca09d..b2b484918174 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.6.5
+++ b/metadata/md5-cache/dev-libs/xxhash-0.6.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=6
-HOMEPAGE=https://www.xxhash.com
+HOMEPAGE=http://www.xxhash.net
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.6.5.tar.gz -> xxhash-0.6.5.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e1b9b86ee97bbcc27258528cdeede2f0
+_md5_=3e5594a8dc62cb97311b44ac2c192eb5
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.7.1 b/metadata/md5-cache/dev-libs/xxhash-0.7.1
index b53a552dccda..80d2795132e4 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.7.1
+++ b/metadata/md5-cache/dev-libs/xxhash-0.7.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=7
-HOMEPAGE=https://www.xxhash.com
+HOMEPAGE=http://www.xxhash.net
 IUSE=static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.7.1.tar.gz -> xxhash-0.7.1.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=63bd1b3ce81d09e0d9693b01a64c2721
+_md5_=aef08d314082ddaaa8dabf6ab7c7f07e
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.7.3 b/metadata/md5-cache/dev-libs/xxhash-0.7.3
index 9ef1b730fcbf..57d3aaaad7de 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.7.3
+++ b/metadata/md5-cache/dev-libs/xxhash-0.7.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=7
-HOMEPAGE=https://www.xxhash.com
+HOMEPAGE=http://www.xxhash.net
 IUSE=static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=63bd1b3ce81d09e0d9693b01a64c2721
+_md5_=aef08d314082ddaaa8dabf6ab7c7f07e
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 7dac1f59f41d..681ef5850e01 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/astring-0.8.3 b/metadata/md5-cache/dev-ml/astring-0.8.3
index 1d9f84d24b9d..aacffb4f30d7 100644
--- a/metadata/md5-cache/dev-ml/astring-0.8.3
+++ b/metadata/md5-cache/dev-ml/astring-0.8.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Alternative String module for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/astring https://github.com/dbuenzli/astring
+HOMEPAGE=https://erratique.ch/software/astring https://github.com/dbuenzli/astring
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 SLOT=0/0.8.3
-SRC_URI=http://erratique.ch/software/astring/releases/astring-0.8.3.tbz
+SRC_URI=https://erratique.ch/software/astring/releases/astring-0.8.3.tbz
 _eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=bf19617785588138c4b41ef0b8bb0499
+_md5_=394c66729d8398c752a2d767955615fb
diff --git a/metadata/md5-cache/dev-ml/bos-0.1.6 b/metadata/md5-cache/dev-ml/bos-0.1.6
index 5f6c178bfeb3..3728a4195d8b 100644
--- a/metadata/md5-cache/dev-ml/bos-0.1.6
+++ b/metadata/md5-cache/dev-ml/bos-0.1.6
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install test
 DEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:= dev-ml/findlib dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/mtime )
 DESCRIPTION=Basic OS interaction for OCaml
 EAPI=6
-HOMEPAGE=http://erratique.ch/software/bos https://github.com/dbuenzli/bos
+HOMEPAGE=https://erratique.ch/software/bos https://github.com/dbuenzli/bos
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
-SRC_URI=http://erratique.ch/software/bos/releases/bos-0.1.6.tbz
-_md5_=2f5814171c21faa368bee3b9bb577962
+SRC_URI=https://erratique.ch/software/bos/releases/bos-0.1.6.tbz
+_md5_=7e8033cb1bd415ec6e1af9097f74b96e
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.0 b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
index 062c116773b5..35d382a308ed 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.0
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
+HOMEPAGE=https://erratique.ch/software/cmdliner
 IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
+SRC_URI=https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=79feb9b363ab3054388233c3afeb32cf
+_md5_=c119c0eda463610e855d6b4ce3f9c830
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.1 b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
index 0adcfb1a870a..fa7be826e389 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.1
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
+HOMEPAGE=https://erratique.ch/software/cmdliner
 IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.1.tbz
+SRC_URI=https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.1.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=79feb9b363ab3054388233c3afeb32cf
+_md5_=c119c0eda463610e855d6b4ce3f9c830
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.2 b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
index b0c36b8863ce..58f480b71c52 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.2
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
+HOMEPAGE=https://erratique.ch/software/cmdliner
 IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz
+SRC_URI=https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=79feb9b363ab3054388233c3afeb32cf
+_md5_=c119c0eda463610e855d6b4ce3f9c830
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.4 b/metadata/md5-cache/dev-ml/fmt-0.8.4
index 55a9fc9f5ee2..9642ad6f5559 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.4
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.4
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
+HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.4
-SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
+SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=a5e4eaeea3f00b0446c044271b023de4
+_md5_=0943fd6eb645f0ad044ac64e6ad1fbc9
diff --git a/metadata/md5-cache/dev-ml/fpath-0.7.2 b/metadata/md5-cache/dev-ml/fpath-0.7.2
index f4bbfdf5ca16..8b9bc215d207 100644
--- a/metadata/md5-cache/dev-ml/fpath-0.7.2
+++ b/metadata/md5-cache/dev-ml/fpath-0.7.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-ml/result:= dev-ml/astring:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=File system paths for OCaml
 EAPI=6
-HOMEPAGE=http://erratique.ch/software/fpath https://github.com/dbuenzli/fpath
+HOMEPAGE=https://erratique.ch/software/fpath https://github.com/dbuenzli/fpath
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.2
-SRC_URI=http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz
+SRC_URI=https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz
 _eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=4f19f4661dd9d1c4a0500436dfb86298
+_md5_=2fea3947c7078d4c95c57f18739c79a9
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index bcb179bd1056..fc89c74957fe 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Non-blocking streaming JSON codec for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/jsonm
+HOMEPAGE=https://erratique.ch/software/jsonm
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
 SLOT=0/1.0.1
-SRC_URI=http://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
+SRC_URI=https://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=b43f5749f7d472155a39fdfb392a7d7b
+_md5_=c56ddeca7e680b3a21ade99e3dabc59a
diff --git a/metadata/md5-cache/dev-ml/logs-0.6.2 b/metadata/md5-cache/dev-ml/logs-0.6.2
index ee89d3a4f311..ac51431a6ffa 100644
--- a/metadata/md5-cache/dev-ml/logs-0.6.2
+++ b/metadata/md5-cache/dev-ml/logs-0.6.2
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= ) dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib test? ( dev-ml/mtime ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Logging infrastructure for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/logs https://github.com/dbuenzli/logs
+HOMEPAGE=https://erratique.ch/software/logs https://github.com/dbuenzli/logs
 IUSE=javascript +fmt cli +lwt test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.2
-SRC_URI=http://erratique.ch/software/logs/releases/logs-0.6.2.tbz
+SRC_URI=https://erratique.ch/software/logs/releases/logs-0.6.2.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=ebd5b5dbf0d5590b0d6ac40172e819c2
+_md5_=813e780e5bf15764a9d5a8bd679e64ef
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index b1bbe9f5d006..d22561a88e41 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=OCaml module to access monotonic wall-clock time
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
+HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
 IUSE=javascript test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
-SRC_URI=http://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
+SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2913272b04fe905f4e39cf85fc90c602
+_md5_=93c7bbb805f54c67e55b061897770193
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.39 b/metadata/md5-cache/dev-ml/ocamlweb-1.39
index 059203dc67d9..5616fb88be8d 100644
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.39
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.39
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst postrm
 DEPEND=>=dev-lang/ocaml-3.09:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=O'Caml literate programming tool
 EAPI=7
-HOMEPAGE=http://www.lri.fr/~filliatr/ocamlweb/
+HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
-SRC_URI=http://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.39.tar.gz
+SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.39.tar.gz
 _eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=449f7ac251141f75d15c52ac965d1a3c
+_md5_=734edb117055e1f176736706ac187987
diff --git a/metadata/md5-cache/dev-ml/parmap-1.0_rc7-r1 b/metadata/md5-cache/dev-ml/parmap-1.0_rc7-r1
index 325c0281f28f..ce3b42213ab0 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.0_rc7-r1
+++ b/metadata/md5-cache/dev-ml/parmap-1.0_rc7-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install test
 DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] dev-ml/findlib dev-ml/ocamlbuild dev-ml/ocaml-autoconf
 DESCRIPTION=Library to exploit multicore architectures for OCaml programs
 EAPI=5
-HOMEPAGE=http://www.dicosmo.org/code/parmap/
+HOMEPAGE=https://www.dicosmo.org/code/parmap/
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2-with-linking-exception
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?]
 SLOT=0/1.0_rc7
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.0-rc7-fix-for4.03+3.tar.gz -> parmap-1.0_rc7-ocaml-4.03.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a68d927fca4397863f7270c216dfcdaa
+_md5_=8258894279e44c9dbf9a746697347ffb
diff --git a/metadata/md5-cache/dev-ml/parmap-1.0_rc8 b/metadata/md5-cache/dev-ml/parmap-1.0_rc8
index 2bf2f9af0640..a7810f0cc94f 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.0_rc8
+++ b/metadata/md5-cache/dev-ml/parmap-1.0_rc8
@@ -2,7 +2,7 @@ DEFINED_PHASES=install test
 DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] dev-ml/findlib dev-ml/ocamlbuild dev-ml/ocaml-autoconf
 DESCRIPTION=Library to exploit multicore architectures for OCaml programs
 EAPI=5
-HOMEPAGE=http://www.dicosmo.org/code/parmap/
+HOMEPAGE=https://www.dicosmo.org/code/parmap/
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2-with-linking-exception
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?]
 SLOT=0/1.0_rc8
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.0-rc8.tar.gz -> parmap-1.0_rc8.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ff3d34f0a9d8f5202123bc38c9d7810b
+_md5_=f72dec3d7ff09bede8df2b31f46c8172
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1 b/metadata/md5-cache/dev-ml/react-1.2.1
index 59db649ec326..fd8b7cef41e0 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.1
+++ b/metadata/md5-cache/dev-ml/react-1.2.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=OCaml module for functional reactive programming
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/react https://github.com/dbuenzli/react
+HOMEPAGE=https://erratique.ch/software/react https://github.com/dbuenzli/react
 IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1
-SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
+SRC_URI=https://erratique.ch/software/react/releases/react-1.2.1.tbz
 _eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=04bb41d5ec647c978d7ffd3317b1a9b6
+_md5_=5a249c84cb721faa3d4060208762d13e
diff --git a/metadata/md5-cache/dev-ml/rresult-0.5.0 b/metadata/md5-cache/dev-ml/rresult-0.5.0
index b1d1c6d025a0..0f78de77728a 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.5.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.5.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Result value combinators for OCaml
 EAPI=6
-HOMEPAGE=http://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
+HOMEPAGE=https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/0.5.0
-SRC_URI=http://erratique.ch/software/rresult/releases/rresult-0.5.0.tbz
+SRC_URI=https://erratique.ch/software/rresult/releases/rresult-0.5.0.tbz
 _eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=9ebd0f5b91bf437a8aedc844fa976268
+_md5_=a9ddede575de757ac0c8b23dc94394cc
diff --git a/metadata/md5-cache/dev-ml/topkg-0.9.0 b/metadata/md5-cache/dev-ml/topkg-0.9.0
index 6443b991721a..829efaf78dba 100644
--- a/metadata/md5-cache/dev-ml/topkg-0.9.0
+++ b/metadata/md5-cache/dev-ml/topkg-0.9.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=The transitory OCaml software packager
 EAPI=6
-HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
+HOMEPAGE=https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.0.tar.gz -> topkg-0.9.0.tar.gz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=fa2c9d36389e05a00dbd15965399cc39
+_md5_=567e25133eaa6640eb94e02a8f350dd0
diff --git a/metadata/md5-cache/dev-ml/topkg-0.9.1 b/metadata/md5-cache/dev-ml/topkg-0.9.1
index 993957428d25..1881fd95d684 100644
--- a/metadata/md5-cache/dev-ml/topkg-0.9.1
+++ b/metadata/md5-cache/dev-ml/topkg-0.9.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=The transitory OCaml software packager
 EAPI=6
-HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
+HOMEPAGE=https://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.1.tar.gz -> topkg-0.9.1.tar.gz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=fa2c9d36389e05a00dbd15965399cc39
+_md5_=567e25133eaa6640eb94e02a8f350dd0
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index 3ead1a7e4974..6daa764ab1e1 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/cmdliner ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=5
-HOMEPAGE=http://erratique.ch/software/uutf
+HOMEPAGE=https://erratique.ch/software/uutf
 IUSE=doc utftrip +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
-SRC_URI=http://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
+SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=5023dfb5ce0f97856c1dfa6d878de247
+_md5_=77371d92e69c8aafea299bd9575176db
diff --git a/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0 b/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
index 296397a8a756..86b7b8192869 100644
--- a/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
+++ b/metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-Encode-1.140.0 virtual/perl-ExtUtils-MakeMaker dev-lang/pe
 DESCRIPTION=An eucJP-open mapping
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Encode-EUCJPASCII
-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
+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 GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-1.140.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=20f315bcdd44c2ec9f138e0713819e87
+_md5_=6df58ce2b6b62ef0054dbeb11b72301b
diff --git a/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2 b/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
index c64bd2333fe4..7c848b4c2325 100644
--- a/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
+++ b/metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Encode dev-lang/perl
 DESCRIPTION=Extra sets of Chinese encodings
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Encode-HanExtra
-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
+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=MIT
 RDEPEND=virtual/perl-Encode dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=877dbf6e99634469157cb77056013965
+_md5_=e42a2a67e3fbe159b9bb4b70bcec8051
diff --git a/metadata/md5-cache/dev-perl/MIME-Charset-1.12.2 b/metadata/md5-cache/dev-perl/MIME-Charset-1.12.2
index 375d41280fee..c45fe04bfee9 100644
--- a/metadata/md5-cache/dev-perl/MIME-Charset-1.12.2
+++ b/metadata/md5-cache/dev-perl/MIME-Charset-1.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=Charset Informations for MIME
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MIME-Charset
 IUSE=l10n_ja l10n_zh
-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=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-1.980.0 l10n_ja? ( >=dev-perl/Encode-EUCJPASCII-0.20.0 ) l10n_zh? ( >=dev-perl/Encode-HanExtra-0.200.0 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9c015c5a2427433c3d50f03d21c77777
+_md5_=7bb0d5ff5bf3dd8197b9c83e499b2e5c
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 71148f366d1f..70c74097de6d 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1 b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
index 430fb785fcb4..2788f95cd42c 100644
--- a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl
 DESCRIPTION=UAX #14 Unicode Line Breaking Algorithm
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Unicode-LineBreak
-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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2017.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=79110a9c113abb29e11045493bfc8e4f
+_md5_=77e60ce96e0ed69c0ccebaef94fd0c87
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
index a26d23825618..6a49529d3e26 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
@@ -4,11 +4,11 @@ DESCRIPTION=Read/Write YAML files with as little code as possible
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/YAML-Tiny
 IUSE=test minimal
-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
+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 GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f20346ce01b58ba5c2ef34f25cfb9723
+_md5_=b59d365d2294315c10f7366bba0e82bd
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 6a485322831a..66c7595f7384 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-DB-1.10.0 b/metadata/md5-cache/dev-php/PEAR-DB-1.10.0
new file mode 100644
index 000000000000..0594a72374dc
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-DB-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR )
+DESCRIPTION=Database abstraction layer for PHP
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/DB
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PHP-3
+RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pear.php.net/get/DB-1.10.0.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=38e2fd1c2cb6cc139bf60621d7e1f022
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.12 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.12
new file mode 100644
index 000000000000..4dd4a5d0158d
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=config install postinst prepare prerm setup
+DESCRIPTION=PEAR Base System
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/PEAR
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[cli(-),xml(-),zlib(-)] >=dev-php/PEAR-Archive_Tar-1.4.9 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.4.0
+SLOT=0
+SRC_URI=https://pear.php.net/get/PEAR-1.10.12.tgz
+_md5_=9a4b4b904fad26c62b261c2471329605
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.5 b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.5
new file mode 100644
index 000000000000..3b646a5fea23
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=XML utility class
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/XML_Util
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=dev-php/PEAR-PEAR
+RDEPEND=dev-lang/php:*[pcre(+)]
+SLOT=0
+SRC_URI=https://pear.php.net/get/XML_Util-1.4.5.tgz
+_md5_=e7d9dc111914f8b2ff323bf11a21d4b8
diff --git a/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2 b/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
index 22d18593aaa3..67bade70b713 100644
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
+++ b/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Collection, processing, and rendering for PHP code coverage
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-1.3 <dev-php/File_Iterator-2.0 >=dev-php/Text_Template-1.2 <dev-php/Text_Template-2.0 >=dev-php/PHP_TokenStream-1.4 <dev-php/PHP_TokenStream-3.0 >=dev-php/sebastian-environment-1.3.2 <dev-php/sebastian-environment-3.0 >=dev-php/sebastian-version-1.0 <dev-php/sebastian-version-3.0 dev-php/sebastian-code-unit-reverse-lookup <dev-php/sebastian-code-unit-reverse-lookup-2.0 || ( dev-lang/php:7.2[xml(-),xmlwriter(-)] )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-code-coverage/archive/4.0.7.tar.gz -> PHP_CodeCoverage-4.0.7.tar.gz
-_md5_=746956f81f3157a4d55c602a7fe59f74
+_md5_=0c348be8ea0c51c5563ec3f8f06f30ed
diff --git a/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1 b/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1
index 4f697caf5943..5556ed36ac82 100644
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1
+++ b/metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 <dev-php
 DEFINED_PHASES=install postinst test
 DESCRIPTION=Collection, processing, and rendering for PHP code coverage
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 <dev-php/File_It
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-code-coverage/archive/7.0.10.tar.gz -> PHP_CodeCoverage-7.0.10.tar.gz
-_md5_=04538d3157f4e5e0c52d61bf3b423251
+_md5_=faf0ddb313d7669337a18d3d1302029a
diff --git a/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1 b/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
index 914cceddfda4..445aeae54da9 100644
--- a/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
+++ b/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Wrapper around PHP's tokenizer extension
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader || ( dev-lang/php:7.2[tokenizer(-)] )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-token-stream/archive/1.4.11.tar.gz -> PHP_TokenStream-1.4.11.tar.gz
-_md5_=8334fc7dfb734a42ec455e7a5b839c6b
+_md5_=a539f5fc4fe9e182800cf8490b0a96c9
diff --git a/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1 b/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
index 84ec98057f18..dd7813a4d582 100644
--- a/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
+++ b/metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-php/fedora-autoloader || ( dev-lang/php:7.2[tokenizer(-)] de
 DEFINED_PHASES=install postinst prepare test
 DESCRIPTION=Wrapper around PHP's tokenizer extension
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-php/fedora-autoloader || ( dev-lang/php:7.2[tokenizer(-)] dev-lang/p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-token-stream/archive/3.1.1.tar.gz -> PHP_TokenStream-3.1.1.tar.gz
-_md5_=f7b312215a433d467467c21086a05072
+_md5_=5afcd974239479792d03fa52e96a3ff5
diff --git a/metadata/md5-cache/dev-php/Text_Template-1.2.1 b/metadata/md5-cache/dev-php/Text_Template-1.2.1
index df4b08c71d01..24576a488532 100644
--- a/metadata/md5-cache/dev-php/Text_Template-1.2.1
+++ b/metadata/md5-cache/dev-php/Text_Template-1.2.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A simple template engine
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-text-template/archive/1.2.1.tar.gz -> Text_Template-1.2.1.tar.gz
-_md5_=44253323ca9425754e83e9ee7a4bff12
+_md5_=532d3e3c3f4b163e460d63958103f4b3
diff --git a/metadata/md5-cache/dev-php/libchart-1.3 b/metadata/md5-cache/dev-php/libchart-1.3
index f966ad140101..5c2d637768c9 100644
--- a/metadata/md5-cache/dev-php/libchart-1.3
+++ b/metadata/md5-cache/dev-php/libchart-1.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=Easy-to-use chart creation library for PHP
 EAPI=6
-HOMEPAGE=http://naku.dohcrew.com/libchart https://github.com/naku/libchart
+HOMEPAGE=https://naku.dohcrew.com/libchart https://github.com/naku/libchart
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 BitstreamVera
 RDEPEND=dev-lang/php:*[gd,truetype]
 SLOT=0
 SRC_URI=https://github.com/naku/libchart/releases/download/release/1.3/libchart-1.3.tar.gz
-_md5_=43c015d814861f69a0fc8489c4b247bf
+_md5_=a49eb544dbd9604dfe7c3a4bf87dd9b9
diff --git a/metadata/md5-cache/dev-php/phpunit-5.7.15-r3 b/metadata/md5-cache/dev-php/phpunit-5.7.15-r3
index 50b350e51d95..d48705c1bbe6 100644
--- a/metadata/md5-cache/dev-php/phpunit-5.7.15-r3
+++ b/metadata/md5-cache/dev-php/phpunit-5.7.15-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A PHP Unit Testing framework
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-1.4.0 <dev-php/File_Iterator-2.0 >=dev-php/Text_Template-1.2.0 <dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-4.0.4 <dev-php/PHP_CodeCoverage-5.0 >=dev-php/PHP_Timer-1.0.6 <dev-php/PHP_Timer-2.0 <dev-php/myclabs-deepcopy-2.0 <dev-php/phpspec-prophecy-2.0 <dev-php/phpunit-mock-objects-4.0 <dev-php/sebastian-comparator-2.0 <dev-php/sebastian-diff-2.0 <dev-php/sebastian-environment-3.0 <dev-php/sebastian-exporter-3.0 <dev-php/sebastian-global-state-2.0 <dev-php/sebastian-object-enumerator-3.0 <dev-php/sebastian-resource-operations-2.0 <dev-php/sebastian-version-3.0 <dev-php/symfony-yaml-4.0 || ( dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-)] )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/5.7.15.tar.gz -> phpunit-5.7.15.tar.gz
-_md5_=c1f7ce955292394fd7a9c44333ba5d44
+_md5_=c1dbcb8954756b7a3678be526aef0aa6
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.0 b/metadata/md5-cache/dev-php/phpunit-8.5.0
index 30531c7f52eb..933cfe714323 100644
--- a/metadata/md5-cache/dev-php/phpunit-8.5.0
+++ b/metadata/md5-cache/dev-php/phpunit-8.5.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A PHP Unit Testing framework
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 <dev-php/File_Iterator-3.0 >=dev-php/Text_Template-1.2.1 <dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-7.0.7 <dev-php/PHP_CodeCoverage-8.0 >=dev-php/PHP_Timer-2.1.2 <dev-php/PHP_Timer-3.0 >=dev-php/doctrine-instantiator-1.2 <dev-php/doctrine-instantiator-2.0 >=dev-php/myclabs-deepcopy-1.9.1 <dev-php/myclabs-deepcopy-2.0 >=dev-php/phar-io-manifest-1.0.3 <dev-php/phar-io-manifest-2.0 >=dev-php/phar-io-version-2.0.1 <dev-php/phar-io-version-3.0 >=dev-php/phpspec-prophecy-1.8.1 <dev-php/phpspec-prophecy-2.0 >=dev-php/sebastian-comparator-3.0.2 <dev-php/sebastian-comparator-4.0 >=dev-php/sebastian-diff-3.0.2 <dev-php/sebastian-diff-4.0 >=dev-php/sebastian-environment-4.2.2 <dev-php/sebastian-environment-5.0 >=dev-php/sebastian-exporter-3.1.1 <dev-php/sebastian-exporter-4.0 >=dev-php/sebastian-global-state-3.0 <dev-php/sebastian-global-state-4.0 >=dev-php/sebastian-object-enumerator-3.0.3 <dev-php/sebastian-object-enumerator-4.0 >=dev-php/sebastian-resource-operations-2.0.1 <dev-php/sebastian-resource-operations-3.0 <dev-php/sebastian-type-2.0 <dev-php/sebastian-version-3.0 >=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] !dev-php/phpunit-mock-objects
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.0.tar.gz -> phpunit-8.5.0.tar.gz
-_md5_=d2d77d46ac55f1d3f935c89b79e08375
+_md5_=7af131fac10b589f7a069fc935ad9eef
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.1 b/metadata/md5-cache/dev-php/phpunit-8.5.1
index e85f2b7d013f..8d5bfc1a28fa 100644
--- a/metadata/md5-cache/dev-php/phpunit-8.5.1
+++ b/metadata/md5-cache/dev-php/phpunit-8.5.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A PHP Unit Testing framework
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 <dev-php/File_Iterator-3.0 >=dev-php/Text_Template-1.2.1 <dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-7.0.7 <dev-php/PHP_CodeCoverage-8.0 >=dev-php/PHP_Timer-2.1.2 <dev-php/PHP_Timer-3.0 >=dev-php/doctrine-instantiator-1.2 <dev-php/doctrine-instantiator-2.0 >=dev-php/myclabs-deepcopy-1.9.1 <dev-php/myclabs-deepcopy-2.0 >=dev-php/phar-io-manifest-1.0.3 <dev-php/phar-io-manifest-2.0 >=dev-php/phar-io-version-2.0.1 <dev-php/phar-io-version-3.0 >=dev-php/phpspec-prophecy-1.8.1 <dev-php/phpspec-prophecy-2.0 >=dev-php/sebastian-comparator-3.0.2 <dev-php/sebastian-comparator-4.0 >=dev-php/sebastian-diff-3.0.2 <dev-php/sebastian-diff-4.0 >=dev-php/sebastian-environment-4.2.2 <dev-php/sebastian-environment-5.0 >=dev-php/sebastian-exporter-3.1.1 <dev-php/sebastian-exporter-4.0 >=dev-php/sebastian-global-state-3.0 <dev-php/sebastian-global-state-4.0 >=dev-php/sebastian-object-enumerator-3.0.3 <dev-php/sebastian-object-enumerator-4.0 >=dev-php/sebastian-resource-operations-2.0.1 <dev-php/sebastian-resource-operations-3.0 <dev-php/sebastian-type-2.0 <dev-php/sebastian-version-3.0 >=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] !dev-php/phpunit-mock-objects
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.1.tar.gz -> phpunit-8.5.1.tar.gz
-_md5_=d2d77d46ac55f1d3f935c89b79e08375
+_md5_=7af131fac10b589f7a069fc935ad9eef
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.2 b/metadata/md5-cache/dev-php/phpunit-8.5.2
index 4846651530f4..97034da7a3bc 100644
--- a/metadata/md5-cache/dev-php/phpunit-8.5.2
+++ b/metadata/md5-cache/dev-php/phpunit-8.5.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A PHP Unit Testing framework
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 <dev-php/File_Iterator-3.0 >=dev-php/Text_Template-1.2.1 <dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-7.0.7 <dev-php/PHP_CodeCoverage-8.0 >=dev-php/PHP_Timer-2.1.2 <dev-php/PHP_Timer-3.0 >=dev-php/doctrine-instantiator-1.2 <dev-php/doctrine-instantiator-2.0 >=dev-php/myclabs-deepcopy-1.9.1 <dev-php/myclabs-deepcopy-2.0 >=dev-php/phar-io-manifest-1.0.3 <dev-php/phar-io-manifest-2.0 >=dev-php/phar-io-version-2.0.1 <dev-php/phar-io-version-3.0 >=dev-php/phpspec-prophecy-1.8.1 <dev-php/phpspec-prophecy-2.0 >=dev-php/sebastian-comparator-3.0.2 <dev-php/sebastian-comparator-4.0 >=dev-php/sebastian-diff-3.0.2 <dev-php/sebastian-diff-4.0 >=dev-php/sebastian-environment-4.2.2 <dev-php/sebastian-environment-5.0 >=dev-php/sebastian-exporter-3.1.1 <dev-php/sebastian-exporter-4.0 >=dev-php/sebastian-global-state-3.0 <dev-php/sebastian-global-state-4.0 >=dev-php/sebastian-object-enumerator-3.0.3 <dev-php/sebastian-object-enumerator-4.0 >=dev-php/sebastian-resource-operations-2.0.1 <dev-php/sebastian-resource-operations-3.0 <dev-php/sebastian-type-2.0 <dev-php/sebastian-version-3.0 >=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] !dev-php/phpunit-mock-objects
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.2.tar.gz -> phpunit-8.5.2.tar.gz
-_md5_=d2d77d46ac55f1d3f935c89b79e08375
+_md5_=7af131fac10b589f7a069fc935ad9eef
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.4 b/metadata/md5-cache/dev-php/phpunit-8.5.4
index 29da2bfe5a43..d062b1922f38 100644
--- a/metadata/md5-cache/dev-php/phpunit-8.5.4
+++ b/metadata/md5-cache/dev-php/phpunit-8.5.4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=A PHP Unit Testing framework
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 <dev-php/File_Iterator-3.0 >=dev-php/Text_Template-1.2.1 <dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-7.0.7 <dev-php/PHP_CodeCoverage-8.0 >=dev-php/PHP_Timer-2.1.2 <dev-php/PHP_Timer-3.0 >=dev-php/doctrine-instantiator-1.2 <dev-php/doctrine-instantiator-2.0 >=dev-php/myclabs-deepcopy-1.9.1 <dev-php/myclabs-deepcopy-2.0 >=dev-php/phar-io-manifest-1.0.3 <dev-php/phar-io-manifest-2.0 >=dev-php/phar-io-version-2.0.1 <dev-php/phar-io-version-3.0 >=dev-php/phpspec-prophecy-1.8.1 <dev-php/phpspec-prophecy-2.0 >=dev-php/sebastian-comparator-3.0.2 <dev-php/sebastian-comparator-4.0 >=dev-php/sebastian-diff-3.0.2 <dev-php/sebastian-diff-4.0 >=dev-php/sebastian-environment-4.2.2 <dev-php/sebastian-environment-5.0 >=dev-php/sebastian-exporter-3.1.1 <dev-php/sebastian-exporter-4.0 >=dev-php/sebastian-global-state-3.0 <dev-php/sebastian-global-state-4.0 >=dev-php/sebastian-object-enumerator-3.0.3 <dev-php/sebastian-object-enumerator-4.0 >=dev-php/sebastian-resource-operations-2.0.1 <dev-php/sebastian-resource-operations-3.0 <dev-php/sebastian-type-2.0 <dev-php/sebastian-version-3.0 >=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] !dev-php/phpunit-mock-objects
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.4.tar.gz -> phpunit-8.5.4.tar.gz
-_md5_=d2d77d46ac55f1d3f935c89b79e08375
+_md5_=7af131fac10b589f7a069fc935ad9eef
diff --git a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3 b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
index 9fad8a184cc8..1f1f7bd692c7 100644
--- a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
+++ b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Mock Object library for PHPUnit
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/Text_Template-1.2 !>=dev-php/Text_Template-2.0 <dev-php/doctrine-instantiator-2.0 <dev-php/sebastian-exporter-3.0 !<dev-php/phpunit-5.4.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit-mock-objects/archive/3.4.3.tar.gz -> phpunit-mock-objects-3.4.3.tar.gz
-_md5_=9a5b5655de6b74095927b4da08bd9d14
+_md5_=20b96e4c8bae0e80b0ab16fc4d8b822c
diff --git a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1 b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
index 70c6061e185c..1484d723b554 100644
--- a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
+++ b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Mock Object library for PHPUnit
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/Text_Template-1.2 <dev-php/Text_Template-2.0 <dev-php/doctrine-instantiator-2.0 <dev-php/sebastian-exporter-3.0 !<dev-php/phpunit-5.4.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit-mock-objects/archive/3.4.3.tar.gz -> phpunit-mock-objects-3.4.3.tar.gz
-_md5_=72b85c59d9c580e47109d4fba373a58d
+_md5_=a66a8a72b68b0ca7a0141ae4d883d8e3
diff --git a/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1 b/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
index 99a615f87a55..f4d868b31515 100644
--- a/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Looks up which function or method a line of code belongs to
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/code-unit-reverse-lookup/archive/1.0.1.tar.gz -> sebastian-code-unit-reverse-lookup-1.0.1.tar.gz
-_md5_=2d4f5569db9dc582bfbb8575a262f67e
+_md5_=989e2c0084a1ea94f0c46bdc7e299986
diff --git a/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4 b/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
index f04ad5154dc3..bbaa77008692 100644
--- a/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
+++ b/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Compare PHP values for equality
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-diff-2.0 <dev-php/sebastian-exporter-3.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//comparator/archive/1.2.4.tar.gz -> sebastian-comparator-1.2.4.tar.gz
-_md5_=71548b4c6b9176eb7b111b4e62c66bc3
+_md5_=89ae91311774d665c45e4ca63e10f4d3
diff --git a/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2 b/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
index 6d5fb78c13b2..30bae7f00472 100644
--- a/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
+++ b/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Compare PHP values for equality
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/sebastian-diff-3.0 <dev-php/sebastian-diff-4.0 >=dev-php/sebastian-exporter-3.1 <dev-php/sebastian-exporter-4.0 >=dev-lang/php-7.1:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//comparator/archive/3.0.2.tar.gz -> sebastian-comparator-3.0.2.tar.gz
-_md5_=77094a89a8a052f1c05fb3c5e4248ff0
+_md5_=f9a0af769b406a333ce4a387627955fb
diff --git a/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1 b/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
index 134b7b23ddc7..65467ba8d350 100644
--- a/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=PHP Diff implementation
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/diff/archive/1.4.1.tar.gz -> sebastian-diff-1.4.1.tar.gz
-_md5_=735cfe17a812156bc92a29cb84169874
+_md5_=3f17c5539767cf3ca341b4d5d834378d
diff --git a/metadata/md5-cache/dev-php/sebastian-diff-3.0.2 b/metadata/md5-cache/dev-php/sebastian-diff-3.0.2
index 77beb8229b3a..6778154e80aa 100644
--- a/metadata/md5-cache/dev-php/sebastian-diff-3.0.2
+++ b/metadata/md5-cache/dev-php/sebastian-diff-3.0.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=PHP Diff implementation
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/diff/archive/3.0.2.tar.gz -> sebastian-diff-3.0.2.tar.gz
-_md5_=909bb4c8a70084c4e0d28d69191122aa
+_md5_=596302c552860893aff299afcc957192
diff --git a/metadata/md5-cache/dev-php/sebastian-environment-2.0.0 b/metadata/md5-cache/dev-php/sebastian-environment-2.0.0
index 019062731fe6..e95c8182da40 100644
--- a/metadata/md5-cache/dev-php/sebastian-environment-2.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-environment-2.0.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Helps writing PHP code that has runtime-specific execution paths
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//environment/archive/2.0.0.tar.gz -> sebastian-environment-2.0.0.tar.gz
-_md5_=5aed5a3453990532750ad3d2e2fa62c0
+_md5_=841cb0751d0d4955061bbeb19e90acae
diff --git a/metadata/md5-cache/dev-php/sebastian-environment-4.2.3 b/metadata/md5-cache/dev-php/sebastian-environment-4.2.3
index 81f8e6a9d526..0d9ca56c10fa 100644
--- a/metadata/md5-cache/dev-php/sebastian-environment-4.2.3
+++ b/metadata/md5-cache/dev-php/sebastian-environment-4.2.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Helps writing PHP code that has runtime-specific execution paths
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//environment/archive/4.2.3.tar.gz -> sebastian-environment-4.2.3.tar.gz
-_md5_=00e255448128c785148c24acc55114ee
+_md5_=e2682c16178fc498f1785645fe0aade6
diff --git a/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0 b/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
index e5ceb898408f..2a068dc7da62 100644
--- a/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Export PHP variables for visualization
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-2* >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//exporter/archive/2.0.0.tar.gz -> sebastian-exporter-2.0.0.tar.gz
-_md5_=9119d70da173abd7619a544e3a90bdf8
+_md5_=35cec15db714b11e6f869512db08c34d
diff --git a/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2 b/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
index 8f09f825726b..0b0f4f5fae70 100644
--- a/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
+++ b/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Export PHP variables for visualization
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-3* =dev-lang/php-7*:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//exporter/archive/3.1.2.tar.gz -> sebastian-exporter-3.1.2.tar.gz
-_md5_=7b782001fb6ac53fdafb81c662641312
+_md5_=1171e8239484ccd831899e4502d15d52
diff --git a/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1 b/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
index 7164f764aee6..733c5a29436d 100644
--- a/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
+++ b/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Snapshotting of global state
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//global-state/archive/1.1.1.tar.gz -> sebastian-global-state-1.1.1.tar.gz
-_md5_=fc69e896680529ad98ea9a2185399579
+_md5_=462ffe76b29da1370419a83fc0b94eaa
diff --git a/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0 b/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
index 8f25d68cc73e..a3faa78a962a 100644
--- a/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Snapshotting of global state
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:* >=dev-php/sebastian-object-reflector-1.1.1 <dev-php/sebastian-object-reflector-2.0 =dev-php/sebastian-recursion-context-3*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//global-state/archive/3.0.0.tar.gz -> sebastian-global-state-3.0.0.tar.gz
-_md5_=705b4d60979e54f05b7d6b97b5197793
+_md5_=ef6baca7bdd1dfd30506ec5ae7df77c3
diff --git a/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1 b/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
index 2e213b6c627a..9f93b411bdd1 100644
--- a/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-recursion-context-3.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//object-enumerator/archive/2.0.1.tar.gz -> sebastian-object-enumerator-2.0.1.tar.gz
-_md5_=94b870a5462c38a8268f1a0ac352844f
+_md5_=7bb3004acfaa85310e3d7baccbbd0b9c
diff --git a/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3 b/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
index adcfc8c17a28..224808e87d72 100644
--- a/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
+++ b/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-object-reflector-2.0 >=dev-php/sebastian-recursion-context-3.0 <dev-php/sebastian-recursion-context-4.0 =dev-lang/php-7*:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//object-enumerator/archive/3.0.3.tar.gz -> sebastian-object-enumerator-3.0.3.tar.gz
-_md5_=5166893bccab5a6bdbcc4db88114f9eb
+_md5_=e9a2fad84c8e7fc11b04f425b481cf26
diff --git a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1 b/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
index 1ba4b1c8f7b9..3170907af558 100644
--- a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
+++ b/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Allows reflection of object attributes, including inherited and non-public ones
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader =dev-lang/php-7*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/object-reflector/archive/1.1.1.tar.gz -> sebastian-object-reflector-1.1.1.tar.gz
-_md5_=36ecf33eb8a10a80b555553aff9a3fe4
+_md5_=41d398e881604975a01a5e56ff2fda63
diff --git a/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0 b/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
index 158b1230ef1a..7a6bab9ebeb0 100644
--- a/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Recursively process PHP variables
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/2.0.0.tar.gz -> sebastian-recursion-context-2.0.0.tar.gz
-_md5_=484f89a0969a7457713afb45e0a9c8e6
+_md5_=9fcc1a5bfc7cd2a7de075205c44bddae
diff --git a/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0 b/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
index cc8a17e4e296..686063f5ee98 100644
--- a/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Recursively process PHP variables
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader =dev-lang/php-7*:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/3.0.0.tar.gz -> sebastian-recursion-context-3.0.0.tar.gz
-_md5_=d782ff67d4f80a7a0bd18531dfc3ceb4
+_md5_=085d79193c0e29f1792140427ec931f6
diff --git a/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0 b/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
index 0b9229254abb..5e26738878a6 100644
--- a/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Provides a list of PHP built-in functions that operate on resources
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//resource-operations/archive/1.0.0.tar.gz -> sebastian-resource-operations-1.0.0.tar.gz
-_md5_=34139dd007001c54a43ae5e59b94de2e
+_md5_=8205e576163b43890b79592402c12c68
diff --git a/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1 b/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
index 0c63d63fa419..6a766a51eba3 100644
--- a/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Provides a list of PHP built-in functions that operate on resources
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//resource-operations/archive/2.0.1.tar.gz -> sebastian-resource-operations-2.0.1.tar.gz
-_md5_=7884dfcf778925bce18fd8c7dc7835aa
+_md5_=3eec1fb3b4e3d7af757bf0e9c404dfb1
diff --git a/metadata/md5-cache/dev-php/sebastian-type-1.1.3 b/metadata/md5-cache/dev-php/sebastian-type-1.1.3
index cd533570282e..4efe69f4035e 100644
--- a/metadata/md5-cache/dev-php/sebastian-type-1.1.3
+++ b/metadata/md5-cache/dev-php/sebastian-type-1.1.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Collection of value objects that represent the types of the PHP type system
 EAPI=7
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/type/archive/1.1.3.tar.gz -> sebastian-type-1.1.3.tar.gz
-_md5_=57afc7351cb86ff2f2babc7748684994
+_md5_=3566f79fc7b60f7a394f658509afe208
diff --git a/metadata/md5-cache/dev-php/sebastian-version-2.0.1 b/metadata/md5-cache/dev-php/sebastian-version-2.0.1
index 323b952d54a3..df966501ee4b 100644
--- a/metadata/md5-cache/dev-php/sebastian-version-2.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-version-2.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Helps with managing the version number of Git-hosted PHP projects
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://phpunit.de
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/version/archive/2.0.1.tar.gz -> sebastian-version-2.0.1.tar.gz
-_md5_=e4ecc5b79b0c65435d7e83ca34ae9472
+_md5_=14f779b6da1c5f74a2ca272d9d72d4e6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3a939f7c67fc..d31c41ad87f6 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/Rx-3.1.0 b/metadata/md5-cache/dev-python/Rx-3.1.0
new file mode 100644
index 000000000000..a9218931efa2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Rx-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( 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(-)] ) python_targets_python3_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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=Reactive Extensions for Python
+EAPI=7
+HOMEPAGE=http://reactivex.io/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+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(-)]
+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=https://github.com/ReactiveX/RxPY/archive/v3.1.0.tar.gz -> Rx-3.1.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=0276464f412addd237c00007153ac2eb
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 b00c3079a4bd..e7921f3751f7 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 ~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	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d500b59484c29bdd7759736aee6c880b
+_md5_=8b4b11a1f8457d22b150bbe2875ea73a
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r2 b/metadata/md5-cache/dev-python/argh-0.26.2-r2
index 3ae0ae77ba70..61af5f9b7ca5 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r2
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r2
@@ -1,16 +1,15 @@
-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=test? ( dev-python/iocapture[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(-)] ) 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(-)] ) 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(-)] dev-python/iocapture[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=A simple argparse wrapper
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/argh/
-IUSE=test python_targets_pypy3 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 ~arm ~arm64 ~ppc x86
 LICENSE=LGPL-3
-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/a/argh/argh-0.26.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=334fb5e6e6dc1b1c44bb064b62f8d40a
+_md5_=9f590979910b6017b8ee663f7b706268
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
index 13f6c0e41142..f074262f3980 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -1,16 +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(-)]
+BDEPEND=test? ( 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(-)] ) python_targets_python3_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/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=Making it easy to write async iterators in Python 3.5
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/
-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 ~ppc ~ppc64 x86
 LICENSE=|| ( MIT 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(-)]
-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(-)]
+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/a/async_generator/async_generator-1.10.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=29d894ea6e122cb76879738c79f648dd
+_md5_=a7fdfbe44469e5ec8b4373de08e66c16
diff --git a/metadata/md5-cache/dev-python/autobahn-20.4.3 b/metadata/md5-cache/dev-python/autobahn-20.4.3
index e72a5f0b7301..69c4656e6db0 100644
--- a/metadata/md5-cache/dev-python/autobahn-20.4.3
+++ b/metadata/md5-cache/dev-python/autobahn-20.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/autobahn/ https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python
 IUSE=crypt test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cbor-1.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/cbor2-5.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/flatbuffers-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lz4-0.7.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/msgpack-0.6.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-ubjson-0.8.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/snappy-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/twisted-20.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/txaio-20.3.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/ujson-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/wsaccel-0.6.2[python_targets_python3_6(-)?,python_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-3.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] crypt? ( >=dev-python/pyopenssl-16.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/pynacl-1.0.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/pytrie-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-python/pyqrcode-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/service_identity-18.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-20.4.3.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a74112fea9fcb1f7f7a8147627c30a39
+_md5_=b0e9f879aa8188d7b9daa699bd390fff
diff --git a/metadata/md5-cache/dev-python/awscli-1.18.69 b/metadata/md5-cache/dev-python/awscli-1.18.70
similarity index 95%
rename from metadata/md5-cache/dev-python/awscli-1.18.69
rename to metadata/md5-cache/dev-python/awscli-1.18.70
index 7df1cdfb769a..5b6027cdeec4 100644
--- a/metadata/md5-cache/dev-python/awscli-1.18.69
+++ b/metadata/md5-cache/dev-python/awscli-1.18.70
@@ -1,16 +1,16 @@
 BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/botocore-1.16.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/colorama-0.4.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/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/rsa-3.5.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/s3transfer-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/pyyaml-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(-)]
+DEPEND=>=dev-python/botocore-1.16.20[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/colorama-0.4.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/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/rsa-3.5.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/s3transfer-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/pyyaml-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(-)]
 DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=7
 HOMEPAGE=https://pypi.org/project/awscli/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.16.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/colorama-0.4.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/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/rsa-3.5.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/s3transfer-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/pyyaml-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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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=>=dev-python/botocore-1.16.20[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/colorama-0.4.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/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/rsa-3.5.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/s3transfer-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/pyyaml-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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.18.69.tar.gz -> awscli-1.18.69.tar.gz
+SRC_URI=https://github.com/aws/aws-cli/archive/1.18.70.tar.gz -> awscli-1.18.70.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e9c2e37c135e731b604733f3e065e637
+_md5_=dfd4c828407269a6cf8bd7aefbfbcbdb
diff --git a/metadata/md5-cache/dev-python/black-19.10_beta0 b/metadata/md5-cache/dev-python/black-19.10_beta0
new file mode 100644
index 000000000000..37e4b2da9318
--- /dev/null
+++ b/metadata/md5-cache/dev-python/black-19.10_beta0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/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(-)] dev-python/toml[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/aiohttp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/aiohttp-cors[python_targets_python3_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/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/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(-)] dev-python/toml[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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=The uncompromising Python code formatter
+EAPI=7
+HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/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(-)] dev-python/toml[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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://github.com/psf/black/archive/19.10b0.tar.gz -> black-19.10b0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=e851f408fc034a2f17256c15fc4077eb
diff --git a/metadata/md5-cache/dev-python/blessings-1.7-r1 b/metadata/md5-cache/dev-python/blessings-1.7-r1
index 05c066d073c4..8e076bed9ca5 100644
--- a/metadata/md5-cache/dev-python/blessings-1.7-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.7-r1
@@ -1,15 +1,15 @@
-BDEPEND=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/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-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-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? ( 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/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(-)] ) 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 thin, practical wrapper around terminal coloring, styling, and positioning
 EAPI=7
 HOMEPAGE=https://github.com/erikrose/blessings https://pypi.org/project/blessings/
-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 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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/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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=24047f9d290c2cb6439ee8aed8fe44de
+_md5_=72c007399e3ba40659eb3e7183cadfb1
diff --git a/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1 b/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
index c4408dbfd1a0..8148b38e1406 100644
--- a/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Boolean operations on paths
 EAPI=7
 HOMEPAGE=https://github.com/typemytype/booleanOperations
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/fonttools-4.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-python/pyclipper-1.1.0_p3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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
 SLOT=0
 SRC_URI=https://github.com/typemytype/booleanOperations/archive/0.9.0.tar.gz -> booleanOperations-0.9.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e49444d32f82c1d2894481f2f97659f0
+_md5_=33af3416bd271a7a208483ef9b1f8488
diff --git a/metadata/md5-cache/dev-python/botocore-1.16.20 b/metadata/md5-cache/dev-python/botocore-1.16.20
new file mode 100644
index 000000000000..3b69fbfa812d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.16.20
@@ -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/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(-)] 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/jsonschema[python_targets_python3_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/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(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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=Low-level, data-driven core of boto 3.
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+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_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/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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.16.20.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=f175fbbdb39a18df4381953a76ffb536
diff --git a/metadata/md5-cache/dev-python/bpython-0.19 b/metadata/md5-cache/dev-python/bpython-0.19
index ad84afe547de..e9e44a5c1a11 100644
--- a/metadata/md5-cache/dev-python/bpython-0.19
+++ b/metadata/md5-cache/dev-python/bpython-0.19
@@ -1,16 +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(-)]
+BDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/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(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/curtsies-0.2.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/greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_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/six-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/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/watchdog[python_targets_python3_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-python/curtsies-0.2.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/greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_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/six-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/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/watchdog[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/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=Syntax highlighting and autocompletion for the Python interpreter
 EAPI=7
 HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
-IUSE=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
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/curtsies-0.2.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/greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_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/six-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/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/watchdog[python_targets_python3_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
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.19.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bc86492a4cb7e25e0b66841e52ab3a56
+_md5_=193d7a3b15cd32890971a1e9c68a9697
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.7 b/metadata/md5-cache/dev-python/bsddb3-6.2.7
index 5fe89c77a9aa..7cee0c89930a 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.7
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Berkeley DB
 EAPI=6
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/
 IUSE=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 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 ) 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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.7.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a6595f579961bab28d03f0ebcffc3a8
+_md5_=035993c35b65b7217c42187481bcee4a
diff --git a/metadata/md5-cache/dev-python/cangjie-1.3 b/metadata/md5-cache/dev-python/cangjie-1.3
index 81c8ce3b8c46..8edac5c6ba88 100644
--- a/metadata/md5-cache/dev-python/cangjie-1.3
+++ b/metadata/md5-cache/dev-python/cangjie-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper for libcangjie
 EAPI=6
 HOMEPAGE=http://cangjians.github.io/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-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(-)] app-i18n/libcangjie
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Cangjians/pycangjie/releases/download/v1.3/cangjie-1.3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b3b05b21064d7f759d6dc208e55f3fa6
+_md5_=2032655b3a98a403a9341709b33dcd67
diff --git a/metadata/md5-cache/dev-python/chai-1.1.2 b/metadata/md5-cache/dev-python/chai-1.1.2
index bcd9dea1f73c..196af83d076a 100644
--- a/metadata/md5-cache/dev-python/chai-1.1.2
+++ b/metadata/md5-cache/dev-python/chai-1.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Easy to use mocking, stubbing and spying framework
 EAPI=7
 HOMEPAGE=https://github.com/agoragames/chai
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/chai/chai-1.1.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4b27aa491a5f62521fa452a7fdfd330b
+_md5_=f16a06e27d9c66e0b2f3f4c15c1b260c
diff --git a/metadata/md5-cache/dev-python/click-default-group-1.2.2 b/metadata/md5-cache/dev-python/click-default-group-1.2.2
index 21c127140f1c..23e48b59502e 100644
--- a/metadata/md5-cache/dev-python/click-default-group-1.2.2
+++ b/metadata/md5-cache/dev-python/click-default-group-1.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Extends click. Group to invoke a command without explicit subcommand
 EAPI=7
 HOMEPAGE=https://github.com/click-contrib/click-default-group
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/click[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-default-group/archive/v1.2.2.tar.gz -> click-default-group-1.2.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f0463db6acf564d7bf98161a820fabe9
+_md5_=6dcd9f5914c4845f879f933dd431ce4f
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
index 1490bd644436..11f72271e960 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ b/metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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[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(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Module for click to enable registering CLI commands via setuptools entry-points
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/click-plugins/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9854a2af0f31fe79bcfbe8e747ea628b
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=1c9c3063ba0e1de42c2533d6aa2b3387
diff --git a/metadata/md5-cache/dev-python/contextvars-2.4 b/metadata/md5-cache/dev-python/contextvars-2.4
index 0c020ba9f753..84b9cd86e003 100644
--- a/metadata/md5-cache/dev-python/contextvars-2.4
+++ b/metadata/md5-cache/dev-python/contextvars-2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/immutables[python_targets_python3_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/MagicStack/contextvars/archive/v2.4.tar.gz -> contextvars-2.4.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7fea9976a0700c79fce0b22788ce3cd2
+_md5_=e72768e118044dc62b217268fc0505b7
diff --git a/metadata/md5-cache/dev-python/coverage-4.5.4 b/metadata/md5-cache/dev-python/coverage-4.5.4
index a83e28e2e9ec..f8f528024330 100644
--- a/metadata/md5-cache/dev-python/coverage-4.5.4
+++ b/metadata/md5-cache/dev-python/coverage-4.5.4
@@ -1,10 +1,10 @@
-BDEPEND=>=dev-python/setuptools-18.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(-)] test? ( dev-python/PyContracts[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/flaky[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(-)] >=dev-python/unittest-mixins-1.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(-)] ) 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(-)]
+BDEPEND=>=dev-python/setuptools-18.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(-)] test? ( dev-python/PyContracts[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/flaky[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(-)] 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(-)] >=dev-python/unittest-mixins-1.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(-)] ) 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=Code coverage measurement for Python
 EAPI=7
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=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/c/coverage/coverage-4.5.4.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b6757f4e1e13d1c7ac7a9d36aa5fdec8
+_md5_=32b07eaac1d97adb8030f97520f107c5
diff --git a/metadata/md5-cache/dev-python/coverage-5.0.3 b/metadata/md5-cache/dev-python/coverage-5.0.3
index fdfed86f4941..472b0b2b20be 100644
--- a/metadata/md5-cache/dev-python/coverage-5.0.3
+++ b/metadata/md5-cache/dev-python/coverage-5.0.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/PyContracts[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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? ( dev-python/PyContracts[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_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=Code coverage measurement for Python
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.0.3.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=2b66f4941517f617af53c470fd2b2bb1
+_md5_=9450a2993fb11295abcee143f7052cff
diff --git a/metadata/md5-cache/dev-python/coverage-5.1 b/metadata/md5-cache/dev-python/coverage-5.1
index 431de0448ea0..cdd0af1bc5da 100644
--- a/metadata/md5-cache/dev-python/coverage-5.1
+++ b/metadata/md5-cache/dev-python/coverage-5.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=2eb459dd0f6e08d5a882194f29b9a668
+_md5_=7d69756037141907536e4524cd7d895a
diff --git a/metadata/md5-cache/dev-python/cppy-1.1.0 b/metadata/md5-cache/dev-python/cppy-1.1.0
index 87cfa0914039..5bee6f45b08b 100644
--- a/metadata/md5-cache/dev-python/cppy-1.1.0
+++ b/metadata/md5-cache/dev-python/cppy-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=C++ header library which makes it easier to write Python extension m
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cppy
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~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 ) >=dev-lang/python-exec-2:=[python_targets_python3_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=mirror://pypi/c/cppy/cppy-1.1.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e06c0eacc6727ca69b3e5e6214b52a16
+_md5_=9e10d78e2a900f1ee42979305c63c1bb
diff --git a/metadata/md5-cache/dev-python/csv23-0.3.2 b/metadata/md5-cache/dev-python/csv23-0.3.2
index 69e5163cecc5..a66e7ca85eb0 100644
--- a/metadata/md5-cache/dev-python/csv23-0.3.2
+++ b/metadata/md5-cache/dev-python/csv23-0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python 2/3 unicode CSV compatibility layer
 EAPI=7
 HOMEPAGE=https://pypi.org/project/csv23/ https://github.com/xflr6/csv23/
 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( dev-python/mock[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xflr6/csv23/archive/v0.3.2.tar.gz -> csv23-0.3.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=205579eae08cbd58288ecf7dd5e9ad20
+_md5_=b626f5fd7f979e4f3b6fb441def299d1
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.0-r2 b/metadata/md5-cache/dev-python/curtsies-0.3.0-r2
index 4e518db57c13..a8c1df25abd3 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.0-r2
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.0-r2
@@ -1,16 +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(-)]
+BDEPEND=test? ( >=dev-python/blessings-1.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/wcwidth-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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(-)] ) python_targets_python3_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/blessings-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/wcwidth-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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/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/pyte[python_targets_python3_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/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/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=Curses-like terminal wrapper, with colored strings
 EAPI=7
 HOMEPAGE=https://github.com/thomasballinger/curtsies
-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 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/blessings-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/wcwidth-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/blessings-1.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/wcwidth-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/c/curtsies/curtsies-0.3.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7f0defcffa7d21b24ff54a6c8db5185a
+_md5_=f2417f4db91d4d6d4b2598a0ca482721
diff --git a/metadata/md5-cache/dev-python/defcon-0.6.0-r1 b/metadata/md5-cache/dev-python/defcon-0.6.0-r1
index 492f5758ee1e..8dbf71799538 100644
--- a/metadata/md5-cache/dev-python/defcon-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/defcon-0.6.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A set of UFO based objects for use in font editing applications
 EAPI=7
 HOMEPAGE=https://github.com/typesupply/defcon
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/fonttools-3.31.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/typesupply/defcon/archive/0.6.0.tar.gz -> defcon-0.6.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b496d71a9e47944cb027d36b6cdc8214
+_md5_=339fb377d41576c2d7bc30e24dfdfaf6
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.0 b/metadata/md5-cache/dev-python/distlib-0.3.0
index f7fc0fd6d155..eccbd6730c83 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.0
+++ b/metadata/md5-cache/dev-python/distlib-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Low-level components of distutils2/packaging
 EAPI=7
 HOMEPAGE=https://pypi.org/project/distlib/ https://bitbucket.org/pypa/distlib/
 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=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PSF-2
 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=https://bitbucket.org/pypa/distlib/get/0.3.0.tar.bz2 -> distlib-0.3.0.tar.bz2
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=c074a946ecd0f4dba23ecb8e8171b2f1
+_md5_=8da8226eab2f3ecab17f4e1e6cf99574
diff --git a/metadata/md5-cache/dev-python/distro-1.5.0 b/metadata/md5-cache/dev-python/distro-1.5.0
new file mode 100644
index 000000000000..3dad36001f90
--- /dev/null
+++ b/metadata/md5-cache/dev-python/distro-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Reliable machine-readable Linux distribution information for Python
+EAPI=7
+HOMEPAGE=https://distro.readthedocs.io/en/latest/
+IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/distro/distro-1.5.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=056f14069fa171862591773dc38733dd
diff --git a/metadata/md5-cache/dev-python/django-2.2.13 b/metadata/md5-cache/dev-python/django-2.2.13
new file mode 100644
index 000000000000..2de255e708b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.2.13
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)]
+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
+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 )
+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	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=fc6678a98463e4cbedefea72774dfd5c
diff --git a/metadata/md5-cache/dev-python/django-3.0.7 b/metadata/md5-cache/dev-python/django-3.0.7
new file mode 100644
index 000000000000..2c32bf57aaf3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.0.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/asgiref[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlparse-0.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(-)] 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/3.0/Django-3.0.7.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=5df45a1fc4600d2e543359630cd3764d
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.8.11 b/metadata/md5-cache/dev-python/eyeD3-0.8.11
index 5175f90d9234..50cd6e14d721 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.8.11
+++ b/metadata/md5-cache/dev-python/eyeD3-0.8.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/paver[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-magic[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=Module for manipulating ID3 (v1 + v2) tags in Python
 EAPI=6
-HOMEPAGE=http://eyed3.nicfit.net/
+HOMEPAGE=https://eyed3.nicfit.net/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.8.11.tar.gz -> eyeD3-0.8.11.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fa44b02eaff83d99480e0d15f71e4d5
+_md5_=a51d3386770b243861f5ff47123794f3
diff --git a/metadata/md5-cache/dev-python/flatbuffers-1.12 b/metadata/md5-cache/dev-python/flatbuffers-1.12
index 454a1f1cc15a..499b4a87eb0d 100644
--- a/metadata/md5-cache/dev-python/flatbuffers-1.12
+++ b/metadata/md5-cache/dev-python/flatbuffers-1.12
@@ -4,11 +4,11 @@ DESCRIPTION=RFC 7049 - Concise Binary Object Representation
 EAPI=7
 HOMEPAGE=https://github.com/google/flatbuffers https://pypi.org/project/flatbuffers/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flatbuffers/flatbuffers-1.12.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b536d3c9292987f6d56562e9279c6730
+_md5_=f2ee9bd319d71b2766d02133185de780
diff --git a/metadata/md5-cache/dev-python/fs-2.4.9-r1 b/metadata/md5-cache/dev-python/fs-2.4.9-r1
index b701995a032b..ddde7b166e7b 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.9-r1
+++ b/metadata/md5-cache/dev-python/fs-2.4.9-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Filesystem abstraction layer
 EAPI=7
 HOMEPAGE=https://pypi.org/project/fs/ https://docs.pyfilesystem.org https://www.willmcgugan.com/tag/fs/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-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/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/six-1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/f/fs/fs-2.4.9.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4f15fca57ededb7fefb97f632136173f
+_md5_=5b51b15ecbda021e2083847f995df70c
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.15-r1 b/metadata/md5-cache/dev-python/greenlet-0.4.15-r1
index b673b8b08e04..f5a530e700e7 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.15-r1
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.15-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=7
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc doc 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
+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-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.15.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=500d7521d697356ac4085c32c1c32867
+_md5_=2edb4a4caeae59796d87c3662cad87ae
diff --git a/metadata/md5-cache/dev-python/httplib2-0.18.1 b/metadata/md5-cache/dev-python/httplib2-0.18.1
index f2434a44f9a2..0a8ea51f075d 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.18.1
+++ b/metadata/md5-cache/dev-python/httplib2-0.18.1
@@ -1,14 +1,15 @@
-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(-)]
+BDEPEND=test? ( dev-python/pytest-timeout[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? ( app-misc/ca-certificates 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(-)] ) 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=A comprehensive HTTP client library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2
-IUSE=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 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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=app-misc/ca-certificates 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/h/httplib2/httplib2-0.18.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=02ab64bd2c2fdbb2faf57f3da91069c8
+_md5_=195c6534512649e32495c290283a8951
diff --git a/metadata/md5-cache/dev-python/immutables-0.11 b/metadata/md5-cache/dev-python/immutables-0.11
index 8b1358954333..dc668768a65c 100644
--- a/metadata/md5-cache/dev-python/immutables-0.11
+++ b/metadata/md5-cache/dev-python/immutables-0.11
@@ -4,7 +4,7 @@ DESCRIPTION=A high-performance immutable mapping type for Python
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack/immutables
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 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(-)]
 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/MagicStack/immutables/archive/v0.11.tar.gz -> immutables-0.11.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bac23f645a60fe63bed2367c44fffa13
+_md5_=65f702af5312bde1792be0ea5411a9fa
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
index 41a9910a9018..ed9c8be29f1c 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
@@ -1,16 +1,15 @@
-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=test? ( 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(-)] ) 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(-)] ) 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(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Capture stdout, stderr easily
 EAPI=7
 HOMEPAGE=https://pypi.org/project/iocapture/
-IUSE=test python_targets_pypy3 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 ~arm ~arm64 ~ppc 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 ) >=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=https://github.com/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0f44d3db3062b7e23aa0832a16060223
+_md5_=5d7b3162aebe84537e7a77f7e7e4198a
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 ee9e751cda6c..74630856578d 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	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=84b8c6f5121265d8eea8cc70873e1da4
+_md5_=780b20db12ddb813b27a2d25dcd71b6b
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-1.0.1 b/metadata/md5-cache/dev-python/jaraco-envs-1.0.1
index 3f0261093a2f..9150838ea572 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-1.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-envs-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Classes for orchestrating Python (virtual) environments.
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.envs
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/namespace-jaraco[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/path-py[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/contextlib2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/contextlib2[python_targets_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_python3_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
 SLOT=0
 SRC_URI=https://github.com/jaraco/jaraco.envs/archive/v1.0.1.tar.gz -> jaraco-envs-1.0.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=3b5024bf1eec6ee1169b4040127925dd
+_md5_=796b59b124599b24e9e4b43ff2c2b323
diff --git a/metadata/md5-cache/dev-python/jedi-0.17.0 b/metadata/md5-cache/dev-python/jedi-0.17.0
index b146cf7d4940..6fc26e3f02c7 100644
--- a/metadata/md5-cache/dev-python/jedi-0.17.0
+++ b/metadata/md5-cache/dev-python/jedi-0.17.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-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/parso-0.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/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=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(+)] ) ) ) test? ( >=dev-python/parso-0.5.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/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(-)] ) python_targets_python3_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=Autocompletion library for Python
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/jedi
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT test? ( Apache-2.0 )
-RDEPEND=>=dev-python/parso-0.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/parso-0.5.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(-)] python_targets_python3_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/davidhalter/jedi/archive/v0.17.0.tar.gz -> jedi-0.17.0.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e05a58ad752c59e1116a49ee543dbf9a
+_md5_=ec5585245bbe41b86f259dd0bc94725f
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1 b/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
index 293c102bb357..69cb7851496c 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
+++ b/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
 EAPI=7
 HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
 IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=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/feedparser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ujson[python_targets_python3_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.4.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d5ce20862a0633c2efe66ab8b4dc6b4b
+_md5_=0fd1a5fc8d8dd06b276d50b5f53798a8
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1 b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
index 92ab6b4a0e71..70ad7dda4e38 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Identify specific nodes in a JSON document (according to draft 08)
 EAPI=7
 HOMEPAGE=https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/
 IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 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 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b530b74a9d423cb00cad2f1d863db377
+_md5_=c31d6508106239a9eadbda3d3cd8f6a2
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index 94002a4efcce..83cdb3d978c8 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of JSON-Schema validation for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
 IUSE=test test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/pyrsistent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/importlib_metadata[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_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_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/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonpointer-1.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/rfc3987[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/strict-rfc3339[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/webcolors[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/rfc3986-validator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/rfc3339-validator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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 ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.2.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=28a88cbbcbefd703e0b91ccd657dc770
+_md5_=9080772a875025184a613f33ba843997
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.8 b/metadata/md5-cache/dev-python/kaitaistruct-0.8
index dbeb0e445e9d..2e0add5504a1 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.8
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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=Kaitai Struct runtime for Python
 EAPI=6
 HOMEPAGE=https://kaitai.io/
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff3286a852949a2eb7f97704513dfe26
+_md5_=bddc38bd0cc85a5e89da58a38a5acf88
diff --git a/metadata/md5-cache/dev-python/keyring-21.2.1 b/metadata/md5-cache/dev-python/keyring-21.2.1
index f41db64f73c6..24d0f625f01a 100644
--- a/metadata/md5-cache/dev-python/keyring-21.2.1
+++ b/metadata/md5-cache/dev-python/keyring-21.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides access to the system keyring service
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/keyring
 IUSE=doc 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[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/entrypoints[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/jeepney[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(-)] ) 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/jaraco/keyring/archive/v21.2.1.tar.gz -> keyring-21.2.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=88d6ddac0d6f462c5c8f8091e83081a7
+_md5_=29dac801dd8c9f89a195e6f57d150652
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.2.0 b/metadata/md5-cache/dev-python/kiwisolver-1.2.0
index 9d1f429f28d1..64a70e0a7952 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.2.0
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving
 EAPI=7
 HOMEPAGE=https://github.com/nucleic/kiwi
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Clear-BSD
 RDEPEND=>=dev-python/cppy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/nucleic/kiwi/archive/1.2.0.tar.gz -> kiwisolver-1.2.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=69c7c2726bd15b67fa624d6d75d7ff75
+_md5_=6e370fc33b15e32f31a4424454356153
diff --git a/metadata/md5-cache/dev-python/klein-19.6.0 b/metadata/md5-cache/dev-python/klein-19.6.0
new file mode 100644
index 000000000000..b5b0c4aeef06
--- /dev/null
+++ b/metadata/md5-cache/dev-python/klein-19.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/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(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/hyperlink[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/incremental[python_targets_python3_6(-)?,python_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/tubes[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_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/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=micro-framework for developing production-ready web services with Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/klein https://github.com/twisted/klein
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/hyperlink[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/incremental[python_targets_python3_6(-)?,python_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/tubes[python_targets_python3_6(-)?,python_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[python_targets_python3_6(-)?,python_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/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/k/klein/klein-19.6.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=4e21a5e621de735d27b3f3d7100c39a6
diff --git a/metadata/md5-cache/dev-python/logutils-0.3.5 b/metadata/md5-cache/dev-python/logutils-0.3.5
index 9ee9a0c4ff9f..1cf29a152a6f 100644
--- a/metadata/md5-cache/dev-python/logutils-0.3.5
+++ b/metadata/md5-cache/dev-python/logutils-0.3.5
@@ -4,11 +4,11 @@ DESCRIPTION=The logutils package provides a set of handlers for the Python stand
 EAPI=7
 HOMEPAGE=https://bitbucket.org/vinay.sajip/logutils
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~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 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.5.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=6207c40cba89ec13b728b4e9b4d580fe
+_md5_=28acaeec9a775854c178820cb693c676
diff --git a/metadata/md5-cache/dev-python/mamba-0.11.0 b/metadata/md5-cache/dev-python/mamba-0.11.0
index 9b7186030543..c02463e53a8d 100644
--- a/metadata/md5-cache/dev-python/mamba-0.11.0
+++ b/metadata/md5-cache/dev-python/mamba-0.11.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python test runner born under the banner of Behavior Driven Developm
 EAPI=7
 HOMEPAGE=https://nestorsalceda.github.io/mamba
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/clint-0.3.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/coverage-3.7.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/watchdog-0.8.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(-)] >=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=https://github.com/nestorsalceda/mamba/archive/v0.11.0.tar.gz -> mamba-0.11.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1264d3840f77d56c5a0a52a38c903fcf
+_md5_=2d022354f4c86ebed6aadc8182c3ea4d
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.2.1 b/metadata/md5-cache/dev-python/matplotlib-3.2.1
index ead86244e92e..100804b4e8b9 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.2.1
+++ b/metadata/md5-cache/dev-python/matplotlib-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=7
 HOMEPAGE=https://matplotlib.org/
 IUSE=cairo doc excel examples gtk3 latex qt5 tk wxwidgets test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=>=dev-python/cycler-0.10.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kiwisolver-1.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/numpy-1.18.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-1.5.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil: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/pytz-2019.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/six-1.14.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/versioneer[python_targets_python3_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-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=www-servers/tornado-6.0.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(-)] cairo? ( 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(-)] ) excel? ( dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gtk3? ( dev-python/pygobject:3[cairo?,python_targets_python3_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-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) wxwidgets? ( dev-python/wxpython:*[python_targets_python3_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[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=test? ( cairo latex qt5 tk wxwidgets gtk3 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.2.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=1cee44d8f5e3c505e75723b189bd6731
+_md5_=b2868461d530536877308e55d2e7c234
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.3 b/metadata/md5-cache/dev-python/minidb-2.0.3
index 5fc69ef33918..f849615cb043 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.3
+++ b/metadata/md5-cache/dev-python/minidb-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Simple SQLite-based object store
 EAPI=7
 HOMEPAGE=https://thp.io/2010/minidb/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=ISC
 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(-)]
 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=mirror://pypi/m/minidb/minidb-2.0.3.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=41486f82068358b5fe9ebedbd0fcd614
+_md5_=7eb00689ae06ac2fe254110b1784b509
diff --git a/metadata/md5-cache/dev-python/misaka-1.0.2 b/metadata/md5-cache/dev-python/misaka-1.0.2
index 7fc63bc1ea67..580540b11d60 100644
--- a/metadata/md5-cache/dev-python/misaka-1.0.2
+++ b/metadata/md5-cache/dev-python/misaka-1.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The Python binding for Sundown, a markdown parsing library
 EAPI=5
-HOMEPAGE=http://misaka.61924.nl/
+HOMEPAGE=https://misaka.61924.nl/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/misaka/misaka-1.0.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=674f43e245d2e478ee1b4954047970d0
+_md5_=f9d27e1db38db3d3986661d596536ddb
diff --git a/metadata/md5-cache/dev-python/multidict-4.7.6 b/metadata/md5-cache/dev-python/multidict-4.7.6
index b7bf150bb109..a8d45d62063f 100644
--- a/metadata/md5-cache/dev-python/multidict-4.7.6
+++ b/metadata/md5-cache/dev-python/multidict-4.7.6
@@ -4,7 +4,7 @@ DESCRIPTION=multidict implementation
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/multidict/
 IUSE=doc 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 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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/aio-libs/multidict/archive/v4.7.6.tar.gz -> multidict-4.7.6.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=71960d6c71cd4a36685f801e1ac5fb73
+_md5_=4a7a6d6357e48cab6abd9bc009ed9f34
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 451ca3607896..e42b51a98131 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 ~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	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=2fddc2495b9c65f06115be3d89a2e5e1
+_md5_=9153a914847de545ee615f30ed0ebe87
diff --git a/metadata/md5-cache/dev-python/nautilus-python-1.2.3 b/metadata/md5-cache/dev-python/nautilus-python-1.2.3
new file mode 100644
index 000000000000..ecd64316c1c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nautilus-python-1.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] ) 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/nautilus-3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Python bindings for the Nautilus file manager
+EAPI=6
+HOMEPAGE=https://projects.gnome.org/nautilus-python/
+IUSE=python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=gnome-base/nautilus-3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus-python/1.2/nautilus-python-1.2.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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85205f78fb02faaf47022eca91acaa77
diff --git a/metadata/md5-cache/dev-python/nltk-3.5 b/metadata/md5-cache/dev-python/nltk-3.5
index a3140a0636fc..039d98534925 100644
--- a/metadata/md5-cache/dev-python/nltk-3.5
+++ b/metadata/md5-cache/dev-python/nltk-3.5
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/nltk-data-20200312-r1 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/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/twython[python_targets_python3_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_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(-)] 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(-)] ) test? ( dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_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/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[sqlite,tk?,xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,tk?,xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/nltk-data-20200312-r1 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/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/twython[python_targets_python3_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_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(-)] 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(-)] ) test? ( dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,tk?,xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,tk?,xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=Natural Language Toolkit
 EAPI=7
@@ -7,10 +7,10 @@ IUSE=tk test python_targets_python3_6 python_targets_python3_7 python_targets_py
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Apache-2.0
 PDEPEND=dev-python/nltk-data
-RDEPEND=dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_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[sqlite,tk?,xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,tk?,xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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(-)]
+RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tqdm[python_targets_python3_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,tk?,xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,tk?,xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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://github.com/nltk/nltk/archive/3.5.tar.gz -> nltk-3.5.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1aee10577786778e71be9a58f03121d4
+_md5_=1efbdcb6fea87135043d166c98406e94
diff --git a/metadata/md5-cache/dev-python/notebook-5.0.0 b/metadata/md5-cache/dev-python/notebook-5.0.0
index 7db176b48db0..5938cf2c7408 100644
--- a/metadata/md5-cache/dev-python/notebook-5.0.0
+++ b/metadata/md5-cache/dev-python/notebook-5.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install preinst prepare test
 DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/nose-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbsphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter Interactive Notebook
 EAPI=6
-HOMEPAGE=http://jupyter.org
+HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0fbd6418792f7a580e1eb5536d391f7
+_md5_=01c2c0675c546ac3b68ba4154c43f538
diff --git a/metadata/md5-cache/dev-python/notebook-5.2.1 b/metadata/md5-cache/dev-python/notebook-5.2.1
index b672a83b1d7e..d70222418753 100644
--- a/metadata/md5-cache/dev-python/notebook-5.2.1
+++ b/metadata/md5-cache/dev-python/notebook-5.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install preinst prepare test
 DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/terminado-0.3.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/nose-0.10.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose_warnings_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.6[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/nbsphinx-0.2.14[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nbval[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[threads(+)] ) >=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=Jupyter Interactive Notebook
 EAPI=6
-HOMEPAGE=http://jupyter.org
+HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.2.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=303319ac9471be72f0bbb9ba9f5dd1b6
+_md5_=fbc5dc467ef1b9d1e512ba3ddc946f02
diff --git a/metadata/md5-cache/dev-python/notebook-5.7.8 b/metadata/md5-cache/dev-python/notebook-5.7.8
index 5dd2057f2910..b6b336f9da0e 100644
--- a/metadata/md5-cache/dev-python/notebook-5.7.8
+++ b/metadata/md5-cache/dev-python/notebook-5.7.8
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install preinst prepare test
 DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/send2trash[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prometheus_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose-exclude[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( app-text/pandoc dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/sphinx-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbsphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nbval[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) )
 DESCRIPTION=Jupyter Interactive Notebook
 EAPI=7
-HOMEPAGE=http://jupyter.org
+HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.7.8.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b35753cd2fb9e4ad216fa921b98379b4
+_md5_=1bd6709003eb85b2c6454fd60cd38cd5
diff --git a/metadata/md5-cache/dev-python/nototools-0_pre20200207 b/metadata/md5-cache/dev-python/nototools-0_pre20200207
index 698eb6086bf1..2b7849ea1e69 100644
--- a/metadata/md5-cache/dev-python/nototools-0_pre20200207
+++ b/metadata/md5-cache/dev-python/nototools-0_pre20200207
@@ -4,7 +4,7 @@ DESCRIPTION=Noto fonts support tools and scripts plus web site generation
 EAPI=7
 HOMEPAGE=https://github.com/googlei18n/nototools
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 OFL-1.1
 RDEPEND=media-gfx/scour >=dev-python/booleanOperations-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/defcon-0.3.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/fonttools-3.36.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/pillow-4.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/pyclipper-1.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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
 SLOT=0
 SRC_URI=https://github.com/googlei18n/nototools/archive/9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz#/nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4aaf27505a06a323f449177e965ec82d
+_md5_=ee481004afd46b127ebfac68bdcd96ce
diff --git a/metadata/md5-cache/dev-python/numpy-1.17.4-r3 b/metadata/md5-cache/dev-python/numpy-1.17.4-r3
index 739b161b5e6a..13734944c38a 100644
--- a/metadata/md5-cache/dev-python/numpy-1.17.4-r3
+++ b/metadata/md5-cache/dev-python/numpy-1.17.4-r3
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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(-)] lapack? ( virtual/fortran )
 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/n/numpy/numpy-1.17.4.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7aee171a35cf38f7ec223a51ef06913d
+_md5_=a442fbb0c09fdc56fefad0127ed77dcc
diff --git a/metadata/md5-cache/dev-python/numpy-1.18.3 b/metadata/md5-cache/dev-python/numpy-1.18.3
index 164a7647cdbd..3c9f586acb21 100644
--- a/metadata/md5-cache/dev-python/numpy-1.18.3
+++ b/metadata/md5-cache/dev-python/numpy-1.18.3
@@ -1,16 +1,16 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.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/pytz-2019.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/cffi-1.14.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(-)] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.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/pytz-2019.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(-)] >=dev-python/cffi-1.14.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? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) 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(-)] ) 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 setup test unpack
 DEPEND=lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
-IUSE=doc lapack test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc lapack test 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) 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(-)] lapack? ( virtual/fortran )
+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/n/numpy/numpy-1.18.3.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7f43e370940be48ad4bae66d85e172a5
+_md5_=66a9f0ea9b8a4d4fc61fa1fca92f6f91
diff --git a/metadata/md5-cache/dev-python/numpy-1.18.5 b/metadata/md5-cache/dev-python/numpy-1.18.5
new file mode 100644
index 000000000000..3192d4be49d6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.18.5
@@ -0,0 +1,16 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.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/pytz-2019.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(-)] >=dev-python/cffi-1.14.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? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) 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(-)] ) 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 setup test unpack
+DEPEND=lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=7
+HOMEPAGE=https://www.numpy.org
+IUSE=doc lapack test 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) 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(-)] lapack? ( virtual/fortran )
+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/n/numpy/numpy-1.18.5.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=66a9f0ea9b8a4d4fc61fa1fca92f6f91
diff --git a/metadata/md5-cache/dev-python/numpy-python2-1.16.6 b/metadata/md5-cache/dev-python/numpy-python2-1.16.6
index c2a4cac456cb..646f4746df90 100644
--- a/metadata/md5-cache/dev-python/numpy-python2-1.16.6
+++ b/metadata/md5-cache/dev-python/numpy-python2-1.16.6
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python2_7
-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=BSD
 RDEPEND=!<dev-python/numpy-1.17 lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.6.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.6.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.6.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.6.pdf )
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d45fc37fa4c0c572592e41b8ac596b6d
+_md5_=fcd34dcc81c27c9a9f4abceaed55824d
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.9.2 b/metadata/md5-cache/dev-python/numpydoc-0.9.2
index 2e8a3436c0bf..9427f0f27d16 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.9.2
+++ b/metadata/md5-cache/dev-python/numpydoc-0.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx extension to support docstrings in Numpy format
 EAPI=7
 HOMEPAGE=https://pypi.org/project/numpydoc/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 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=mirror://pypi/n/numpydoc/numpydoc-0.9.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=22959fa0813d7b083c00a16904b063f6
+_md5_=ef64f21e11ddca64edac418a87296f27
diff --git a/metadata/md5-cache/dev-python/oslo-cache-2.3.0 b/metadata/md5-cache/dev-python/oslo-cache-2.3.0
new file mode 100644
index 000000000000..2af99fa38d9f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-cache-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Oslo Caching around dogpile.cache
+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-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.30.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-2.3.0.tar.gz -> oslo-cache-2.3.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=e13312947a5dd2a6e03cec9fa0c0536f
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-4.0.2 b/metadata/md5-cache/dev-python/oslo-concurrency-4.0.2
new file mode 100644
index 000000000000..7ef02c41d290
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-4.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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=library for running multi-thread, multi-process applications
+EAPI=7
+HOMEPAGE=https://pypi.org/project/oslo.concurrency/
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=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-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-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fasteners-0.7.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.concurrency/oslo.concurrency-4.0.2.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=64913ccc60b7069c1f6f5d92d9d3a589
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.0.2 b/metadata/md5-cache/dev-python/oslo-config-8.0.2
new file mode 100644
index 000000000000..9cf1fe3caab0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-config-8.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=d7084871c97995971f98ee641d5de709
diff --git a/metadata/md5-cache/dev-python/oslo-db-8.1.0 b/metadata/md5-cache/dev-python/oslo-db-8.1.0
new file mode 100644
index 000000000000..5e2b57d6859c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-db-8.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=OpenStack Common DB Code
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=+sqlite mysql postgres python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.9.6[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/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-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-utils-3.33.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/sqlalchemy-1.2.0[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.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[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.db/oslo.db-8.1.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=f4bd1f3162d18d29644b582b0911d5f1
diff --git a/metadata/md5-cache/dev-python/oslo-log-4.1.2 b/metadata/md5-cache/dev-python/oslo-log-4.1.2
new file mode 100644
index 000000000000..77f7d39213eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-log-4.1.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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/pbr-3.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=OpenStack logging config library, configuration for all openstack projects.
+EAPI=7
+HOMEPAGE=https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-3.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.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.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyinotify-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.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.log/oslo.log-4.1.2.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=f7de8bbf5425342aa9917965a699bad2
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-4.0.2 b/metadata/md5-cache/dev-python/oslo-middleware-4.0.2
new file mode 100644
index 000000000000..d1f478a3e945
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-middleware-4.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Components injected into wsgi pipelines to intercept request/response flows.
+EAPI=7
+HOMEPAGE=https://pypi.org/project/oslo.middleware/
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[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-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-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/statsd-3.2.1[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.middleware/oslo.middleware-4.0.2.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=fad10fe118d019304e8187c168883f80
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-3.1.1 b/metadata/md5-cache/dev-python/oslo-serialization-3.1.1
new file mode 100644
index 000000000000..b9eefd93df05
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-serialization-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Oslo Serialization library
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.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.serialization/oslo.serialization-3.1.1.tar.gz -> oslo-serialization-3.1.1.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=06556780ebb68a48e15f5f833cc8a7a1
diff --git a/metadata/md5-cache/dev-python/oslo-service-2.1.1 b/metadata/md5-cache/dev-python/oslo-service-2.1.1
new file mode 100644
index 000000000000..e66342bc347e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-service-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Library for running OpenStack services
+EAPI=7
+HOMEPAGE=https://pypi.org/project/oslo.service/
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.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/eventlet-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[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/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-concurrency-3.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/yappi-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.service/oslo.service-2.1.1.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=ee29a83326316a1bb9f846ad7354379f
diff --git a/metadata/md5-cache/dev-python/oslo-upgradecheck-1.0.1 b/metadata/md5-cache/dev-python/oslo-upgradecheck-1.0.1
new file mode 100644
index 000000000000..73c12add8b00
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-upgradecheck-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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=Oslo i18n library
+EAPI=7
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-1.3[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-i18n-3.15.3[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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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.upgradecheck/oslo.upgradecheck-1.0.1.tar.gz -> oslo-upgradecheck-1.0.1.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=ded506a90d7f4e00d44036e5d7236df9
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2 b/metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2
new file mode 100644
index 000000000000..21ac67544ab7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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-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
+DESCRIPTION=A library that provides a generic versioned and RPC-friendly object model.
+EAPI=7
+HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/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-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-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-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-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[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.versionedobjects/oslo.versionedobjects-2.0.2.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=4c59250bdfd981355a3016a93f789ff3
diff --git a/metadata/md5-cache/dev-python/parso-0.7.0 b/metadata/md5-cache/dev-python/parso-0.7.0
index d4559533c57e..e49c6774e789 100644
--- a/metadata/md5-cache/dev-python/parso-0.7.0
+++ b/metadata/md5-cache/dev-python/parso-0.7.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-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(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/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=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(+)] ) ) ) 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(-)] ) 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=a python parser that supports error recovery and round-trip parsing
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/parso https://pypi.org/project/parso/
-IUSE=doc test doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+IUSE=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
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 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 ) >=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 ) !test? ( test )
+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=https://github.com/davidhalter/parso/archive/v0.7.0.tar.gz -> parso-0.7.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5bb54012fcd2778f1d9842ed8d304cb6
+_md5_=6ed88a2848224e003d658e9884023972
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
index a741d643dc04..4c37978ef2a9 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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 ) 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=Pattern matching and various utilities for file systems paths
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pathtools/
-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 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=52b151ca3773f34a70a7042e126509f9
+_md5_=6f7412b6e6fd57f8c703d3d5ebe8dba4
diff --git a/metadata/md5-cache/dev-python/pbr-5.1.1 b/metadata/md5-cache/dev-python/pbr-5.1.1
index cab34145264a..82c44bc64677 100644
--- a/metadata/md5-cache/dev-python/pbr-5.1.1
+++ b/metadata/md5-cache/dev-python/pbr-5.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=6
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=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(+)] ) >=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/p/pbr/pbr-5.1.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b0a3b33eb38a09476ab08cb0764a248
+_md5_=dbca910b5a9aeb06d13f93c39ee24a3e
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.2 b/metadata/md5-cache/dev-python/phonenumbers-8.12.2
index ef25fd3f3bbb..5938ce54aae5 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.2
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python port of Google's libphonenumber
 EAPI=7
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/p/phonenumbers/phonenumbers-8.12.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=2f85e0bec865651f9a04951933ae272c
+_md5_=e7878dd92ac25b81a43d90b410ae44b7
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.5 b/metadata/md5-cache/dev-python/pickleshare-0.7.5
index d1394130dedc..435d1e3f116f 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.5
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.5
@@ -5,7 +5,7 @@ DESCRIPTION=A small 'shelve' like datastore with concurrency support
 EAPI=7
 HOMEPAGE=https://github.com/pickleshare/pickleshare
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/path-py-6.2[python_targets_python3_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/p/pickleshare/pickleshare-0.7.5.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=45561511f24ff6ba4e865ea7416bdb0b
+_md5_=3071229227bfbe98f6be67d48d9686a2
diff --git a/metadata/md5-cache/dev-python/pip-20.1.1 b/metadata/md5-cache/dev-python/pip-20.1.1
index 93174fa1c16f..fc943cb69e8e 100644
--- a/metadata/md5-cache/dev-python/pip-20.1.1
+++ b/metadata/md5-cache/dev-python/pip-20.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=7
 HOMEPAGE=https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=test -vanilla 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=>=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),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(-)]
 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=https://github.com/pypa/pip/archive/20.1.1.tar.gz -> pip-20.1.1.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-44.0.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.34.2-py2.py3-none-any.whl )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d1ed23cb0f546bd410a39fb5367a92ed
+_md5_=71da3ab9238b14d27f1da7ddd9effdae
diff --git a/metadata/md5-cache/dev-python/pipfile-0.0.2 b/metadata/md5-cache/dev-python/pipfile-0.0.2
index 858be2912c52..2db7bffea172 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	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=863c97b1c170ff1d74047de15898c271
+_md5_=63bc0fb6cd8b970d30fe6b4ce4794874
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.0 b/metadata/md5-cache/dev-python/pluginbase-1.0.0
new file mode 100644
index 000000000000..6b02c53e079f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pluginbase-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/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=Support library for building plugins sytems in Python
+EAPI=7
+HOMEPAGE=https://github.com/mitsuhiko/pluginbase
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pluginbase/pluginbase-1.0.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=dc729dffbc81cdeb5cc227194770eb57
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.20 b/metadata/md5-cache/dev-python/pocketlint-0.20
index ae8ec30f7094..2b8b4aaa3e10 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.20
+++ b/metadata/md5-cache/dev-python/pocketlint-0.20
@@ -4,11 +4,11 @@ DESCRIPTION=Shared code for running pylint against rhinstaller projects
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/pocketlint
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/rhinstaller/pocketlint/archive/0.20.tar.gz -> pocketlint-0.20.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=9c4e0ae9c70d6f0672bdd8a0f07ab47e
+_md5_=f4f83b38bb364ce93d5f8959c073ddf2
diff --git a/metadata/md5-cache/dev-python/pybind11-2.5.0 b/metadata/md5-cache/dev-python/pybind11-2.5.0
new file mode 100644
index 000000000000..7148ef5d947f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pybind11-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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 setup 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(-)] doc? ( dev-python/breathe[python_targets_python3_6(-)?,python_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-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_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(-)] )
+DESCRIPTION=AST-based Python refactoring library
+EAPI=7
+HOMEPAGE=https://pybind11.readthedocs.io/en/stable/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+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(-)] dev-cpp/eigen: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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pybind/pybind11/archive/v2.5.0.tar.gz -> pybind11-2.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d55094d719840cf4d3e41bfd888e17c3
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1 b/metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1
index 38ecd934d052..9d5106ecc0f6 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1
+++ b/metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Cython wrapper for the C++ translation of the Angus Johnson's Clippe
 EAPI=7
 HOMEPAGE=https://github.com/fonttools/pyclipper
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/pyclipper/archive/1.1.0.post3.tar.gz -> pyclipper-1.1.0_p3.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a27f0adc8e85d6c73feed888e8b26381
+_md5_=b04b9c0608f4c4a282d3ee5c433b41e5
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5
index c2186cd29a38..64a409269ca1 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
 EAPI=7
 HOMEPAGE=https://github.com/renpy/pygame_sdl2
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 ZLIB
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,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/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=69d2f3440401596c26d6af760833536d
+_md5_=ea0e4fdf7c4d6000f6e7230dd5317fc2
diff --git a/metadata/md5-cache/dev-python/pygit2-1.2.1 b/metadata/md5-cache/dev-python/pygit2-1.2.1
index c04d40625375..1cc27da18ccc 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.2.1
+++ b/metadata/md5-cache/dev-python/pygit2-1.2.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for libgit2
 EAPI=7
 HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-1.0* dev-python/cached-property[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cffi-1.0:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.2.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=740ee49652c84362ae5cd21c30925ac6
+_md5_=f6f67ef0f56595cc37c81caec568e8a1
diff --git a/metadata/md5-cache/dev-python/pygobject-3.34.0 b/metadata/md5-cache/dev-python/pygobject-3.34.0
index 7097b3aff060..5691663d8c2f 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.34.0
+++ b/metadata/md5-cache/dev-python/pygobject-3.34.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for GObject Introspection
 EAPI=7
 HOMEPAGE=https://pygobject.readthedocs.io/
 IUSE=+cairo examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-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+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/cairo[glib] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.34/pygobject-3.34.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d11c0b5c5a132eb1803add75c2ea04ce
+_md5_=e19a2503c9592f4e51c7950a04608f4f
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r2 b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
index 13521c6c80ce..e6dd26dd78ba 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r2
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=A Python wrapper for the GPGME library
 EAPI=7
 HOMEPAGE=https://launchpad.net/pygpgme
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bc73d870c13f4b2dc7b6ebe2daaee1ce
+_md5_=d535a937e733e0ebd6d275a82c64f0f9
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r5 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r5
index 1ab77e08a836..602db5939aec 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r5
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r5
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+2 bindings for Python
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/Archive/pygtk
 IUSE=doc examples test python_targets_python2_7 test
-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.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.26.8-r53:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/libglade-2.5:2.0
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
 _eclasses_=autotools	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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=009fa00a5df82304ae7806333b65443d
+_md5_=f2be92027a9644c1ea80ad52bfe7a65c
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1 b/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
index d0cffbae585e..1e412d7dee4b 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Minimal PyPI server
 EAPI=7
 HOMEPAGE=https://github.com/pypiserver/pypiserver
 IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86
 LICENSE=ZLIB MIT
 RDEPEND=dev-python/pip[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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=https://github.com/pypiserver/pypiserver/archive/v1.3.1.tar.gz -> pypiserver-1.3.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d049fbcaf63938ba7c3ffda1ca31f408
+_md5_=3ddda83515d9a1d34c85d349bd872de4
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-4 b/metadata/md5-cache/dev-python/pyproject2setuppy-4
index 57708e264f77..4db46a3c38ec 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-4
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-4
@@ -4,7 +4,7 @@ DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=BSD-2
 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(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v4.tar.gz -> pyproject2setuppy-4.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e9f2c94f6234a795f07500e902e110a4
+_md5_=b4f0d6f1fa336c10865ca77d6aa9e079
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0 b/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
index 95633ba0ffc4..e4cb2aa49b6b 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
 EAPI=7
 HOMEPAGE=http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/
 IUSE=examples opengl svg doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] opengl? ( dev-python/pyopengl[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(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.11.0rc0.tar.gz -> pyqtgraph-0.11.0_rc0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=880cafa530eb0265e7884b9248d0014a
+_md5_=0da236727af9174ea48af5b83a099da7
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.0-r1 b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
index 7b04db0fdebd..8c90c52b7337 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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(-)] ) python_targets_python3_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 VTXXX-compatible terminal emulator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyte/ https://github.com/selectel/pyte
-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 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/selectel/pyte/archive/0.8.0.tar.gz -> pyte-0.8.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ed013d26ca41ab1c9d35904425c77a9f
+_md5_=29a275d19541361aaea80f06e4d4d328
diff --git a/metadata/md5-cache/dev-python/pytest-5.4.3 b/metadata/md5-cache/dev-python/pytest-5.4.3
new file mode 100644
index 000000000000..e9fbc9f79188
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-5.4.3
@@ -0,0 +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 ) 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/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(-)] test? ( >=dev-python/hypothesis-3.56[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/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/pygments[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[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/xmlschema[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/flaky )
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest/pytest-5.4.3.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=023d2ba5a2d6894210b49601aab40f25
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.12.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.12.0
index 99a82923ea32..13d1363d4cfe 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.12.0
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.12.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/async_generator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hypothesis-3.64[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pytest-5.4.0 dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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/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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~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 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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/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.12.0.tar.gz -> pytest-asyncio-0.12.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4085675fc442c5a943401af1500e99d6
+_md5_=ab5dabc4c38a89196d71ee30e989287a
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
index 5387bccba2e2..c5bedac9803a 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=py.test plugin that stores test expectations by saving the set of fa
 EAPI=7
 HOMEPAGE=https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/
 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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/u-msgpack[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
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=cc68be9ae29a2ef3d3287e77d23dc232
+_md5_=52f0169e361a183a9c05ffa889c10faf
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.1.0 b/metadata/md5-cache/dev-python/pytest-mock-3.1.0
index 0a8730d42a04..3262fe357bbb 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.1.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 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/pytest-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(-)] 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/p/pytest-mock/pytest-mock-3.1.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=2359b66ef71c8efd11492520db17e8d1
+_md5_=50805573f267e3f22e5ae9a3269c3920
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0
index 4668fe1eea1f..4d8cd0debf09 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=A goodie-bag of unix shell and environment tools for py.test
 EAPI=7
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/
 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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/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/execnet[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/path-py[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(-)] dev-python/termcolor[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5d172ed514389de88985343ffe69b5a5
+_md5_=f6aad6652e5004f74f08ad238047cb92
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
index e43b3169f2e7..e1025f3c3e98 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=7
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/
 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest-fixture-config[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-shutil[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[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/virtualenv[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=17f8935535009b5cdaa4c02885ca3f53
+_md5_=1e72408d1f9e1079b9f79ab654ddab74
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.13.0 b/metadata/md5-cache/dev-python/python-dotenv-0.13.0
new file mode 100644
index 000000000000..2d10528e279e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=test? ( >=dev-python/click-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/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/sh-1.09[python_targets_python3_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=Manage .env files
+EAPI=7
+HOMEPAGE=https://github.com/theskumar/python-dotenv
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.13.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=35aae77e0fdd0f8fb841fca24982e834
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12-r1 b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
index 65947074d74b..fffcedf731b6 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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(-)]
+BDEPEND=test? ( dev-libs/lzo:2 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(-)] ) python_targets_python3_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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/lzo:2 dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-libs/lzo:2
 DESCRIPTION=Python interface to lzo
 EAPI=7
 HOMEPAGE=https://github.com/jd-boyd/python-lzo
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=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=GPL-2
-RDEPEND=dev-libs/lzo:2 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-libs/lzo: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 ) 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/p/python-lzo/python-lzo-1.12.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=645a79845e170cf8cc6524f339acb2e9
+_md5_=a9409bb6e8db7036b241d7241380ada2
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.13 b/metadata/md5-cache/dev-python/python-stdnum-1.13
index d1045b17a6a2..815ea3ab2e9f 100644
--- a/metadata/md5-cache/dev-python/python-stdnum-1.13
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.13
@@ -5,7 +5,7 @@ DESCRIPTION=A module to handle standardized numbers and codes
 EAPI=7
 HOMEPAGE=https://arthurdejong.org/python-stdnum/
 IUSE=vies test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=vies? ( || ( dev-python/zeep dev-python/suds ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/p/python-stdnum/python-stdnum-1.13.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=461314d0e9c63f8498b0ba717536230d
+_md5_=2a9193a5a71dbc973748cf846aef4906
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1 b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
index 821cfe8a844b..b27323dc8ec0 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
@@ -2,7 +2,7 @@ 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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_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/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for KDL
 EAPI=5
-HOMEPAGE=http://www.orocos.org/kdl
+HOMEPAGE=https://www.orocos.org/kdl
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44e9bd7e9bdfb0cf63d1a7f361323356
+_md5_=60226f85a8b4b5917080a7c4e7c29b05
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-9999 b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
index d74dbfcba285..da5343fa3d52 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-9999
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
@@ -2,7 +2,7 @@ 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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,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] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for KDL
 EAPI=5
-HOMEPAGE=http://www.orocos.org/kdl
+HOMEPAGE=https://www.orocos.org/kdl
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=LGPL-2.1
 PROPERTIES=live
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44e9bd7e9bdfb0cf63d1a7f361323356
+_md5_=60226f85a8b4b5917080a7c4e7c29b05
diff --git a/metadata/md5-cache/dev-python/readme_renderer-25.0 b/metadata/md5-cache/dev-python/readme_renderer-25.0
index 9a15c737bdb0..d4e87a173d8a 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-25.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-25.0
@@ -5,7 +5,7 @@ DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
 EAPI=7
 HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/
 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 ~arm64 ~hppa ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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/docutils-0.13.1[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/pygments-2.5.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/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(-)] 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/readme_renderer/readme_renderer-25.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=2ce9b7c1406f8c91145a2f945dd4eb12
+_md5_=144d8d1bcec041b251a02610e86c1c4a
diff --git a/metadata/md5-cache/dev-python/responses-0.10.14 b/metadata/md5-cache/dev-python/responses-0.10.14
new file mode 100644
index 000000000000..85048e214985
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.10.14
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-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=Utility for mocking out the Python Requests library
+EAPI=7
+HOMEPAGE=https://github.com/getsentry/responses
+IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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/responses/responses-0.10.14.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=9592679c85e07dcac586533002421a91
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
index 663452d1ec90..ccdc01041049 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=A pure python RFC3339 validator
 EAPI=7
 HOMEPAGE=https://github.com/naimetti/rfc3339-validator
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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=https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz -> rfc3339-validator-0.1.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=69971eb9cf6d657acfb002ad3db38712
+_md5_=b6a5ee0b3f77cfcbe586cb2aa477234e
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index 364dffae8034..0095d87ece46 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure python RFC3986 validator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=aba1f7798759323d260b93143fa17360
+_md5_=d6c8ee1e675486359f87ee1500f9443d
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.2 b/metadata/md5-cache/dev-python/secretstorage-3.1.2
index 13664c678ce6..2e1d5379deaa 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.2
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=7
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[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/jeepney-0.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(-)] 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/S/SecretStorage/SecretStorage-3.1.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=c2c0ebd131d21b7889fc1cf9fc1d421b
+_md5_=8e56e923bac6b9d7fee83c75a4706cf0
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
index 061e285a055f..8d582baaa3a6 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx theme for aiohttp
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/aiohttp-theme
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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/a/aiohttp-theme/aiohttp-theme-0.1.6.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=19b085310948edbfff669b5f0c55ec06
+_md5_=f8f3f95cd2f61a096c1273441da7cff7
diff --git a/metadata/md5-cache/dev-python/stripe-2.46.0 b/metadata/md5-cache/dev-python/stripe-2.46.0
index 269b4bec7799..81019efe46d3 100644
--- a/metadata/md5-cache/dev-python/stripe-2.46.0
+++ b/metadata/md5-cache/dev-python/stripe-2.46.0
@@ -5,7 +5,7 @@ DESCRIPTION=Stripe python bindings
 EAPI=7
 HOMEPAGE=https://github.com/stripe/stripe-python
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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/s/stripe/stripe-2.46.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=69f60e0be945990f6c6f4e14865d876d
+_md5_=f4025c8a224cc962d6e4dccb082ee80a
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
index 009b3a23ad36..e2d3c87e38fd 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=ANSII Color formatting for output in terminal
 EAPI=7
 HOMEPAGE=https://pypi.org/project/termcolor/
 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 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(-)]
 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
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=062f0ac49f51f284156fe4eacc90fc28
+_md5_=f814a10146e48fc4aa8ae30c21cb992f
diff --git a/metadata/md5-cache/dev-python/testpath-0.4.4-r1 b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
index 887b9c8ea238..f27c5825b08e 100644
--- a/metadata/md5-cache/dev-python/testpath-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Test utilities for code working with files and commands
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/
 IUSE=test 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=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=https://github.com/jupyter/testpath/archive/0.4.4.tar.gz -> testpath-0.4.4.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7d20fa476c07397e545f7eef3c7c6ec2
+_md5_=768be2d5afb83bf6c163bf440260fc7f
diff --git a/metadata/md5-cache/dev-python/towncrier-19.2.0 b/metadata/md5-cache/dev-python/towncrier-19.2.0
index aa01e77a9119..8080b5f2e5f9 100644
--- a/metadata/md5-cache/dev-python/towncrier-19.2.0
+++ b/metadata/md5-cache/dev-python/towncrier-19.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Building newsfiles for your project
 EAPI=7
 HOMEPAGE=https://github.com/hawkowl/towncrier
 IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/click-default-group[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/incremental[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hawkowl/towncrier/archive/19.2.0.tar.gz -> towncrier-19.2.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b315e6c0ef9644b3831b46b8ac227e73
+_md5_=13625be99cae7256e6f06b47750bb8cf
diff --git a/metadata/md5-cache/dev-python/tqdm-4.45.0 b/metadata/md5-cache/dev-python/tqdm-4.45.0
index 34f8a76efce2..1dfedd83c021 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.45.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.45.0
@@ -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
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-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/t/tqdm/tqdm-4.45.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1f807c4b5b639bbf619b5d8d75d36cc3
+_md5_=302090a28a93dc147be2f233ecf49036
diff --git a/metadata/md5-cache/dev-python/tqdm-4.46.1 b/metadata/md5-cache/dev-python/tqdm-4.46.1
new file mode 100644
index 000000000000..b71440dc7035
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.46.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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 ~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.46.1.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=0073c95b949fea1a095a942723c69378
diff --git a/metadata/md5-cache/dev-python/tubes-0.2.0 b/metadata/md5-cache/dev-python/tubes-0.2.0
new file mode 100644
index 000000000000..b766f4c21981
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tubes-0.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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/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/twisted[python_targets_python3_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=Flow control and backpressure for event-driven applications
+EAPI=7
+HOMEPAGE=https://github.com/twisted/tubes https://pypi.org/project/Tubes/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+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(-)] dev-python/twisted[python_targets_python3_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://github.com/twisted/tubes/archive/v0.2.0.tar.gz -> tubes-0.2.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=18dd7691dc4201111cfd433c6e5ff2d2
diff --git a/metadata/md5-cache/dev-python/twine-1.15.0 b/metadata/md5-cache/dev-python/twine-1.15.0
index a870e2f7860d..911eb6f81bc3 100644
--- a/metadata/md5-cache/dev-python/twine-1.15.0
+++ b/metadata/md5-cache/dev-python/twine-1.15.0
@@ -5,7 +5,7 @@ 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_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=Apache-2.0
 RDEPEND=>=dev-python/tqdm-4.14[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/pkginfo-1.4.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/readme_renderer-21.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/requests-2.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/requests-toolbelt-0.8.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/pyblake2[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(-)] >=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=https://github.com/pypa/twine/archive/1.15.0.tar.gz -> twine-1.15.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=65576432dc9e67fcebf8f5570a02b3ab
+_md5_=a195a52b402abe95ff81adca8ef4c7d2
diff --git a/metadata/md5-cache/dev-python/twine-3.1.1 b/metadata/md5-cache/dev-python/twine-3.1.1
index 265150403f7f..70998d4241ef 100644
--- a/metadata/md5-cache/dev-python/twine-3.1.1
+++ b/metadata/md5-cache/dev-python/twine-3.1.1
@@ -4,7 +4,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+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(-)] 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/pypa/twine/archive/3.1.1.tar.gz -> twine-3.1.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a27dc92cbfe0500a21fd1c9c9117fa06
+_md5_=a7fdb0d243592ee62c226ad9d1631e25
diff --git a/metadata/md5-cache/dev-python/twisted-16.6.0-r3 b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
deleted file mode 100644
index c7e162478ac9..000000000000
--- a/metadata/md5-cache/dev-python/twisted-16.6.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=https://www.twistedmatrix.com/trac/
-IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] conch? ( dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/idna-0.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-2.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <dev-python/hyper-h2-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://twistedmatrix.com/Releases/Twisted/16.6/Twisted-16.6.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30bdff17fa76722cd854eeb9738ab47b
diff --git a/metadata/md5-cache/dev-python/twisted-18.4.0 b/metadata/md5-cache/dev-python/twisted-18.4.0
deleted file mode 100644
index 4c05749cb4a8..000000000000
--- a/metadata/md5-cache/dev-python/twisted-18.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=7
-HOMEPAGE=https://www.twistedmatrix.com/trac/
-IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] conch? ( dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/idna-0.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <dev-python/hyper-h2-4.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/automat-0.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/hyperlink-17.1.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://twistedmatrix.com/Releases/Twisted/18.4/Twisted-18.4.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e4568796d3abcd91fc0c828dd8988313
diff --git a/metadata/md5-cache/dev-python/twisted-19.10.0 b/metadata/md5-cache/dev-python/twisted-19.10.0
index ae6be3250b7c..268148f3cec7 100644
--- a/metadata/md5-cache/dev-python/twisted-19.10.0
+++ b/metadata/md5-cache/dev-python/twisted-19.10.0
@@ -4,13 +4,13 @@ DEPEND=dev-python/bcrypt >=dev-python/incremental-16.10.1[python_targets_python2
 DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=7
 HOMEPAGE=https://www.twistedmatrix.com/trac/
-IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+IUSE=conch crypt http2 serial test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/attrs-17.4.0[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/automat-0.3.0[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/constantly-15.1.0[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/hyperlink-17.1.1[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/incremental-16.10.1[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/pyhamcrest-1.9.0[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/zope-interface-4.4.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(-)] conch? ( dev-python/pyasn1[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/cryptography-1.5.0[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/appdirs-1.4.0[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(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[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/service_identity[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/idna-0.6[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(-)] ) serial? ( >=dev-python/pyserial-3.0[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(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-3.0.0[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/hyper-h2-4.0.0[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/priority-1.1.0[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/priority-2.0[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/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web 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_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(-)]
+RDEPEND=>=dev-python/attrs-17.4.0[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/automat-0.3.0[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/constantly-15.1.0[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/hyperlink-17.1.1[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/incremental-16.10.1[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/pyhamcrest-1.9.0[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/zope-interface-4.4.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(-)] conch? ( dev-python/pyasn1[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/cryptography-1.5.0[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/appdirs-1.4.0[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(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[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/service_identity[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/idna-0.6[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(-)] ) serial? ( >=dev-python/pyserial-3.0[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(-)] ) http2? ( >=dev-python/hyper-h2-3.0.0[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/hyper-h2-4.0.0[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/priority-1.1.0[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/priority-2.0[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/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web 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_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://twistedmatrix.com/Releases/Twisted/19.10/Twisted-19.10.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=200be1fed6980d4a13678fcb4e8b6ee0
+_md5_=8a6f2a51235445f95521ade03a57b6e8
diff --git a/metadata/md5-cache/dev-python/twisted-20.3.0 b/metadata/md5-cache/dev-python/twisted-20.3.0
index 610415d8ec70..e4ede93d3700 100644
--- a/metadata/md5-cache/dev-python/twisted-20.3.0
+++ b/metadata/md5-cache/dev-python/twisted-20.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=7
 HOMEPAGE=https://www.twistedmatrix.com/trac/
 IUSE=conch crypt http2 serial test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.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/automat-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/constantly-15.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/hyperlink-17.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/incremental-16.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/pyhamcrest-1.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/zope-interface-4.4.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(-)] conch? ( dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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-1.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(-)] >=dev-python/appdirs-1.4.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(-)] ) crypt? ( >=dev-python/pyopenssl-16.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/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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-0.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(-)] ) serial? ( >=dev-python/pyserial-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(-)] ) http2? ( >=dev-python/hyper-h2-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/hyper-h2-4.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/priority-1.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/priority-2.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/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/20.3/Twisted-20.3.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=36b6ed63f69af639ac7f9497c02e7177
+_md5_=48f49d87f0c4de821b527edeb8a98e69
diff --git a/metadata/md5-cache/dev-python/ujson-3.0.0 b/metadata/md5-cache/dev-python/ujson-3.0.0
new file mode 100644
index 000000000000..af2f5512b297
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ujson-3.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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=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/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Ultra fast JSON encoder and decoder for Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ujson/
+IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/ujson/ujson-3.0.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=7fc5848da4116edee680aa314f4b6a4e
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.6 b/metadata/md5-cache/dev-python/unittest-mixins-1.6
index 44bcc2155011..8acf5583f447 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.6
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.6
@@ -4,7 +4,7 @@ DESCRIPTION=A set of mixin classes and other helpers for unittest test case clas
 EAPI=7
 HOMEPAGE=https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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=Apache-2.0
 RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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=https://github.com/nedbat/unittest-mixins/archive/v1.6.tar.gz -> unittest-mixins-1.6.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0d3ba9b142e9004af4b9a1db2d444ecb
+_md5_=7f90b1c912dc095b52a6220af96039d1
diff --git a/metadata/md5-cache/dev-python/urwid-2.1.0 b/metadata/md5-cache/dev-python/urwid-2.1.0
index 04172b7992ea..bb64b915a51d 100644
--- a/metadata/md5-cache/dev-python/urwid-2.1.0
+++ b/metadata/md5-cache/dev-python/urwid-2.1.0
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8[ncurses] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[ncurses] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[ncurses] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] 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[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=doc? ( || ( ( dev-lang/python:3.9[ncurses] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[ncurses] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[ncurses] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[ncurses] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] 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[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=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=Curses-based user interface library for Python
 EAPI=7
 HOMEPAGE=http://urwid.org/ https://pypi.org/project/urwid/
-IUSE=doc examples doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=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 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.1.0.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=88728715e99d9d1dcd14cdfe4a16936c
+_md5_=9e6307ed0884d500b53bf0d37dc56914
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.7.10 b/metadata/md5-cache/dev-python/virtualenv-16.7.10
index ceb7cfd6590f..37482e98d4e0 100644
--- a/metadata/md5-cache/dev-python/virtualenv-16.7.10
+++ b/metadata/md5-cache/dev-python/virtualenv-16.7.10
@@ -4,7 +4,7 @@ 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 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools-19.6.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(-)] 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=https://github.com/pypa/virtualenv/archive/16.7.10.tar.gz -> virtualenv-16.7.10.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b58c5b334dfddd147593fd293f5798cb
+_md5_=478e7aa503c8e3bbffa12e880a60655d
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.21 b/metadata/md5-cache/dev-python/virtualenv-20.0.21
index e6b813514693..20a6764001d4 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.0.21
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.21
@@ -4,7 +4,7 @@ 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
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/20.0.21.tar.gz -> virtualenv-20.0.21.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=581e790d49dffd5c9c165fa67741b875
+_md5_=7634925cc00d82128d14434f760a8ff0
diff --git a/metadata/md5-cache/dev-python/waitress-1.4.4 b/metadata/md5-cache/dev-python/waitress-1.4.4
new file mode 100644
index 000000000000..9cf82161dac1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/waitress-1.4.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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=A pure-Python WSGI server
+EAPI=7
+HOMEPAGE=https://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.org/project/waitress/ https://github.com/Pylons/waitress
+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 ~s390 ~sparc ~x86
+LICENSE=ZPL
+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/w/waitress/waitress-1.4.4.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=215db0e895d281d29af8028bd7d821bc
diff --git a/metadata/md5-cache/dev-python/watchdog-0.10.2 b/metadata/md5-cache/dev-python/watchdog-0.10.2
new file mode 100644
index 000000000000..5eeba5f5646e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-0.10.2
@@ -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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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.2.tar.gz -> watchdog-0.10.2.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=78dad5f1667103ac90e3d8ec67963b5f
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.9 b/metadata/md5-cache/dev-python/wcwidth-0.1.9
index d139e29bbc16..fd9b9a8137d8 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.9
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.9
@@ -4,7 +4,7 @@ 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
 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(-)]
 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/w/wcwidth/wcwidth-0.1.9.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=55c96ffb323207469e0000d4f0add315
+_md5_=eef632ae3442858c4dd2768f8dd137cd
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.2-r1 b/metadata/md5-cache/dev-python/wcwidth-0.2.2-r1
new file mode 100644
index 000000000000..aacaa33f0117
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.2-r1
@@ -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[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.2.tar.gz -> wcwidth-0.2.2.gh.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=0f9a2469b5e9c0a1aa43f17a2cf66f42
diff --git a/metadata/md5-cache/dev-python/wrapt-1.12.1 b/metadata/md5-cache/dev-python/wrapt-1.12.1
index 80f1ef3c9910..b5d24191dbcd 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.12.1
+++ b/metadata/md5-cache/dev-python/wrapt-1.12.1
@@ -4,7 +4,7 @@ DESCRIPTION=Module for decorators, wrappers and monkey patching
 EAPI=7
 HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
 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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.12.1.tar.gz -> wrapt-1.12.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0c67bd9a2ef2631ff4e3c3e3f97f0744
+_md5_=22ae50ebb03a3b2053601526681469d7
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7 b/metadata/md5-cache/dev-python/wxpython-4.0.7
index 7ff124fd5b68..5a987c4f99e1 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7
@@ -5,7 +5,7 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=7
 HOMEPAGE=http://www.wxpython.org/
 IUSE=test webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg: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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=719b84a604f6ecec07d95d1ed5aef3aa
+_md5_=e0063935af1ed48661399b832e0eb549
diff --git a/metadata/md5-cache/dev-python/yappi-1.2.5 b/metadata/md5-cache/dev-python/yappi-1.2.5
index 15805f949d11..b0569e271abb 100644
--- a/metadata/md5-cache/dev-python/yappi-1.2.5
+++ b/metadata/md5-cache/dev-python/yappi-1.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Yet Another Python Profiler
 EAPI=7
 HOMEPAGE=https://pypi.org/project/yappi/ https://github.com/sumerc/yappi
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/contextvars[python_targets_python3_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://github.com/sumerc/yappi/archive/b6c7d9f0bb40b511f61bb82cc395ad9140a4f4b0.tar.gz -> yappi-1.2.5.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0935dd703d29a6b40f006610e8e120fb
+_md5_=8fb14cc73aa4a0c9fae06dff69a2c48a
diff --git a/metadata/md5-cache/dev-python/yarl-1.4.2 b/metadata/md5-cache/dev-python/yarl-1.4.2
index 428325c24679..64a7be426134 100644
--- a/metadata/md5-cache/dev-python/yarl-1.4.2
+++ b/metadata/md5-cache/dev-python/yarl-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Yet another URL library
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/yarl/
 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 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.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/idna-2.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=mirror://pypi/y/yarl/yarl-1.4.2.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=382cea59227f6dde71a7baba57269377
+_md5_=a2e43f4a9617e0e31804907ccad6d147
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index e272430fb57f..41c12f5de0ff 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2
deleted file mode 100644
index da454b1469b4..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2
+++ /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	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=8f3c3f85bc6be6f763420f0e9c69aac4
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
index c1e4d08860ef..5891bd9615b5 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
@@ -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	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=3edebe08a8d936ac020c0180085cfb66
+_md5_=931f4c39e70189c280b686975719b699
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index d3eb49b28bf0..4dfe2e657053 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3 b/metadata/md5-cache/dev-ruby/coderay-1.1.3
new file mode 100644
index 000000000000..7a1a698dac3d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A Ruby library for syntax highlighting
+EAPI=7
+HOMEPAGE=http://coderay.rubychan.de/
+IUSE=ruby_targets_ruby24 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
+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/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=d1ad7f02bce7bb7759f8fa6e7a8d7dcd
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.3 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
new file mode 100644
index 000000000000..310ccfec07cd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-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? ( 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=Generic connection pooling for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/mperham/connection_pool
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/connection_pool-2.2.3.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=65319e622d60774faab00a2a5856a8ef
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.13.0 b/metadata/md5-cache/dev-ruby/ffi-1.13.0
new file mode 100644
index 000000000000..d9299f7a807e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.13.0
@@ -0,0 +1,16 @@
+BDEPEND=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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/libffi 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=Ruby extension for programmatically loading dynamic libraries
+EAPI=7
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-libs/libffi:0= 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/ffi/ffi/archive/1.13.0.tar.gz -> ffi-git-1.13.0.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=dc6c3f73a412d4431f381ad7611e3d3f
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.2 b/metadata/md5-cache/dev-ruby/flog-4.6.2
index 77dbefeda09e..2342d280f20a 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.2
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24(-)] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24(-)] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/path_expander:1[ruby_targets_ruby25(-)] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby25(-)] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/path_expander:1[ruby_targets_ruby26(-)] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
 DESCRIPTION=Flog reports the most tortured code in an easy to read pain report
 EAPI=6
-HOMEPAGE=http://ruby.sadi.st/
+HOMEPAGE=https://ruby.sadi.st/
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=49858d0703f64cad3cee0beb165671dc
+_md5_=10e7252db835ca9e565b7c808d7cd72b
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.3 b/metadata/md5-cache/dev-ruby/flog-4.6.3
index 8c507483471d..41440ae23604 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.3
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.3
@@ -3,7 +3,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_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 DESCRIPTION=Flog reports the most tortured code in an easy to read pain report
 EAPI=7
-HOMEPAGE=http://ruby.sadi.st/
+HOMEPAGE=https://ruby.sadi.st/
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.3.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=533c4aa8999d311fc0036eadc966eec8
+_md5_=6eeb2943e49a103ee69244a42646d8e6
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.4 b/metadata/md5-cache/dev-ruby/flog-4.6.4
index b7243a6105b9..d2b6cfbdcfbd 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.4
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.4
@@ -3,7 +3,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_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 DESCRIPTION=Flog reports the most tortured code in an easy to read pain report
 EAPI=7
-HOMEPAGE=http://ruby.sadi.st/
+HOMEPAGE=https://ruby.sadi.st/
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.4.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=533c4aa8999d311fc0036eadc966eec8
+_md5_=6eeb2943e49a103ee69244a42646d8e6
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
new file mode 100644
index 000000000000..8456877185af
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24(-)] dev-ruby/minitest[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/hoe[ruby_targets_ruby25(-)] dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/hoe[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/hoe[ruby_targets_ruby27(-)] dev-ruby/minitest[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=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
+EAPI=7
+HOMEPAGE=https://github.com/drbrain/net-http-persistent
+IUSE=doc test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/connection_pool-2.2: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 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=a96777132e271e231fa4b6bdc4249b00
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 e461b242790f..df75ebe99437 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.10.0-1stretch_all.deb
 _eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=ba3066b564a51300a700761c95873c9b
+_md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.9.1 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.9.1
deleted file mode 100644
index 9b7f4258bb70..000000000000
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.9.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Library needed to connect puppet to puppetdb
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-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.9.1-1stretch_all.deb
-_eclasses_=unpacker	b5891c9326ad2e7905c011d44c927c34
-_md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.1
index da72f203a028..2a6849dee5e3 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.1.tar.gz -> sprockets-rails-3.2.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d795e2addfd323ce26abc100710c817
+_md5_=7aea67d147740a4a93750d1f4acadcdf
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.2.0 b/metadata/md5-cache/dev-ruby/uglifier-4.2.0
index ae6fd87af11c..3506a36abef1 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-4.2.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.2.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sourcemap[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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/sourcemap[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/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
 EAPI=7
 HOMEPAGE=https://github.com/lautis/uglifier
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/execjs-0.3.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 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/lautis/uglifier/archive/v4.2.0.tar.gz -> uglifier-4.2.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5c591b434d0fdf6eca03dc63d3bf2f8e
+_md5_=bc0d081ffa6674b5d8fe11852a0bf8d8
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.3 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.3
deleted file mode 100644
index 0671678e0b01..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.3
+++ /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? ( 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(-)] ) )
-DESCRIPTION=Generic extension manager for WebSocket connections
-EAPI=6
-HOMEPAGE=https://github.com/faye/websocket-extensions-ruby
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.3.tar.gz -> websocket-extensions-0.1.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=c95e6939251eec02effbf4a768b0acd7
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
new file mode 100644
index 000000000000..2cefc9bd0369
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Generic extension manager for WebSocket connections
+EAPI=7
+HOMEPAGE=https://github.com/faye/websocket-extensions-ruby
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+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/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=eddda92eb51eb6f5896fcebb808359d5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e11a9334959e..377e9c17353b 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bingrep-0.8.2 b/metadata/md5-cache/dev-util/bingrep-0.8.2
index dbbdf334f638..4d37d9b253ee 100644
--- a/metadata/md5-cache/dev-util/bingrep-0.8.2
+++ b/metadata/md5-cache/dev-util/bingrep-0.8.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 GPL-3 ISC MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.42/download -> backtrace-0.3.42.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/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bingrep/0.8.2/download -> bingrep-0.8.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.10/download -> bstr-0.2.10.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/cpp_demangle/0.2.14/download -> cpp_demangle-0.2.14.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.2.0/download -> goblin-0.2.0.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.6/download -> hermit-abi-0.1.6.crate https://crates.io/api/v1/crates/hexplay/0.2.1/download -> hexplay-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.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/memchr/2.3.0/download -> memchr-2.3.0.crate https://crates.io/api/v1/crates/memrange/0.1.3/download -> memrange-0.1.3.crate https://crates.io/api/v1/crates/metagoblin/0.3.1/download -> metagoblin-0.3.1.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.5/download -> proc-macro-error-0.4.5.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.5/download -> proc-macro-error-attr-0.4.5.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/quick-error/1.2.3/download -> quick-error-1.2.3.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.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.3/download -> regex-1.3.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.13/download -> regex-syntax-0.6.13.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.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/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustversion/1.0.2/download -> rustversion-1.0.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/scroll/0.10.1/download -> scroll-0.10.1.crate https://crates.io/api/v1/crates/scroll_derive/0.10.1/download -> scroll_derive-0.10.1.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.8/download -> structopt-0.3.8.crate https://crates.io/api/v1/crates/structopt-derive/0.3.5/download -> structopt-derive-0.3.5.crate https://crates.io/api/v1/crates/structopt-derive/0.4.1/download -> structopt-derive-0.4.1.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.4.0/download -> syn-mid-0.4.0.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.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/theban_interval_tree/0.7.1/download -> theban_interval_tree-0.7.1.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/time/0.1.42/download -> time-0.1.42.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.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=1eef758df026617cafb6679e5dfd758e
diff --git a/metadata/md5-cache/dev-util/btyacc-3.0-r3 b/metadata/md5-cache/dev-util/btyacc-3.0-r3
index ad0718d2cef7..de20d2290194 100644
--- a/metadata/md5-cache/dev-util/btyacc-3.0-r3
+++ b/metadata/md5-cache/dev-util/btyacc-3.0-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Backtracking YACC - modified from Berkeley YACC
 EAPI=7
-HOMEPAGE=http://www.siber.com/btyacc
+HOMEPAGE=https://www.siber.com/btyacc
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=public-domain
 SLOT=0
-SRC_URI=http://www.siber.com/btyacc/btyacc-3-0.tar.gz
+SRC_URI=https://www.siber.com/btyacc/btyacc-3-0.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=336127c320150e0fe334399e30b8a804
+_md5_=ac7be7301e688e30c7e2263308222d8e
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1 b/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
deleted file mode 100644
index 4680701c5c13..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/moto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/boto3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ramlfications[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjade[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/txgithub[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lz4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/treq[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig 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=BuildBot build automation system
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
-IUSE=crypt examples irc test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[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/b/buildbot/buildbot-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b36df8a961debce0bc920ad5fba1a08
diff --git a/metadata/md5-cache/dev-util/buildbot-1.1.2 b/metadata/md5-cache/dev-util/buildbot-1.1.2
deleted file mode 100644
index eef2d7fcf41b..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/moto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/boto3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjade[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/txgithub[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lz4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/treq[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/docker-py-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig 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=BuildBot build automation system
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
-IUSE=crypt docker examples irc test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.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/b/buildbot/buildbot-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d60fc87c70b12b409b4f0c47f6e69f9d
diff --git a/metadata/md5-cache/dev-util/buildbot-1.3.0 b/metadata/md5-cache/dev-util/buildbot-1.3.0
deleted file mode 100644
index 0a855f8142e9..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/docutils-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <dev-python/docutils-0.13.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx-jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/moto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/boto3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjade[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/txgithub[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lz4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/treq[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/docker-py-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig 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=BuildBot build automation system
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
-IUSE=crypt doc docker examples irc test python_targets_python3_6
-KEYWORDS=~amd64 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.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/b/buildbot/buildbot-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c40675031b8b8087342b6b979e6921f3
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.0 b/metadata/md5-cache/dev-util/buildbot-2.8.0
new file mode 100644
index 000000000000..a54cb4bdc720
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.0
@@ -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.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/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.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/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.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-util/buildbot-worker-2.8.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-util/buildbot-www-2.8.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/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.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/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.0.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=2965d47f46615617de4959cf76f38266
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index 73f15fc5b095..36e58d198654 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -1,6 +1,6 @@
 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-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] 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 unpack
-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-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-worker-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-www-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)] ) )
+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-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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[python_targets_python3_6(-)?,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[python_targets_python3_6(-)?,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[python_targets_python3_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/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=29d5cb8a34cf0652a4902a733fc59f71
+_md5_=431706cb190da1466918bf29c834a9b8
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.0 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.0
new file mode 100644
index 000000000000..0e2ac0d58bba
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.0
@@ -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.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-util/buildbot-www-2.8.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-util/buildbot-pkg-2.8.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/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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=b21310954d34116dfeddc027aa0d8881
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
deleted file mode 100644
index f33f5fc41d9d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=Buildbot console-view plugin
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[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/b/buildbot-console-view/buildbot-console-view-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa8d874c6a5b2586ae12221ef5a7cf75
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
deleted file mode 100644
index b892c39ce57e..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=Buildbot console-view plugin
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[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/b/buildbot-console-view/buildbot-console-view-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa8d874c6a5b2586ae12221ef5a7cf75
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
deleted file mode 100644
index dc452fd1c642..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=Buildbot console-view plugin
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.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/b/buildbot-console-view/buildbot-console-view-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa8d874c6a5b2586ae12221ef5a7cf75
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.0 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.0
new file mode 100644
index 000000000000..b4de41e1e00b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.0
@@ -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.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-util/buildbot-www-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=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.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-util/buildbot-www-2.8.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[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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=35fe3f395baa97f44309dd147aa52441
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1 b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
deleted file mode 100644
index c38fb96213f8..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-util/buildbot-0.9.12*[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-util/buildbot-www-0.9.12*[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=BuildBot grid view web interface
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.12.post1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b913a9126ae612d8107f6715670b2e5
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
deleted file mode 100644
index cdca9c73eed6..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-util/buildbot-www-1.1.2[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=BuildBot grid view web interface
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f69ecf454c7565ec8326da892b7c9f2
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
deleted file mode 100644
index c1bf45ce9a94..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-util/buildbot-www-1.3.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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=BuildBot grid view web interface
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f69ecf454c7565ec8326da892b7c9f2
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.0
new file mode 100644
index 000000000000..18e053064f44
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.0
@@ -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.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-util/buildbot-www-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=842251df93ca7efd0bb76e850c6e23da
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12 b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
deleted file mode 100644
index 8950007ea394..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=BuildBot common www build tools for packaging releases
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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/b/buildbot-pkg/buildbot-pkg-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35ce00528be8974e54a008053b5a7051
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2 b/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
deleted file mode 100644
index 1726d99155c5..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=BuildBot common www build tools for packaging releases
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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/b/buildbot-pkg/buildbot-pkg-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fc8a2d60d5465dd0d2b5b71a80fd598
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0 b/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
deleted file mode 100644
index 14e2bd94b934..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=BuildBot common www build tools for packaging releases
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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/b/buildbot-pkg/buildbot-pkg-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fc8a2d60d5465dd0d2b5b71a80fd598
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.0 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.0
new file mode 100644
index 000000000000..166381602353
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.0
@@ -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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=836fab1f28e1ef35429d8d88ce4c5c53
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
deleted file mode 100644
index 002ff89c7317..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=Buildbot waterfall-view plugin
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[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/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbc0ea9b84993858fb08ee400030f775
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
deleted file mode 100644
index f3197945274f..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=Buildbot waterfall-view plugin
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[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/b/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbc0ea9b84993858fb08ee400030f775
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
deleted file mode 100644
index c521bb2fff1f..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[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=Buildbot waterfall-view plugin
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.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/b/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbc0ea9b84993858fb08ee400030f775
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.0
new file mode 100644
index 000000000000..734c2a549608
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.0
@@ -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.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-www-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=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.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-www-2.8.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[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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=6432c553a3bc681fb9891ffa1a531eb2
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
deleted file mode 100644
index d8ffd5c87ea8..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python3_6(-)?,-python_single_target_python3_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=BuildBot Worker (slave) Daemon
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a28edab50db7ea2ad791d718a86b7374
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2 b/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
deleted file mode 100644
index 03710e82753f..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python3_6(-)?,-python_single_target_python3_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=BuildBot Worker (slave) Daemon
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43f186def7ac371e2565c250508ccfa9
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0 b/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
deleted file mode 100644
index c67718767058..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python3_6(-)?,-python_single_target_python3_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=BuildBot Worker (slave) Daemon
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43f186def7ac371e2565c250508ccfa9
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.0 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.0
new file mode 100644
index 000000000000..6102cdf98114
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.0
@@ -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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=bd8e27fb22d341376b7060ace3925e8e
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 5e7f02a5fbf5..7f74987f7386 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=40b747481e96c9ae8cdd493d5337a8ed
+_md5_=3f621de5b9a24e09c7e70ce09c0f1c38
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
deleted file mode 100644
index 306e01986853..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dc5a40a2c81c8427ae5e96945f62127
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
deleted file mode 100644
index 661539de21ac..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b49700aa9cb7c45617cba122ff3b9e56
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
deleted file mode 100644
index b1359688d3d1..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b49700aa9cb7c45617cba122ff3b9e56
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.0
new file mode 100644
index 000000000000..fc1831a2fbdb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.0
@@ -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.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-util/buildbot-www-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=e87af2212874a69cd36ab925966c7457
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.12 b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
deleted file mode 100644
index 9555b4d538f2..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-pkg-0.9.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ea22c824ba1fac2267a3dbf434c2555
diff --git a/metadata/md5-cache/dev-util/buildbot-www-1.1.2 b/metadata/md5-cache/dev-util/buildbot-www-1.1.2
deleted file mode 100644
index fa73db4fd60d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-pkg-1.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ea22c824ba1fac2267a3dbf434c2555
diff --git a/metadata/md5-cache/dev-util/buildbot-www-1.3.0 b/metadata/md5-cache/dev-util/buildbot-www-1.3.0
deleted file mode 100644
index a35dd6b754f2..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-pkg-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=6
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ea22c824ba1fac2267a3dbf434c2555
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.0 b/metadata/md5-cache/dev-util/buildbot-www-2.8.0
new file mode 100644
index 000000000000..b8a37b97e431
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.0
@@ -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.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=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.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[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.0.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=b97203eb2be2f9065d8f3a6a842afcfc
diff --git a/metadata/md5-cache/dev-util/cargo-c-0.6.2 b/metadata/md5-cache/dev-util/cargo-c-0.6.2
index 84ef5f7cee1d..fc35b52ffa05 100644
--- a/metadata/md5-cache/dev-util/cargo-c-0.6.2
+++ b/metadata/md5-cache/dev-util/cargo-c-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.27/download -> anyhow-1.0.27.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.0.0/download -> bitmaps-2.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/cargo/0.43.1/download -> cargo-0.43.1.crate https://crates.io/api/v1/crates/cargo-c/0.6.2/download -> cargo-c-0.6.2.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cbindgen/0.13.2/download -> cbindgen-0.13.2.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/crates-io/0.31.0/download -> crates-io-0.31.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.28/download -> curl-0.4.28.crate https://crates.io/api/v1/crates/curl-sys/0.4.30+curl-7.69.1/download -> curl-sys-0.4.30+curl-7.69.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.11.0/download -> git2-0.11.0.crate https://crates.io/api/v1/crates/git2-curl/0.12.0/download -> git2-curl-0.12.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/ignore/0.4.12/download -> ignore-0.4.12.crate https://crates.io/api/v1/crates/im-rc/14.3.0/download -> im-rc-14.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/libgit2-sys/0.10.0/download -> libgit2-sys-0.10.0.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.3/download -> libnghttp2-sys-0.1.3.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.16/download -> libssh2-sys-0.2.16.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.28/download -> openssl-0.10.28.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.54/download -> openssl-sys-0.9.54.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.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-macro-error/0.4.11/download -> proc-macro-error-0.4.11.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.11/download -> proc-macro-error-attr-0.4.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.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/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustfix/0.5.0/download -> rustfix-0.5.0.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.18/download -> schannel-0.1.18.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.crate https://crates.io/api/v1/crates/serde_ignored/0.1.1/download -> serde_ignored-0.1.1.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/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.5.3/download -> sized-chunks-0.5.3.crate https://crates.io/api/v1/crates/smallvec/1.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.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/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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-util/0.1.3/download -> winapi-util-0.1.3.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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=1d7ed488d40beef4dbe7984b5430d87f
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0 b/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
index 3c2b3ea11128..6773ef8f1962 100644
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
+++ b/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.38/download -> backtrace-0.3.38.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cargo/0.37.0/download -> cargo-0.37.0.crate https://crates.io/api/v1/crates/cargo-ebuild/0.2.0/download -> cargo-ebuild-0.2.0.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.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/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crates-io/0.25.0/download -> crates-io-0.25.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.25/download -> curl-0.4.25.crate https://crates.io/api/v1/crates/curl-sys/0.4.23/download -> curl-sys-0.4.23.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/filetime/0.2.7/download -> filetime-0.2.7.crate https://crates.io/api/v1/crates/flate2/1.0.12/download -> flate2-1.0.12.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.0.1/download -> fwdansi-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/git2/0.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/git2-curl/0.9.0/download -> git2-curl-0.9.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.4/download -> home-0.3.4.crate https://crates.io/api/v1/crates/http/0.1.18/download -> http-0.1.18.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/im-rc/12.3.4/download -> im-rc-12.3.4.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.17/download -> jobserver-0.1.17.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.11/download -> libgit2-sys-0.7.11.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.2/download -> libnghttp2-sys-0.1.2.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.12/download -> libssh2-sys-0.2.12.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.3/download -> miniz_oxide-0.3.3.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.25/download -> openssl-0.10.25.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.51/download -> openssl-sys-0.9.51.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.6/download -> rustfix-0.4.6.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.1.3/download -> sized-chunks-0.1.3.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.3/download -> structopt-0.3.3.crate https://crates.io/api/v1/crates/structopt-derive/0.3.3/download -> structopt-derive-0.3.3.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/toml/0.5.3/download -> toml-0.5.3.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url_serde/0.2.0/download -> url_serde-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.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/walkdir/2.2.9/download -> walkdir-2.2.9.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-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=53a9b0c6375b8bda6b0bac08288ad1b0
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0 b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
index 6cc2c82f65b8..fd73c2bbb5e2 100644
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
+++ b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Boost-1.0 MIT
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.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.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/cargo-ebuild/0.3.0/download -> cargo-ebuild-0.3.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.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.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.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/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.3/download -> structopt-0.3.3.crate https://crates.io/api/v1/crates/structopt-derive/0.3.3/download -> structopt-derive-0.3.3.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.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/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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=2cde69142112737d30578f56bc4dc1cc
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.28.0 b/metadata/md5-cache/dev-util/cargo-tree-0.28.0
index ae18af3f9be0..740d8073bacf 100644
--- a/metadata/md5-cache/dev-util/cargo-tree-0.28.0
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.28.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 MIT MPL-2.0 U
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.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/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.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/cargo/0.41.0/download -> cargo-0.41.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.0/download -> cargo-platform-0.1.0.crate https://crates.io/api/v1/crates/cargo-tree/0.28.0/download -> cargo-tree-0.28.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.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/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crates-io/0.29.0/download -> crates-io-0.29.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.25/download -> curl-0.4.25.crate https://crates.io/api/v1/crates/curl-sys/0.4.24/download -> curl-sys-0.4.24.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/flate2/1.0.13/download -> flate2-1.0.13.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/git2/0.10.2/download -> git2-0.10.2.crate https://crates.io/api/v1/crates/git2-curl/0.11.0/download -> git2-curl-0.11.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.5/download -> hermit-abi-0.1.5.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.0/download -> hex-0.4.0.crate https://crates.io/api/v1/crates/home/0.5.1/download -> home-0.5.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/im-rc/13.0.0/download -> im-rc-13.0.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.17/download -> jobserver-0.1.17.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/libgit2-sys/0.9.2/download -> libgit2-sys-0.9.2.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.2/download -> libnghttp2-sys-0.1.2.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.13/download -> libssh2-sys-0.2.13.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.5/download -> miniz_oxide-0.3.5.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.11.1/download -> num_cpus-1.11.1.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.26/download -> openssl-0.10.26.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/petgraph/0.4.13/download -> petgraph-0.4.13.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.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-macro-error/0.2.6/download -> proc-macro-error-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/quick-error/1.2.2/download -> quick-error-1.2.2.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.6/download -> rustfix-0.4.6.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.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_ignored/0.1.1/download -> serde_ignored-0.1.1.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/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.3.1/download -> sized-chunks-0.3.1.crate https://crates.io/api/v1/crates/smallvec/1.1.0/download -> smallvec-1.1.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.5/download -> structopt-0.3.5.crate https://crates.io/api/v1/crates/structopt-derive/0.3.5/download -> structopt-derive-0.3.5.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/toml/0.5.5/download -> toml-0.5.5.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.11/download -> unicode-normalization-0.1.11.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/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.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/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.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-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=76963e5517aef08b1765fbe24c95bf25
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.29.0 b/metadata/md5-cache/dev-util/cargo-tree-0.29.0
index 7170263652b4..6f1cca98825b 100644
--- a/metadata/md5-cache/dev-util/cargo-tree-0.29.0
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.29.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 Boost-1.0 MIT
 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/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cargo-tree/0.29.0/download -> cargo-tree-0.29.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.6/download -> hermit-abi-0.1.6.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.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/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/petgraph/0.4.13/download -> petgraph-0.4.13.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.5/download -> proc-macro-error-0.4.5.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.5/download -> proc-macro-error-attr-0.4.5.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/rustversion/1.0.2/download -> rustversion-1.0.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.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.45/download -> serde_json-1.0.45.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.8/download -> structopt-0.3.8.crate https://crates.io/api/v1/crates/structopt-derive/0.4.1/download -> structopt-derive-0.4.1.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.4.0/download -> syn-mid-0.4.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=3c21047202eb5536b33c7b1c0ea4c710
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.14.2 b/metadata/md5-cache/dev-util/cbindgen-0.14.2
index 9203c2ef4e1b..ec16c10a5189 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.14.2
+++ b/metadata/md5-cache/dev-util/cbindgen-0.14.2
@@ -8,5 +8,5 @@ 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.2/download -> cbindgen-0.14.2.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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=074712bebd4a3832027b11aee6eddb1d
diff --git a/metadata/md5-cache/dev-util/crash-7.2.7 b/metadata/md5-cache/dev-util/crash-7.2.7
deleted file mode 100644
index 1e8ea0326929..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.2.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
-EAPI=7
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.2.7.tar.gz
-_md5_=52375eb03d9a6ecb5d279ddc691e3d19
diff --git a/metadata/md5-cache/dev-util/crash-7.2.8 b/metadata/md5-cache/dev-util/crash-7.2.8-r1
similarity index 61%
rename from metadata/md5-cache/dev-util/crash-7.2.8
rename to metadata/md5-cache/dev-util/crash-7.2.8-r1
index a0b098585127..aa8f414a6012 100644
--- a/metadata/md5-cache/dev-util/crash-7.2.8
+++ b/metadata/md5-cache/dev-util/crash-7.2.8-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=compile prepare
 DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
 EAPI=7
 HOMEPAGE=https://people.redhat.com/anderson/
@@ -7,4 +7,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/anderson/crash-7.2.8.tar.gz
-_md5_=8a38efa8684073de4acef01d5f6efed5
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=ccfd2d46c30f4d68fb213cb179874f99
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.11 b/metadata/md5-cache/dev-util/dogtail-0.9.11
index 8b746fba4e45..b803cbb945af 100644
--- a/metadata/md5-cache/dev-util/dogtail-0.9.11
+++ b/metadata/md5-cache/dev-util/dogtail-0.9.11
@@ -5,11 +5,11 @@ DESCRIPTION=GUI test tool and automation framework using accessibility framework
 EAPI=7
 HOMEPAGE=https://gitlab.com/dogtail/dogtail/commits/master
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/libwnck:3[introspection] x11-base/xorg-server[xvfb] x11-apps/xinit python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.11.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5b127e58cb4de502082f8401e95ab9b
+_md5_=7604061f82c4286ff351b5fd00e0dfbd
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6 b/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
index 6b27715b36fe..33e2737aa464 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
@@ -5,11 +5,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.62/glib-2.62.6.tar.xz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d191bc9596abd1423b59c96433c887c1
+_md5_=fe98fe977b0385e7c02fb9674bb9457d
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.62.6 b/metadata/md5-cache/dev-util/glib-utils-2.62.6
index a8e5b09ecda6..c4b70f2bd50e 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.62.6
+++ b/metadata/md5-cache/dev-util/glib-utils-2.62.6
@@ -5,11 +5,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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
+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=LGPL-2.1+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !<dev-libs/glib-2.56.2:2
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.62/glib-2.62.6.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	0914eab919f4f11dd9e0407b92af4726	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=eb4dd8948c9e10d1467fc33dbeadfa94
+_md5_=a2813633924e796217495246e1154c6a
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
index 60ff466210d2..f226e85fb20c 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 IUSE=debug doc emacs python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a012a03babf188ff79864d0029f61827
+_md5_=859933087d6e4a55cc566d626cf373ec
diff --git a/metadata/md5-cache/dev-util/gtk-doc-am-1.32 b/metadata/md5-cache/dev-util/gtk-doc-am-1.32
index c3cd6117011d..80247a935ff0 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-am-1.32
+++ b/metadata/md5-cache/dev-util/gtk-doc-am-1.32
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig !<dev-util/gtk-doc-1.32 app-arch/xz-utils
 DESCRIPTION=Automake files from gtk-doc
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
-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=GPL-2 FDL-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eb0ad073f91a8a654ec534cef50f6ce1
+_md5_=f99e7355af653de05bedb6ac99f5b57d
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.1 b/metadata/md5-cache/dev-util/kdevelop-5.5.1
deleted file mode 100644
index c81fdfd49ede..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-5.5.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.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-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-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:5 >=sys-devel/clang-6.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 ~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-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:5 >=sys-devel/clang-6.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-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.1/src/kdevelop-5.5.1.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27ff9da2d5d035fa257ab11f305e4e5a
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-5.5.2
new file mode 100644
index 000000000000..2c55b9c0e212
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-5.5.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.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-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-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 ~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	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb007b0e3d8393247134b016cc7c8a6e
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.5.1 b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
similarity index 51%
rename from metadata/md5-cache/dev-util/kdevelop-php-5.5.1
rename to metadata/md5-cache/dev-util/kdevelop-php-5.5.2
index 7a748144897a..3c8e35da1bf2 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.5.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
@@ -1,15 +1,15 @@
 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
+DEPEND=>=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 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
+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.1/src/kdev-php-5.5.1.tar.xz
+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	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbffa6b459d942e1fce131639e72f39c
+_md5_=8dd2c6bffb87d06614c042300649228a
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.5.1 b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
similarity index 97%
rename from metadata/md5-cache/dev-util/kdevelop-python-5.5.1
rename to metadata/md5-cache/dev-util/kdevelop-python-5.5.2
index 264cb649c70c..9c1c4264cf29 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.5.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
@@ -11,6 +11,6 @@ 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 python_single_target_python3_8 )
 RESTRICT=!test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.5.1/src/kdev-python-5.5.1.tar.xz
+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	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f36cd686f441ad86cb336f531d5a5ea
+_md5_=5a5e9a3c174650bce9953795e1f81dd2
diff --git a/metadata/md5-cache/dev-util/molecule-2 b/metadata/md5-cache/dev-util/molecule-2
index 964af9d6a499..4028100ef953 100644
--- a/metadata/md5-cache/dev-util/molecule-2
+++ b/metadata/md5-cache/dev-util/molecule-2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package for dev-util/molecule-core and dev-util/molecule-plugins
 EAPI=6
-HOMEPAGE=http://www.sabayon.org
+HOMEPAGE=https://www.sabayon.org
 IUSE=+plugins
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/molecule-core-1.0.2 plugins? ( >=dev-util/molecule-plugins-1.0.2 )
 SLOT=0
-_md5_=c2a60a36b125501c60a4e39b81a85f9d
+_md5_=c543734729edfa627ba3dff2da93d871
diff --git a/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1 b/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
index 046836e9373a..3eef51365c41 100644
--- a/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
+++ b/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install
 DEPEND=dev-util/intltool sys-devel/gettext
 DESCRIPTION=Sabayon distro-agnostic images build tool
 EAPI=6
-HOMEPAGE=http://www.sabayon.org
+HOMEPAGE=https://www.sabayon.org
 IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sabayon/dev-util/molecule-core-1.0.2.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f1ba8552b66dac6833b40abadd8bf0b4
+_md5_=043fadde2e886061b3cc751ef8bf398e
diff --git a/metadata/md5-cache/dev-util/molecule-plugins-1.0.3 b/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
index b348bb338bbf..f976b49627eb 100644
--- a/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
+++ b/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=install
 DEPEND=>=dev-util/molecule-core-1.0.1
 DESCRIPTION=A set of base plugins for Molecule
 EAPI=6
-HOMEPAGE=http://www.sabayon.org
+HOMEPAGE=https://www.sabayon.org
 IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sabayon/dev-util/molecule-plugins-1.0.3.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=35f4a3c85804b8691b05be055e0ec8dd
+_md5_=89439f54cf245f250d672386e8e07d32
diff --git a/metadata/md5-cache/dev-util/perf-5.7 b/metadata/md5-cache/dev-util/perf-5.7
new file mode 100644
index 000000000000..aa8cda2b3fe1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/perf-5.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils >=sys-kernel/linux-headers-4.19 sys-devel/bison sys-devel/flex java? ( virtual/jdk ) doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time ) !!sys-devel/llvm:0
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=7
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils
+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	0914eab919f4f11dd9e0407b92af4726	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=f23782fe7ab15a1fa3ffb910c5d89b14
diff --git a/metadata/md5-cache/dev-util/plan9port-0_pre20200526 b/metadata/md5-cache/dev-util/plan9port-0_pre20200526
new file mode 100644
index 000000000000..940a26057406
--- /dev/null
+++ b/metadata/md5-cache/dev-util/plan9port-0_pre20200526
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
+DESCRIPTION=Port of many Plan 9 programs and libraries
+EAPI=7
+HOMEPAGE=https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port
+IUSE=X aqua truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
+RDEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
+REQUIRED_USE=?? ( X aqua )
+SLOT=0
+SRC_URI=https://github.com/9fans/plan9port/archive/a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz -> plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=ee0fc545a5eb9f3d78ff575aea97b64f
diff --git a/metadata/md5-cache/dev-util/plan9port-20140306-r4 b/metadata/md5-cache/dev-util/plan9port-20140306-r4
deleted file mode 100644
index f207ac4b8799..000000000000
--- a/metadata/md5-cache/dev-util/plan9port-20140306-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
-DESCRIPTION=Port of many Plan 9 programs and libraries
-EAPI=5
-HOMEPAGE=http://swtch.com/plan9port/
-IUSE=X aqua truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
-RDEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
-REQUIRED_USE=?? ( X aqua )
-SLOT=0
-SRC_URI=https://github.com/9fans/plan9port/archive/e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz -> plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ad1a023ddce2c6a71678ddb0d8037bd
diff --git a/metadata/md5-cache/dev-util/plan9port-9999 b/metadata/md5-cache/dev-util/plan9port-9999
new file mode 100644
index 000000000000..ae748affd96c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/plan9port-9999
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
+DESCRIPTION=Port of many Plan 9 programs and libraries
+EAPI=7
+HOMEPAGE=https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port
+IUSE=X aqua truetype
+LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
+PROPERTIES=live
+RDEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
+REQUIRED_USE=?? ( X aqua )
+SLOT=0
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=ebd78eb572ee7f7beef65354ee672f53
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.4-r1 b/metadata/md5-cache/dev-util/rebar-2.6.4-r1
new file mode 100644
index 000000000000..37c16e1b93b6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rebar-2.6.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+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
+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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=cb05d058bbea517798292339cfdbbb37
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.12 b/metadata/md5-cache/dev-util/sccache-0.2.12
index 19d78c3a6dff..384c006c8c4e 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.12
+++ b/metadata/md5-cache/dev-util/sccache-0.2.12
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BSD-2 Boost-1.0 ISC MIT Unlicense ZLIB
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/0.2.12.tar.gz -> sccache-0.2.12.tar.gz https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ar/0.6.1/download -> ar-0.6.1.crate https://crates.io/api/v1/crates/arc-swap/0.3.6/download -> arc-swap-0.3.6.crate https://crates.io/api/v1/crates/arraydeque/0.4.3/download -> arraydeque-0.4.3.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/ascii/0.9.1/download -> ascii-0.9.1.crate https://crates.io/api/v1/crates/assert_cmd/0.9.1/download -> assert_cmd-0.9.1.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.0.1/download -> bincode-1.0.1.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/buf_redux/0.6.3/download -> buf_redux-0.6.3.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.7/download -> byteorder-1.2.7.crate https://crates.io/api/v1/crates/bytes/0.4.11/download -> bytes-0.4.11.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/3.6.3/download -> combine-3.6.3.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.2.3/download -> core-foundation-0.2.3.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.2.3/download -> core-foundation-sys-0.2.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.6.2/download -> crossbeam-deque-0.6.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.1/download -> crossbeam-epoch-0.6.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.1/download -> crossbeam-utils-0.6.1.crate https://crates.io/api/v1/crates/daemonize/0.3.0/download -> daemonize-0.3.0.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/directories/1.0.2/download -> directories-1.0.2.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/either/1.5.0/download -> either-1.5.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.10/download -> encoding_rs-0.8.10.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.3.1/download -> escargot-0.3.1.crate https://crates.io/api/v1/crates/failure/0.1.3/download -> failure-0.1.3.crate https://crates.io/api/v1/crates/failure_derive/0.1.3/download -> failure_derive-0.1.3.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/flate2/1.0.5/download -> flate2-1.0.5.crate https://crates.io/api/v1/crates/flate2-crc/0.1.1/download -> flate2-crc-0.1.1.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.25/download -> futures-0.1.25.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getopts/0.2.18/download -> getopts-0.2.18.crate https://crates.io/api/v1/crates/h2/0.1.13/download -> h2-0.1.13.crate https://crates.io/api/v1/crates/http/0.1.14/download -> http-0.1.14.crate https://crates.io/api/v1/crates/httparse/1.3.3/download -> httparse-1.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/hyper/0.11.27/download -> hyper-0.11.27.crate https://crates.io/api/v1/crates/hyper/0.12.16/download -> hyper-0.12.16.crate https://crates.io/api/v1/crates/hyper-tls/0.1.4/download -> hyper-tls-0.1.4.crate https://crates.io/api/v1/crates/hyper-tls/0.3.1/download -> hyper-tls-0.3.1.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/indexmap/1.0.2/download -> indexmap-1.0.2.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itertools/0.7.9/download -> itertools-0.7.9.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/jsonwebtoken/5.0.1/download -> jsonwebtoken-5.0.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lazycell/1.2.0/download -> lazycell-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.44/download -> libc-0.2.44.crate https://crates.io/api/v1/crates/libflate/0.1.18/download -> libflate-0.1.18.crate https://crates.io/api/v1/crates/libmount/0.1.11/download -> libmount-0.1.11.crate https://crates.io/api/v1/crates/linked-hash-map/0.2.1/download -> linked-hash-map-0.2.1.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/lru-disk-cache/0.3.0/download -> lru-disk-cache-0.3.0.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/memcached-rs/0.3.0/download -> memcached-rs-0.3.0.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.1.1/download -> memchr-2.1.1.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.12/download -> mime-0.3.12.crate https://crates.io/api/v1/crates/mime_guess/1.8.6/download -> mime_guess-1.8.6.crate https://crates.io/api/v1/crates/mime_guess/2.0.0-alpha.6/download -> mime_guess-2.0.0-alpha.6.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.crate https://crates.io/api/v1/crates/mio/0.6.16/download -> mio-0.6.16.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/multipart/0.13.6/download -> multipart-0.13.6.crate https://crates.io/api/v1/crates/native-tls/0.1.5/download -> native-tls-0.1.5.crate https://crates.io/api/v1/crates/native-tls/0.2.2/download -> native-tls-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/number_prefix/0.2.8/download -> number_prefix-0.2.8.crate https://crates.io/api/v1/crates/openssl/0.10.15/download -> openssl-0.10.15.crate https://crates.io/api/v1/crates/openssl/0.9.24/download -> openssl-0.9.24.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.39/download -> openssl-sys-0.9.39.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/phf/0.7.23/download -> phf-0.7.23.crate https://crates.io/api/v1/crates/phf_codegen/0.7.23/download -> phf_codegen-0.7.23.crate https://crates.io/api/v1/crates/phf_generator/0.7.23/download -> phf_generator-0.7.23.crate https://crates.io/api/v1/crates/phf_shared/0.7.23/download -> phf_shared-0.7.23.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/predicates/0.9.1/download -> predicates-0.9.1.crate https://crates.io/api/v1/crates/predicates-core/0.9.0/download -> predicates-core-0.9.0.crate https://crates.io/api/v1/crates/predicates-tree/0.9.0/download -> predicates-tree-0.9.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.3.22/download -> rand-0.3.22.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand_chacha/0.1.0/download -> rand_chacha-0.1.0.crate https://crates.io/api/v1/crates/rand_core/0.2.2/download -> rand_core-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.0/download -> rand_isaac-0.1.0.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.0/download -> rand_xorshift-0.1.0.crate https://crates.io/api/v1/crates/redis/0.9.1/download -> redis-0.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.42/download -> redox_syscall-0.1.42.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.3/download -> regex-syntax-0.6.3.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/reqwest/0.8.8/download -> reqwest-0.8.8.crate https://crates.io/api/v1/crates/reqwest/0.9.5/download -> reqwest-0.9.5.crate https://crates.io/api/v1/crates/retry/0.4.0/download -> retry-0.4.0.crate https://crates.io/api/v1/crates/ring/0.13.5/download -> ring-0.13.5.crate https://crates.io/api/v1/crates/rouille/2.2.0/download -> rouille-2.2.0.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/safemem/0.3.0/download -> safemem-0.3.0.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.1.16/download -> security-framework-0.1.16.crate https://crates.io/api/v1/crates/security-framework/0.2.1/download -> security-framework-0.2.1.crate https://crates.io/api/v1/crates/security-framework-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/security-framework-sys/0.2.1/download -> security-framework-sys-0.2.1.crate https://crates.io/api/v1/crates/selenium-rs/0.1.1/download -> selenium-rs-0.1.1.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.80/download -> serde-1.0.80.crate https://crates.io/api/v1/crates/serde_derive/1.0.80/download -> serde_derive-1.0.80.crate https://crates.io/api/v1/crates/serde_json/1.0.33/download -> serde_json-1.0.33.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.4/download -> serde_urlencoded-0.5.4.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.6/download -> signal-hook-0.1.6.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.1/download -> slab-0.4.1.crate https://crates.io/api/v1/crates/smallvec/0.6.6/download -> smallvec-0.6.6.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/string/0.1.2/download -> string-0.1.2.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.15.21/download -> syn-0.15.21.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/syslog/4.0.1/download -> syslog-4.0.1.crate https://crates.io/api/v1/crates/tar/0.4.20/download -> tar-0.4.20.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.0.4/download -> tempfile-3.0.4.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/threadpool/1.7.1/download -> threadpool-1.7.1.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tokio/0.1.13/download -> tokio-0.1.13.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-core/0.1.17/download -> tokio-core-0.1.17.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.4/download -> tokio-current-thread-0.1.4.crate https://crates.io/api/v1/crates/tokio-executor/0.1.5/download -> tokio-executor-0.1.5.crate https://crates.io/api/v1/crates/tokio-fs/0.1.4/download -> tokio-fs-0.1.4.crate https://crates.io/api/v1/crates/tokio-io/0.1.10/download -> tokio-io-0.1.10.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.3/download -> tokio-process-0.2.3.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.7/download -> tokio-reactor-0.1.7.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-signal/0.2.7/download -> tokio-signal-0.2.7.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.2/download -> tokio-tcp-0.1.2.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.9/download -> tokio-threadpool-0.1.9.crate https://crates.io/api/v1/crates/tokio-timer/0.2.8/download -> tokio-timer-0.2.8.crate https://crates.io/api/v1/crates/tokio-tls/0.1.4/download -> tokio-tls-0.1.4.crate https://crates.io/api/v1/crates/tokio-udp/0.1.3/download -> tokio-udp-0.1.3.crate https://crates.io/api/v1/crates/tokio-uds/0.2.4/download -> tokio-uds-0.2.4.crate https://crates.io/api/v1/crates/toml/0.4.9/download -> toml-0.4.9.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.1.0/download -> try-lock-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.2.0/download -> unicase-2.2.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.6.5/download -> uuid-0.6.5.crate https://crates.io/api/v1/crates/uuid/0.7.1/download -> uuid-0.7.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version-compare/0.0.8/download -> version-compare-0.0.8.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/want/0.0.4/download -> want-0.0.4.crate https://crates.io/api/v1/crates/want/0.0.6/download -> want-0.0.6.crate https://crates.io/api/v1/crates/which/2.0.0/download -> which-2.0.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=784bc1976053b8f9ddf130132fa1d8ff
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.13 b/metadata/md5-cache/dev-util/sccache-0.2.13
index c1096b2af506..4518d1212f39 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.13
+++ b/metadata/md5-cache/dev-util/sccache-0.2.13
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/0.2.13.tar.gz -> sccache-0.2.13.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ar/0.6.2/download -> ar-0.6.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.4/download -> arc-swap-0.4.4.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/ascii/0.9.3/download -> ascii-0.9.3.crate https://crates.io/api/v1/crates/assert_cmd/0.9.1/download -> assert_cmd-0.9.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.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/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.2.0/download -> bincode-1.2.0.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.9/download -> blake2b_simd-0.5.9.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/buf_redux/0.6.3/download -> buf_redux-0.6.3.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.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/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.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/chrono/0.4.10/download -> chrono-0.4.10.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/3.8.1/download -> combine-3.8.1.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/crypto-mac/0.7.0/download -> crypto-mac-0.7.0.crate https://crates.io/api/v1/crates/daemonize/0.3.0/download -> daemonize-0.3.0.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/directories/1.0.2/download -> directories-1.0.2.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dtoa/0.4.4/download -> dtoa-0.4.4.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encoding_rs/0.8.20/download -> encoding_rs-0.8.20.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.3.1/download -> escargot-0.3.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.13/download -> flate2-1.0.13.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.29/download -> futures-0.1.29.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/hermit-abi/0.1.3/download -> hermit-abi-0.1.3.crate https://crates.io/api/v1/crates/hmac/0.7.1/download -> hmac-0.7.1.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.3.0/download -> indexmap-1.3.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.7.11/download -> itertools-0.7.11.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.19/download -> jobserver-0.1.19.crate https://crates.io/api/v1/crates/jsonwebtoken/6.0.1/download -> jsonwebtoken-6.0.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.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/libmount/0.1.15/download -> libmount-0.1.15.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/linked-hash-map/0.2.1/download -> linked-hash-map-0.2.1.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.3.2/download -> lock_api-0.3.2.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lru-disk-cache/0.4.0/download -> lru-disk-cache-0.4.0.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md-5/0.8.0/download -> md-5-0.8.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/memcached-rs/0.3.0/download -> memcached-rs-0.3.0.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.14/download -> mime-0.3.14.crate https://crates.io/api/v1/crates/mime_guess/1.8.7/download -> mime_guess-1.8.7.crate https://crates.io/api/v1/crates/mime_guess/2.0.1/download -> mime_guess-2.0.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.5/download -> miniz_oxide-0.3.5.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/multipart/0.13.6/download -> multipart-0.13.6.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.1/download -> nix-0.11.1.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.10/download -> num-traits-0.2.10.crate https://crates.io/api/v1/crates/num_cpus/1.11.1/download -> num_cpus-1.11.1.crate https://crates.io/api/v1/crates/number_prefix/0.2.8/download -> number_prefix-0.2.8.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.26/download -> openssl-0.10.26.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.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/predicates/0.9.1/download -> predicates-0.9.1.crate https://crates.io/api/v1/crates/predicates-core/0.9.0/download -> predicates-core-0.9.0.crate https://crates.io/api/v1/crates/predicates-tree/0.9.0/download -> predicates-tree-0.9.0.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/publicsuffix/1.5.4/download -> publicsuffix-1.5.4.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.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.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.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.1.1/download -> rand_chacha-0.1.1.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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.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.1.0/download -> rand_hc-0.1.0.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/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redis/0.9.1/download -> redis-0.9.1.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/redox_users/0.3.1/download -> redox_users-0.3.1.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.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/reqwest/0.9.22/download -> reqwest-0.9.22.crate https://crates.io/api/v1/crates/retry/0.4.0/download -> retry-0.4.0.crate https://crates.io/api/v1/crates/ring/0.14.6/download -> ring-0.14.6.crate https://crates.io/api/v1/crates/rouille/2.2.0/download -> rouille-2.2.0.crate https://crates.io/api/v1/crates/rust-argon2/0.5.1/download -> rust-argon2-0.5.1.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/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/sccache/0.2.13/download -> sccache-0.2.13.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/security-framework/0.3.4/download -> security-framework-0.3.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.3/download -> security-framework-sys-0.3.3.crate https://crates.io/api/v1/crates/selenium-rs/0.1.1/download -> selenium-rs-0.1.1.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.103/download -> serde-1.0.103.crate https://crates.io/api/v1/crates/serde_derive/1.0.103/download -> serde_derive-1.0.103.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/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha-1/0.8.1/download -> sha-1-0.8.1.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha2/0.8.0/download -> sha2-0.8.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.12/download -> signal-hook-0.1.12.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smallvec/1.0.0/download -> smallvec-1.0.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/subtle/1.0.0/download -> subtle-1.0.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/syslog/4.0.1/download -> syslog-4.0.1.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/threadpool/1.7.1/download -> threadpool-1.7.1.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.6/download -> tokio-current-thread-0.1.6.crate https://crates.io/api/v1/crates/tokio-executor/0.1.9/download -> tokio-executor-0.1.9.crate https://crates.io/api/v1/crates/tokio-fs/0.1.6/download -> tokio-fs-0.1.6.crate https://crates.io/api/v1/crates/tokio-io/0.1.12/download -> tokio-io-0.1.12.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.4/download -> tokio-process-0.2.4.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.11/download -> tokio-reactor-0.1.11.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-signal/0.2.7/download -> tokio-signal-0.2.7.crate https://crates.io/api/v1/crates/tokio-sync/0.1.7/download -> tokio-sync-0.1.7.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.3/download -> tokio-tcp-0.1.3.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.17/download -> tokio-threadpool-0.1.17.crate https://crates.io/api/v1/crates/tokio-timer/0.2.12/download -> tokio-timer-0.2.12.crate https://crates.io/api/v1/crates/tokio-udp/0.1.5/download -> tokio-udp-0.1.5.crate https://crates.io/api/v1/crates/tokio-uds/0.2.5/download -> tokio-uds-0.2.5.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/tower/0.1.1/download -> tower-0.1.1.crate https://crates.io/api/v1/crates/tower-buffer/0.1.2/download -> tower-buffer-0.1.2.crate https://crates.io/api/v1/crates/tower-discover/0.1.0/download -> tower-discover-0.1.0.crate https://crates.io/api/v1/crates/tower-layer/0.1.0/download -> tower-layer-0.1.0.crate https://crates.io/api/v1/crates/tower-limit/0.1.1/download -> tower-limit-0.1.1.crate https://crates.io/api/v1/crates/tower-load-shed/0.1.0/download -> tower-load-shed-0.1.0.crate https://crates.io/api/v1/crates/tower-retry/0.1.0/download -> tower-retry-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.2.0/download -> tower-service-0.2.0.crate https://crates.io/api/v1/crates/tower-timeout/0.1.1/download -> tower-timeout-0.1.1.crate https://crates.io/api/v1/crates/tower-util/0.1.0/download -> tower-util-0.1.0.crate https://crates.io/api/v1/crates/tracing/0.1.10/download -> tracing-0.1.10.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.5/download -> tracing-attributes-0.1.5.crate https://crates.io/api/v1/crates/tracing-core/0.1.7/download -> tracing-core-0.1.7.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.11/download -> unicode-normalization-0.1.11.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.0.4/download -> unicode-xid-0.0.4.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/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version-compare/0.0.10/download -> version-compare-0.0.10.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=0ac127581e7771dc5187ce81147038ad
diff --git a/metadata/md5-cache/dev-util/strace-5.5 b/metadata/md5-cache/dev-util/strace-5.7
similarity index 90%
rename from metadata/md5-cache/dev-util/strace-5.5
rename to metadata/md5-cache/dev-util/strace-5.7
index 6c284982189e..c2a0e78311aa 100644
--- a/metadata/md5-cache/dev-util/strace-5.5
+++ b/metadata/md5-cache/dev-util/strace-5.7
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
-SRC_URI=https://github.com/strace/strace/releases/download/v5.5/strace-5.5.tar.xz
+SRC_URI=https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=1c22abcc5cea63b6a2fe68e1c24a06be
+_md5_=c9f49a2a00a8dcb7a0932062a61ff396
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.88.0 b/metadata/md5-cache/dev-util/stripe-mock-0.88.0
index d2fc4b961a6e..20f4c898b680 100644
--- a/metadata/md5-cache/dev-util/stripe-mock-0.88.0
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.88.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install test unpack
 DESCRIPTION=Mock HTTP server that responds like the real Stripe API
 EAPI=7
 HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT ISC BSD-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.88.0.tar.gz -> stripe-mock-0.88.0.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=2abde11e6819afa65840a148327ffb38
+_md5_=aabb01d5a7996933232e6ba56f4f5c28
diff --git a/metadata/md5-cache/dev-util/wasmer-0.11.0 b/metadata/md5-cache/dev-util/wasmer-0.11.0
index c962df6e1325..7f6ae2e806fe 100644
--- a/metadata/md5-cache/dev-util/wasmer-0.11.0
+++ b/metadata/md5-cache/dev-util/wasmer-0.11.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT Apache-2.0 BSD-2 ISC
 SLOT=0
 SRC_URI=https://github.com/wasmerio/wasmer/archive/0.11.0.tar.gz -> wasmer-0.11.0.tar.gz https://dev.gentoo.org/~williamh/dist/wasmer-0.11.0-git-deps.tar.xz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/bincode/1.2.0/download -> bincode-1.2.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.9/download -> blake2b_simd-0.5.9.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.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/cargo_toml/0.6.4/download -> cargo_toml-0.6.4.crate https://crates.io/api/v1/crates/cast/0.2.2/download -> cast-0.2.2.crate https://crates.io/api/v1/crates/cbindgen/0.9.1/download -> cbindgen-0.9.1.crate https://crates.io/api/v1/crates/cc/1.0.47/download -> cc-1.0.47.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/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/cranelift-bforest/0.44.0/download -> cranelift-bforest-0.44.0.crate https://crates.io/api/v1/crates/cranelift-codegen/0.44.0/download -> cranelift-codegen-0.44.0.crate https://crates.io/api/v1/crates/cranelift-codegen-meta/0.44.0/download -> cranelift-codegen-meta-0.44.0.crate https://crates.io/api/v1/crates/cranelift-codegen-shared/0.44.0/download -> cranelift-codegen-shared-0.44.0.crate https://crates.io/api/v1/crates/cranelift-entity/0.44.0/download -> cranelift-entity-0.44.0.crate https://crates.io/api/v1/crates/cranelift-native/0.44.0/download -> cranelift-native-0.44.0.crate https://crates.io/api/v1/crates/criterion/0.2.11/download -> criterion-0.2.11.crate https://crates.io/api/v1/crates/criterion-plot/0.3.1/download -> criterion-plot-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/csv/1.1.1/download -> csv-1.1.1.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.12/download -> ctor-0.1.12.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dynasm/0.5.1/download -> dynasm-0.5.1.crate https://crates.io/api/v1/crates/dynasmrt/0.5.1/download -> dynasmrt-0.5.1.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/enum-methods/0.0.8/download -> enum-methods-0.0.8.crate https://crates.io/api/v1/crates/erased-serde/0.3.9/download -> erased-serde-0.3.9.crate https://crates.io/api/v1/crates/errno/0.2.4/download -> errno-0.2.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.1/download -> errno-dragonfly-0.1.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/generational-arena/0.2.4/download -> generational-arena-0.2.4.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/ghost/0.1.1/download -> ghost-0.1.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.0.24/download -> goblin-0.0.24.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.3/download -> hermit-abi-0.1.3.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/indexmap/1.3.0/download -> indexmap-1.3.0.crate https://crates.io/api/v1/crates/inventory/0.1.4/download -> inventory-0.1.4.crate https://crates.io/api/v1/crates/inventory-impl/0.1.4/download -> inventory-impl-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.1/download -> itertools-0.8.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.65/download -> libc-0.2.65.crate https://crates.io/api/v1/crates/llvm-sys/80.1.1/download -> llvm-sys-80.1.1.crate https://crates.io/api/v1/crates/lock_api/0.3.1/download -> lock_api-0.3.1.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md5/0.6.1/download -> md5-0.6.1.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/nix/0.15.0/download -> nix-0.15.0.crate https://crates.io/api/v1/crates/num_cpus/1.11.0/download -> num_cpus-1.11.0.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/page_size/0.4.1/download -> page_size-0.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.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/0.4.30/download -> proc-macro2-0.4.30.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/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.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/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_xoshiro/0.1.0/download -> rand_xoshiro-0.1.0.crate https://crates.io/api/v1/crates/raw-cpuid/6.1.0/download -> raw-cpuid-6.1.0.crate https://crates.io/api/v1/crates/rayon/1.2.0/download -> rayon-1.2.0.crate https://crates.io/api/v1/crates/rayon-core/1.6.0/download -> rayon-core-1.6.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.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/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/scroll/0.9.2/download -> scroll-0.9.2.crate https://crates.io/api/v1/crates/scroll_derive/0.9.5/download -> scroll_derive-0.9.5.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.102/download -> serde-1.0.102.crate https://crates.io/api/v1/crates/serde-bench/0.0.7/download -> serde-bench-0.0.7.crate https://crates.io/api/v1/crates/serde_bytes/0.11.2/download -> serde_bytes-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.102/download -> serde_derive-1.0.102.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.4/download -> structopt-0.3.4.crate https://crates.io/api/v1/crates/structopt-derive/0.3.4/download -> structopt-derive-0.3.4.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.8/download -> syn-1.0.8.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.2/download -> synstructure-0.12.2.crate https://crates.io/api/v1/crates/target-lexicon/0.8.1/download -> target-lexicon-0.8.1.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/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tinytemplate/1.0.2/download -> tinytemplate-1.0.2.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/toml/0.5.5/download -> toml-0.5.5.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/typetag/0.1.4/download -> typetag-0.1.4.crate https://crates.io/api/v1/crates/typetag-impl/0.1.4/download -> typetag-impl-0.1.4.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.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/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/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wabt/0.9.2/download -> wabt-0.9.2.crate https://crates.io/api/v1/crates/wabt-sys/0.7.0/download -> wabt-sys-0.7.0.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wasmer-clif-fork-frontend/0.44.0/download -> wasmer-clif-fork-frontend-0.44.0.crate https://crates.io/api/v1/crates/wasmer-clif-fork-wasm/0.44.0/download -> wasmer-clif-fork-wasm-0.44.0.crate https://crates.io/api/v1/crates/wasmparser/0.39.2/download -> wasmparser-0.39.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=fa1992eb776e093e27babd674b29d8fe
diff --git a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1 b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
index 8d9638b4b5ec..a1bd14d4a5a1 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/yacc
 DESCRIPTION=A graphical file and directories comparator and merge tool
 EAPI=7
 HOMEPAGE=http://furius.ca/xxdiff/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=cab9b7adbb31c4854f22cf2e0c8656c3
+_md5_=557f3fc9c7bdc2cec87c6f2930ba5331
diff --git a/metadata/md5-cache/dev-util/ydiff-1.1 b/metadata/md5-cache/dev-util/ydiff-1.1
index 3154a0fdca7e..f6cffdcee403 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.1
+++ b/metadata/md5-cache/dev-util/ydiff-1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Colored, side-by-side diff terminal viewer (ex. cdiff)
 EAPI=7
 HOMEPAGE=https://github.com/ymattw/ydiff
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/y/ydiff/ydiff-1.1.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=059f60475aa7f16a5cd07d772ac50757
+_md5_=7cd41a181b422b1794685bcedf3afbd7
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 75555116ee8b..d2c2dc4a818d 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.11 b/metadata/md5-cache/dev-vcs/fossil-2.11
new file mode 100644
index 000000000000..4e2cac14b603
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/fossil-2.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= ) !tcl? ( || ( dev-lang/tcl:* dev-lang/jimtcl:* ) )
+DESCRIPTION=Simple, high-reliability, source control management, and more
+EAPI=7
+HOMEPAGE=https://www.fossil-scm.org/
+IUSE=debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=ssl? ( !miniz )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.11.tar.gz
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=70a9beded51d3c25070a522d0f0676e4
diff --git a/metadata/md5-cache/dev-vcs/git-2.27.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.27.0
similarity index 86%
rename from metadata/md5-cache/dev-vcs/git-2.27.0_rc2
rename to metadata/md5-cache/dev-vcs/git-2.27.0
index 2fc34ecf3f1a..77f2013fc050 100644
--- a/metadata/md5-cache/dev-vcs/git-2.27.0_rc2
+++ b/metadata/md5-cache/dev-vcs/git-2.27.0
@@ -5,11 +5,12 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.27.0.rc2.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.27.0.rc2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.27.0.rc2.tar.xz )
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.27.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.27.0.tar.xz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	504a3383c45504fde86b00426619a709	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=42fd44bc027ca254db5d45a18686dada
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.21 b/metadata/md5-cache/dev-vcs/stgit-0.21
index d8f17d883dec..b4ceb566853c 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.21
+++ b/metadata/md5-cache/dev-vcs/stgit-0.21
@@ -5,11 +5,11 @@ DESCRIPTION=Manage a stack of patches using GIT as a backend
 EAPI=7
 HOMEPAGE=http://www.procode.org/stgit/
 IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.6.3.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 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.21.tar.gz -> stgit-0.21.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=cca2c8769995e937373160c40efe28cf
+_md5_=8c01036b7fa1038226a05ec89dd41b52
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 8dbb6d71838c..4d56b5fda9ed 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/jazz2-0.6.3_p20200327 b/metadata/md5-cache/games-arcade/jazz2-0.6.4
similarity index 73%
rename from metadata/md5-cache/games-arcade/jazz2-0.6.3_p20200327
rename to metadata/md5-cache/games-arcade/jazz2-0.6.4
index 9040ab920687..ef7635f2bb38 100644
--- a/metadata/md5-cache/games-arcade/jazz2-0.6.3_p20200327
+++ b/metadata/md5-cache/games-arcade/jazz2-0.6.4
@@ -7,7 +7,7 @@ IUSE=gles2-only server
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-lang/mono media-libs/libopenmpt media-libs/libsdl2[video] media-libs/openal gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl )
-SLOT=0/0.6.3_p20200327
-SRC_URI=https://github.com/deathkiller/jazz2/archive/5174d3bc2e94676c4ab730aad6c68bf17b5406dd.tar.gz -> jazz2-0.6.3_p20200327.tar.gz
+SLOT=0/0.6.4
+SRC_URI=https://github.com/deathkiller/jazz2/archive/0.6.4.tar.gz -> jazz2-0.6.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	dotnet	02b07a2ea25a5f7ebf9059cbef40c56f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mono-env	1f24c032c78290b0d9a07d5b343051a7
-_md5_=bf2c43077c92f16d9d9a6bf57faca579
+_md5_=35b18c9b41d22f5283c200a7c54c42d5
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index e5e93ea27487..fc1022d61e08 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.32.0 b/metadata/md5-cache/games-board/four-in-a-row-3.32.0
deleted file mode 100644
index 82b199133c05..000000000000
--- a/metadata/md5-cache/games-board/four-in-a-row-3.32.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( 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-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.40.0:2 >=x11-libs/gtk+-3.13.2:3 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Make lines of the same color to win
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Four-in-a-row
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=x11-libs/gtk+-3.13.2:3 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3]
-SLOT=0
-SRC_URI=mirror://gnome/sources/four-in-a-row/3.32/four-in-a-row-3.32.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ae14e0bf9dec0caa8ddd3ee454d7be0
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.34.4 b/metadata/md5-cache/games-board/four-in-a-row-3.34.4
index 916a7d950397..162a84eda2e5 100644
--- a/metadata/md5-cache/games-board/four-in-a-row-3.34.4
+++ b/metadata/md5-cache/games-board/four-in-a-row-3.34.4
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.40.0:2 >=media-libs/gsound-1.0.2 >=x11-libs/gtk+-3.13.2
 DESCRIPTION=Make lines of the same color to win
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Four-in-a-row
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=media-libs/gsound-1.0.2 >=x11-libs/gtk+-3.13.2:3 >=gnome-base/librsvg-2.32.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/four-in-a-row/3.34/four-in-a-row-3.34.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d67cfaa85636a3795c7c6b908f5a8133
+_md5_=815b2508fced38be8fc569b0b58f41ef
diff --git a/metadata/md5-cache/games-board/grhino-0.16.1-r1 b/metadata/md5-cache/games-board/grhino-0.16.1-r1
deleted file mode 100644
index 11d18b7f92c1..000000000000
--- a/metadata/md5-cache/games-board/grhino-0.16.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=gnome? ( =gnome-base/libgnomeui-2* ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Reversi game for GNOME, supporting the Go/Game Text Protocol
-EAPI=6
-HOMEPAGE=http://rhino.sourceforge.net/
-IUSE=gnome gtp nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gnome? ( =gnome-base/libgnomeui-2* ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/rhino/grhino-0.16.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f5ea3da9fdb4d4fb46c84cd723e99048
diff --git a/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r1 b/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r1
deleted file mode 100644
index 46b299d2f781..000000000000
--- a/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] gnome? ( gnome-base/libgnomeui ) virtual/pkgconfig
-DESCRIPTION=Board games system
-EAPI=6
-HOMEPAGE=http://gtkboard.sourceforge.net/
-IUSE=gnome
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] gnome? ( gnome-base/libgnomeui )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkboard/gtkboard-0.11pre0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5fc4608c35925461f916137072464939
diff --git a/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2 b/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
new file mode 100644
index 000000000000..81ea56a49399
--- /dev/null
+++ b/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] x11-libs/gtk+:2
+DESCRIPTION=Board games system
+EAPI=7
+HOMEPAGE=http://gtkboard.sourceforge.net/indexold.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/gtkboard/gtkboard-0.11pre0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
+_md5_=c0c180c80fe6d47e1a0204d861d0d0eb
diff --git a/metadata/md5-cache/games-board/iagno-3.32.0 b/metadata/md5-cache/games-board/iagno-3.32.0
deleted file mode 100644
index bf61e708212e..000000000000
--- a/metadata/md5-cache/games-board/iagno-3.32.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( 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 ) gnome-base/librsvg:2[vala] dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-libs/libcanberra-0.26[gtk3] >=dev-libs/glib-2.40.0:2 >=x11-libs/gtk+-3.22.23:3 >=gnome-base/librsvg-2.32.0:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dominate the board in a classic version of Reversi
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Iagno
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=media-libs/libcanberra-0.26[gtk3] >=dev-libs/glib-2.40.0:2 >=x11-libs/gtk+-3.22.23:3 >=gnome-base/librsvg-2.32.0:2
-SLOT=0
-SRC_URI=mirror://gnome/sources/iagno/3.32/iagno-3.32.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=937e41d1fe04a5b08b62c46f34aa84bd
diff --git a/metadata/md5-cache/games-board/iagno-3.34.5 b/metadata/md5-cache/games-board/iagno-3.34.5
index 39b86976bc23..cf0e81065591 100644
--- a/metadata/md5-cache/games-board/iagno-3.34.5
+++ b/metadata/md5-cache/games-board/iagno-3.34.5
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.40.0:2 >=media-libs/gsound-1.0.2 >=x11-libs/gtk+-3.24.0
 DESCRIPTION=Dominate the board in a classic version of Reversi
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Iagno
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=media-libs/gsound-1.0.2 >=x11-libs/gtk+-3.24.0:3 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.34/iagno-3.34.5.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca4fdf79083d9ce2da9c63461a0a7dba
+_md5_=434eb3f859fef62a27d10cfc58f132fc
diff --git a/metadata/md5-cache/games-board/teg-0.11.2 b/metadata/md5-cache/games-board/teg-0.11.2
deleted file mode 100644
index 223af5e4db77..000000000000
--- a/metadata/md5-cache/games-board/teg-0.11.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl ) app-text/htmltidy nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome Risk Clone
-EAPI=5
-HOMEPAGE=http://teg.sourceforge.net/
-IUSE=nls debug
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/teg/teg-0.11.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4640e352e245a588242710779819f912
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index ae52a39afd10..bb51c452c4e0 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/frotz-2.50_beta2 b/metadata/md5-cache/games-engines/frotz-2.50_beta2
deleted file mode 100644
index aebc9086d3c0..000000000000
--- a/metadata/md5-cache/games-engines/frotz-2.50_beta2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst
-DEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate[sndfile] media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
-DESCRIPTION=Interpreter for Z-code based text games
-EAPI=7
-HOMEPAGE=https://661.org/proj/if/frotz/
-IUSE=ncurses sdl sound unicode
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate[sndfile] media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
-REQUIRED_USE=sound? ( || ( ncurses sdl ) )
-SLOT=0
-SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.50b2/frotz-2.50b2.tar.bz2
-_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=be6559e32c116d48613905df41072d33
diff --git a/metadata/md5-cache/games-engines/frotz-2.52 b/metadata/md5-cache/games-engines/frotz-2.52
new file mode 100644
index 000000000000..f9dea1aef77d
--- /dev/null
+++ b/metadata/md5-cache/games-engines/frotz-2.52
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
+DESCRIPTION=Interpreter for Z-code based text games
+EAPI=7
+HOMEPAGE=https://661.org/proj/if/frotz/
+IUSE=ncurses sdl sound unicode
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
+REQUIRED_USE=sound? ( || ( ncurses sdl ) )
+SLOT=0
+SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=68e421b3f251349c7e67a8db511d6c3d
diff --git a/metadata/md5-cache/games-engines/renpy-7.3.5 b/metadata/md5-cache/games-engines/renpy-7.3.5
index f6b8c26ba8e2..07f182155cc5 100644
--- a/metadata/md5-cache/games-engines/renpy-7.3.5
+++ b/metadata/md5-cache/games-engines/renpy-7.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=Visual novel engine written in python
 EAPI=7
 HOMEPAGE=https://www.renpy.org
 IUSE=development doc examples python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/fribidi ~dev-python/pygame_sdl2-7.3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/python-exec-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/glew:0 media-libs/libpng:0 media-libs/libsdl2[video] media-libs/freetype:2 sys-libs/zlib media-video/ffmpeg !app-eselect/eselect-renpy python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=examples? ( development ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/7.3.5/renpy-7.3.5-source.tar.bz2
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03a7d7ee945a349ecc972a6dd2f80f1f
+_md5_=61a16b986de95d6aa23c900fe6d38e63
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index cb8598435c81..58e1169837f3 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.32.0 b/metadata/md5-cache/games-puzzle/quadrapassel-3.32.0
deleted file mode 100644
index 12ff5b4b5305..000000000000
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.32.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( 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-libs/libmanette[vala] gnome-base/librsvg:2[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=>=media-libs/libcanberra-0.26[gtk3] media-libs/cogl:1.0= >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.12.0:3 >=dev-libs/libmanette-0.2.0 x11-libs/pango >=gnome-base/librsvg-2.32.0:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Fit falling blocks together
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Quadrapassel
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=media-libs/libcanberra-0.26[gtk3] media-libs/cogl:1.0= >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.12.0:3 >=dev-libs/libmanette-0.2.0 x11-libs/pango >=gnome-base/librsvg-2.32.0:2
-SLOT=0
-SRC_URI=mirror://gnome/sources/quadrapassel/3.32/quadrapassel-3.32.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8ce9f64760167ef6f47e186f566f8e1
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.36.00 b/metadata/md5-cache/games-puzzle/quadrapassel-3.36.00
index 15c85df7c494..6e2de518546d 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.36.00
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.36.00
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 media-libs
 DESCRIPTION=Fit falling blocks together
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Quadrapassel
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 media-libs/cogl:1.0= >=media-libs/gsound-1.0.2 >=x11-libs/gtk+-3.12.0:3 >=dev-libs/libmanette-0.2.0 x11-libs/pango >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.36/quadrapassel-3.36.00.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=977b5fbf1e9e5874bb531a7ddffa2b33
+_md5_=b1f188051c0b123073b121db27cbfbef
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 068e145c43c0..e91ce24b6665 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.11 b/metadata/md5-cache/games-strategy/wesnoth-1.14.11
index 3222651a16d5..0aa9442ac41a 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.11
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.11
@@ -11,4 +11,4 @@ RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.11.tar.gz -> wesnoth-1.14.11.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed1e7ab508634035fb4a3dd06ba1975b
+_md5_=4cd4e05fb9ef5710345de62cb779af8a
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.9 b/metadata/md5-cache/games-strategy/wesnoth-1.14.9
index 0a07de475025..2d10e87742ea 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.9
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.9
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[jo
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.9.tar.gz -> wesnoth-1.14.9.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f15aeac355f60dbb6250f7ca8340ce5b
+_md5_=55b49d762ed5bf2aafbe66a08aea6d80
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.3 b/metadata/md5-cache/games-strategy/wesnoth-1.15.3
index bd49d34b7bb1..9ac1562b7238 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.15.3
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.3
@@ -10,4 +10,4 @@ RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.3.tar.gz -> wesnoth-1.15.3.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed1e7ab508634035fb4a3dd06ba1975b
+_md5_=4cd4e05fb9ef5710345de62cb779af8a
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index e9ac4fb48d5d..4d947b224076 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/slade-3.1.12a b/metadata/md5-cache/games-util/slade-3.1.12a
index 2cca49762c64..342b74263b64 100644
--- a/metadata/md5-cache/games-util/slade-3.1.12a
+++ b/metadata/md5-cache/games-util/slade-3.1.12a
@@ -1,14 +1,14 @@
 BDEPEND=app-arch/p7zip virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2:= dev-lang/lua:0 >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[webkit?] fluidsynth? ( media-sound/fluidsynth:= )
+DEPEND=app-arch/bzip2:= dev-lang/lua:0 >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[opengl,webkit?,X] fluidsynth? ( media-sound/fluidsynth:= )
 DESCRIPTION=Modern editor for Doom-engine based games and source ports
 EAPI=7
 HOMEPAGE=https://slade.mancubus.net/
 IUSE=fluidsynth timidity webkit
 KEYWORDS=~amd64
 LICENSE=GPL-2 MIT
-RDEPEND=app-arch/bzip2:= dev-lang/lua:0 >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[webkit?] fluidsynth? ( media-sound/fluidsynth:= ) timidity? ( media-sound/timidity++ )
+RDEPEND=app-arch/bzip2:= dev-lang/lua:0 >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[opengl,webkit?,X] fluidsynth? ( media-sound/fluidsynth:= ) timidity? ( media-sound/timidity++ )
 SLOT=0
 SRC_URI=https://github.com/sirjuddington/SLADE/archive/3.1.12a.tar.gz -> slade-3.1.12a.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33fb3687e79141ed141d47a245a3a617
+_md5_=01bff685b682e4053cfc3e65c044a440
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 376e22d85dbe..9d7f0ff17cd9 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/dconf-0.34.0 b/metadata/md5-cache/gnome-base/dconf-0.34.0
index 986a3f98f6f4..3adbe3b50f8e 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.34.0
+++ b/metadata/md5-cache/gnome-base/dconf-0.34.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple low-level configuration system
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/dconf
 IUSE=gtk-doc test
-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.44.0:2 sys-apps/dbus
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.34/dconf-0.34.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=302860b8806df59999b0c2b977dba593
+_md5_=06797466ab614746d7450023ab35c3a4
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.34.5 b/metadata/md5-cache/gnome-base/gnome-control-center-3.34.5
index ab6639eabb58..67188e9f76cd 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.34.5
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.34.5
@@ -5,7 +5,7 @@ DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
 IUSE=+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=gui-libs/libhandy-0.0.9:0.0= gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.53.0:2 >=gnome-base/gnome-desktop-3.27.90:3= >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-3.31.0 dev-libs/libxml2:2 >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= dev-libs/libgudev x11-libs/libX11 >=x11-libs/libXi-1.2 flickr? ( >=media-libs/grilo-0.3.0:0.3= ) >=x11-libs/gtk+-3.22.0:3[X,wayland=] cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) v4l? ( >=media-video/cheese-3.28.0 ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.0 >=net-misc/networkmanager-1.12.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.1.24 net-libs/libsoup:2.4 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret media-libs/gsound >=dev-libs/libpwquality-1.2.2 systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] ) !<gnome-base/gdm-2.91.94 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.34/gnome-control-center-3.34.5.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-control-center-3.34.5-patchset.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdc412d7df03c0b397c0c054a39db061
+_md5_=ca48cde58b2e2ea1c2b434a6a458f5c6
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.34.4 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.34.4
index d4a1f71cc6c8..2d8f2145e92e 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.34.4
+++ b/metadata/md5-cache/gnome-base/gnome-core-apps-3.34.4
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
 EAPI=7
 HOMEPAGE=https://www.gnome.org/
 IUSE=+bluetooth cups
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=gnome-base/gnome-core-libs-3.34.4[cups?] >=gnome-base/gnome-session-3.32.0 >=gnome-base/gnome-settings-daemon-3.34.2[cups?] >=gnome-base/gnome-control-center-3.34.4[cups?] >=gnome-extra/gnome-color-manager-3.32.0 >=app-crypt/gcr-3.34.0 >=gnome-base/nautilus-3.34.2 >=gnome-base/gnome-keyring-3.34.0 >=gnome-extra/evolution-data-server-3.34.4 >=app-crypt/seahorse-3.32.2 >=app-editors/gedit-3.34.1 >=app-text/evince-3.34.2 >=gnome-extra/gnome-contacts-3.34.1 >=media-gfx/eog-3.32.1 >=media-video/totem-3.34.1 >=x11-terms/gnome-terminal-3.34.2 >=gnome-extra/gnome-user-docs-3.34.1 >=gnome-extra/yelp-3.34.0 >=x11-themes/adwaita-icon-theme-3.32.0 bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.0 )
 SLOT=3.0
-_md5_=07f9570c6c1077cc73d6ff3cb45db36c
+_md5_=25c00b3415b055f8372d32005d1bd6af
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.34.4 b/metadata/md5-cache/gnome-base/gnome-light-3.34.4
index 83425e5b93c8..8cbaea0dd1cb 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.34.4
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.34.4
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for GNOME-Light, merge this package to install
 EAPI=7
 HOMEPAGE=https://www.gnome.org/
 IUSE=cups +gnome-shell
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.42.2
 RDEPEND=>=gnome-base/gnome-core-libs-3.34.4[cups?] >=gnome-base/gnome-session-3.34.2 >=gnome-base/gnome-settings-daemon-3.34.2[cups?] >=gnome-base/gnome-control-center-3.34.4[cups?] >=gnome-base/nautilus-3.34.2 gnome-shell? ( >=x11-wm/mutter-3.34.4 >=dev-libs/gjs-1.58.5 >=gnome-base/gnome-shell-3.34.4 >=media-fonts/cantarell-0.111 ) >=x11-themes/adwaita-icon-theme-3.32.0 >=x11-themes/gnome-themes-standard-3.28 >=x11-themes/gnome-backgrounds-3.34 >=x11-terms/gnome-terminal-3.34.2
 SLOT=2.0
-_md5_=034b7c63883dc3e05d22644d1d599d91
+_md5_=2e16432313778eae905151ebe1804377
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.34.5 b/metadata/md5-cache/gnome-base/gnome-shell-3.34.5
index 02c1e2909271..a035437a7c9d 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.34.5
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.34.5
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection] !arm? ( >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] ) browser-extension? ( gnome-extra/chrome-gnome-shell )
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.57.3 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.34.0:0/5[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.32:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.34/gnome-shell-3.34.5.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=386f00c263f97351ec93cc701c6ae4dd
+_md5_=cc45aae0640394d743764b8e4ed537a6
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.34.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.34.0
index 36b24256c72c..a580aa7187f2 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.34.0
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.34.0
@@ -5,10 +5,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=!<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.34/gsettings-desktop-schemas-3.34.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57fe9c895d702fe8768686427269e498
+_md5_=dd6aaa3b22e5be15ab5073a22639a873
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index f2166e98e25b..df5f51faa7fd 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.34.1 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.34.1
index d4f0b3104292..1a89843e4efe 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.34.1
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.34.1
@@ -5,10 +5,10 @@ DESCRIPTION=GNOME contact management application
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
 IUSE=telepathy v4l
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.44:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-0.0.9:0.0=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.34/gnome-contacts-3.34.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b729567854107c092d85c0cd7615b35
+_md5_=567fe52f61505b3fab456f5a6c445dc8
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1
deleted file mode 100644
index e24a09682671..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Customize advanced GNOME 3 options
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
-IUSE=python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-3+ CC0-1.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_7(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-3.28 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-tweaks/3.32/gnome-tweaks-3.32.0.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d191e3c6201e245a08bdb200f555535
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.0 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.0
index 3563982b0b01..4a335745cb18 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.0
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.0
@@ -5,11 +5,11 @@ DESCRIPTION=Customize advanced GNOME 3 options
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+ CC0-1.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_8(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:0.0[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/3.34/gnome-tweaks-3.34.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4ce8d924929290dbf2d0ebdace70de1
+_md5_=4cb87807da75e329e869eedab0d45aa8
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
index 58e3959d335c..6dbf4c55c42a 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.34/yelp-xsl-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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd40c3bab63b0bba8bedfc110bd8055d
+_md5_=bb3b0e90ac2e092025b15dc45c66bf6e
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index a962971d260a..de4ce0333a34 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/libhandy-0.0.13 b/metadata/md5-cache/gui-libs/libhandy-0.0.13
index 924ce9307969..c628807ec6b7 100644
--- a/metadata/md5-cache/gui-libs/libhandy-0.0.13
+++ b/metadata/md5-cache/gui-libs/libhandy-0.0.13
@@ -5,7 +5,7 @@ DESCRIPTION=Library with GTK widgets for mobile phones
 EAPI=7
 HOMEPAGE=https://source.puri.sm/Librem5/libhandy/
 IUSE=examples glade gtk-doc +introspection test +vala test
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.0/0
 SRC_URI=https://source.puri.sm/Librem5/libhandy/-/archive/v0.0.13/libhandy-v0.0.13.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5de5a0c7582cb117cb791c0794c382a0
+_md5_=82de4d9d2af39dc3d6fbd5dca267bc4e
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.4.0.1 b/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
index 6da66817f85f..125ed8762fe2 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
+++ b/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.4.0.1.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34368c925e53d1e6342ed5d3df554f6b
+_md5_=82f1d52de940b235a5a8152e11fb9df1
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
index 7ac2ce0dab6e..1226b714e118 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 gui-libs/lib
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 gui-libs/libwpe:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.4.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b038a9711ffaa2887896a65bc720b2e9
+_md5_=7e0a18b62c91e3f684727ef06d366da7
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 1cccdaacbffe..3ef8e1233d10 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-4.95.0 b/metadata/md5-cache/kde-misc/kio-fuse-4.95.0
index 01bbd2c66240..c9e8a423d866 100644
--- a/metadata/md5-cache/kde-misc/kio-fuse-4.95.0
+++ b/metadata/md5-cache/kde-misc/kio-fuse-4.95.0
@@ -8,8 +8,8 @@ IUSE=debug test
 KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 sys-fs/fuse:3 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-fuse/4.95.0/kio-fuse-4.95.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e411334597aac8346e9b1a975f489662
+_md5_=3783204a7cd0ce16e7f2dd2adbb71d63
diff --git a/metadata/md5-cache/kde-misc/tellico-3.3 b/metadata/md5-cache/kde-misc/tellico-3.3.1
similarity index 98%
rename from metadata/md5-cache/kde-misc/tellico-3.3
rename to metadata/md5-cache/kde-misc/tellico-3.3.1
index 5e59502fcd69..899613cba0ad 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.3
+++ b/metadata/md5-cache/kde-misc/tellico-3.3.1
@@ -10,6 +10,6 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-perl/Text-BibTeX-0.780.0-r1 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcodecs:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kguiaddons:5 kde-frameworks/khtml:5 kde-frameworks/kiconthemes:5 kde-frameworks/kitemmodels:5 kde-frameworks/ki18n:5 kde-frameworks/kjobwidgets:5 kde-frameworks/kio:5 kde-frameworks/knewstuff:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwallet:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 kde-frameworks/solid:5 kde-frameworks/sonnet:5 cddb? ( kde-apps/libkcddb:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( kde-apps/libksane:5 ) semantic-desktop? ( kde-frameworks/kfilemetadata:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) || ( kde-frameworks/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=https://tellico-project.org/files/tellico-3.3.tar.xz
+SRC_URI=https://tellico-project.org/files/tellico-3.3.1.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ed48e082c66f5b0ce1b753d8e17381e
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 2cfc1b140cfe..df908e1080dc 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5
deleted file mode 100644
index 5c9d9932bd3a..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66.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=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/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/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcodecs-5.66.0:5 >=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/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kemoticons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kitemmodels-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kparts-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5: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.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.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 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/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/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcodecs-5.66.0:5 >=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/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kemoticons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kitemmodels-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kparts-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/plasma-workspace-5.18.5: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.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-frameworks/qqc2-desktop-style-5.66.0:5 >=kde-plasma/breeze-5.18.5:5 >=kde-plasma/kde-cli-tools-5.18.5:5 >=kde-plasma/oxygen-5.18.5: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.18.5/plasma-desktop-5.18.5.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	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7dbf0251119814678c5be1b1eae149f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5
deleted file mode 100644
index 5133eafd0990..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5
+++ /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.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=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5=[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-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/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=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/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kitemmodels-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/kpeople-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktexteditor-5.66.0:5 >=kde-frameworks/ktextwidgets-5.66.0:5 >=kde-frameworks/kwallet-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/kscreenlocker-5.18.5:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5: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.66.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.66.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.66.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtconcurrent-5.12.3: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 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.18.5:5
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5=[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-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/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kbookmarks-5.66.0:5 >=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/kdeclarative-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kitemmodels-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/kjobwidgets-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/kpeople-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktexteditor-5.66.0:5 >=kde-frameworks/ktextwidgets-5.66.0:5 >=kde-frameworks/kwallet-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/kscreenlocker-5.18.5:5 >=kde-plasma/kwin-5.18.5:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libksysguard-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5: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.66.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.66.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.66.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.66.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpaths-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5[widgets] >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kquickcharts-5.66.0:5 >=kde-frameworks/kdesu-5.66.0:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-plasma/ksysguard-5.18.5:5 >=kde-plasma/milou-5.18.5:5 >=kde-plasma/plasma-integration-5.18.5: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.18.5/plasma-workspace-5.18.5.tar.xz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff86e4648ca21fb13b7cb58387831ff4
diff --git a/metadata/md5-cache/mail-filter/MailScanner-4.84.5.2 b/metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
index 5ec6f98d9502..7278efa390ee 100644
--- a/metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
+++ b/metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare unpack
 DEPEND=dev-lang/perl
 DESCRIPTION=Free Anti-Virus and Anti-Spam Filter
 EAPI=7
-HOMEPAGE=http://www.mailscanner.info/
+HOMEPAGE=https://www.mailscanner.info/
 IUSE=clamav doc exim postfix spamassassin
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Archive-Zip virtual/perl-IO-Compress dev-perl/Convert-BinHex dev-perl/Convert-TNEF dev-perl/DBD-SQLite dev-perl/DBI dev-perl/Filesys-Df dev-perl/HTML-Parser dev-perl/HTML-Tagset dev-perl/IO-stringy dev-perl/MIME-tools dev-perl/MailTools dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/OLE-StorageLite dev-perl/Sys-Hostname-Long dev-perl/TimeDate net-mail/tnef dev-perl/Sys-SigAction virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Sys-Syslog virtual/perl-MIME-Base64 postfix? ( mail-mta/postfix ) exim? ( !postfix? ( mail-mta/exim ) ) !postfix? ( !exim? ( mail-mta/sendmail ) ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
-SRC_URI=http://www.mailscanner.info/files/4/tar/MailScanner-install-4.84.5-2.tar.gz
-_md5_=84c787b8697f67531c9b5fe3c30b29a6
+SRC_URI=https://www.mailscanner.info/files/4/tar/MailScanner-install-4.84.5-2.tar.gz
+_md5_=51338dd35e90b58f1d62fc1793c55470
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 92b077b5dda9..a039a1d59b56 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.10 b/metadata/md5-cache/mail-filter/libspf2-1.2.10
index 616f0eacdc35..a8e85ff2bb79 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.10
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.10
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install 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=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols
 EAPI=5
-HOMEPAGE=http://www.libspf2.org
+HOMEPAGE=https://www.libspf2.org
 IUSE=static static-libs
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( LGPL-2.1 BSD-2 )
 RDEPEND=!dev-perl/Mail-SPF-Query
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
-SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.10.tar.gz
+SRC_URI=https://www.libspf2.org/spf/libspf2-1.2.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1751f3de3f1d68e0847c7f7afd079e53
+_md5_=96ec5ce1db4b385aa35389330f209d76
diff --git a/metadata/md5-cache/mail-filter/libsrs2-1.0.18 b/metadata/md5-cache/mail-filter/libsrs2-1.0.18
index c8919c4e4c34..323d456be3e3 100644
--- a/metadata/md5-cache/mail-filter/libsrs2-1.0.18
+++ b/metadata/md5-cache/mail-filter/libsrs2-1.0.18
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
 DEPEND=!dev-perl/Mail-SRS >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=libsrs2 is the next generation Sender Rewriting Scheme library
 EAPI=4
-HOMEPAGE=http://www.libsrs2.org/
+HOMEPAGE=https://www.libsrs2.org/
 IUSE=static-libs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=!dev-perl/Mail-SRS
 SLOT=0
-SRC_URI=http://www.libsrs2.org/srs/libsrs2-1.0.18.tar.gz
+SRC_URI=https://www.libsrs2.org/srs/libsrs2-1.0.18.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08b930ce8a9f67f0d60bca028d4642cb
+_md5_=8a77c553e6ad7bc40a67f0a52f857b68
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index ff3e70b8aa1b..aca5cf7b3d54 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/exim-4.94 b/metadata/md5-cache/mail-mta/exim-4.94
new file mode 100644
index 000000000000..9ea9ee5ba77c
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.94
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl )
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=https://www.exim.org/
+IUSE=arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
+SLOT=0
+SRC_URI=https://downloads.exim.org/exim4/exim-4.94.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.94.tar.xz )
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=76a07815d6917175f7d586699ed9a1cd
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r13 b/metadata/md5-cache/mail-mta/netqmail-1.06-r13
index 392b3ece9f79..7c8f5bed7836 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r13
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r13
@@ -4,7 +4,7 @@ DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agen
 EAPI=7
 HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 RDEPEND=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 net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions sys-apps/groff ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) 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/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
@@ -12,4 +12,4 @@ 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	0914eab919f4f11dd9e0407b92af4726	qmail	83a4685f5044b0b067cb7e6f0e9c909c	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=d535ae2e2c1b983c77b993d5a401c187
+_md5_=4c64fa3450bf20ccdf15f066154644b0
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index d7c13a88ce0b..459bfd9225d3 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/flam3-3.1.1 b/metadata/md5-cache/media-gfx/flam3-3.1.1
index b477e23365ee..717a8dcb7699 100644
--- a/metadata/md5-cache/media-gfx/flam3-3.1.1
+++ b/metadata/md5-cache/media-gfx/flam3-3.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/libxml2 media-libs/libpng:= virtual/jpeg:= !<=x11-misc/electricsheep-2.6.8-r2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Tools and a library for creating flame fractal images
 EAPI=6
-HOMEPAGE=http://flam3.com/
+HOMEPAGE=https://flam3.com/
 IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libxml2 media-libs/libpng:= virtual/jpeg:= !<=x11-misc/electric
 SLOT=0
 SRC_URI=https://github.com/scottdraves/flam3/archive/v3.1.1.tar.gz -> flam3-3.1.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b23ca47641a9d54459fc0c519fcc7612
+_md5_=06d2cb5e30f0a626a27d59530b56f7bd
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.16 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.16
new file mode 100644
index 000000000000..2fa3ede71be9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.16
@@ -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-16.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=032d990205dc20cb5d0a14eef10a5a6a
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16
new file mode 100644
index 000000000000..0dc4f7b92096
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16
@@ -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 ) 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	0914eab919f4f11dd9e0407b92af4726	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=a3938d9325d00930f04e54db5078f307
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r1 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r1
new file mode 100644
index 000000000000..0a233d6e829b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r1
@@ -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/inkscape 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 ~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/inkscape 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	0914eab919f4f11dd9e0407b92af4726	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=1d9b42ff48c677f5526356fa5b2fc425
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0 b/metadata/md5-cache/media-gfx/inkscape-1.0
index 7136558fc274..dfeba9d81823 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0
@@ -5,7 +5,7 @@ DESCRIPTION=SVG based generic vector-drawing program
 EAPI=7
 HOMEPAGE=https://inkscape.org/
 IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] media-gfx/scour[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_1_0/inkscape-INKSCAPE_1_0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66bde525f0998271ee13ad372d458bd7
+_md5_=be9a1844d7c4e02fa9ba645858dbd3df
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r5 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r5
index 78f613d831e8..01af66f95351 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.1.3-r5
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Generic 2D CAD program
 EAPI=7
 HOMEPAGE=https://www.librecad.org/
 IUSE=debug doc tools
-KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/freetype:2
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.tar.gz -> librecad-2.1.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=9130fbe67d4008399051f173d9210766
+_md5_=6a7d945b78b5235ce1fe5ca224ce8884
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.12.6 b/metadata/md5-cache/media-gfx/pngquant-2.12.6
index d221887808c6..237b13fe921c 100644
--- a/metadata/md5-cache/media-gfx/pngquant-2.12.6
+++ b/metadata/md5-cache/media-gfx/pngquant-2.12.6
@@ -4,11 +4,11 @@ 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 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3 HPND rwpng
 RDEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 )
 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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=8b5d18f94948d8f8602ce0351c5b0638
+_md5_=bf185493134d0df6f0d4425687a86c7d
diff --git a/metadata/md5-cache/media-gfx/scour-0.37 b/metadata/md5-cache/media-gfx/scour-0.37
index 031de23c2f40..f02c4d97fd7e 100644
--- a/metadata/md5-cache/media-gfx/scour-0.37
+++ b/metadata/md5-cache/media-gfx/scour-0.37
@@ -5,11 +5,11 @@ DESCRIPTION=Take an SVG file and produce a cleaner and more concise file
 EAPI=7
 HOMEPAGE=https://github.com/scour-project/scour
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/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 )
 SLOT=0
 SRC_URI=https://github.com/scour-project/scour/archive/v0.37.tar.gz -> scour-0.37.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5fb36f0d3b564a07df8be15d675ca3df
+_md5_=f17280a685cd736d67550e45eb643722
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5e b/metadata/md5-cache/media-gfx/transfig-3.2.5e
index 26e336e2d50f..061b338655a8 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5e
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5e
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb x11-misc/imake app-text/rman
 DESCRIPTION=A set of tools for creating TeX documents with graphics
 EAPI=4
-HOMEPAGE=http://www.xfig.org/
+HOMEPAGE=https://www.xfig.org/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5e.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 https://dev.gentoo.org/~mgorny/dist/transfig-3.2.5e-gentoo-patchset.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=395f60958979c02103b549c71efcb840
+_md5_=1eface6faf069c65bde2a38e187b8a12
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5a5f37eb3090..99c67857094d 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
deleted file mode 100644
index c26645b48639..000000000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.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 prepare setup test
-DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) doc? ( >=app-doc/doxygen-1.2.6 )
-DESCRIPTION=Advanced Linux Sound Architecture Library
-EAPI=7
-HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.1.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f394e148ccff12f29a8f3966aeeae45e
diff --git a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.1 b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.1
deleted file mode 100644
index 76aa6c8fb6b6..000000000000
--- a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<media-libs/alsa-lib-1.2.1
-DESCRIPTION=ALSA topology configuration files
-EAPI=7
-HOMEPAGE=https://www.alsa-project.org
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=!<media-libs/alsa-lib-1.2.1
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-topology-conf-1.2.1.tar.bz2
-_md5_=ab3a4ee68f878ee3abe42240cc67bcf0
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.1.2 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.1.2
deleted file mode 100644
index dd48a698204e..000000000000
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<media-libs/alsa-lib-1.2.1
-DESCRIPTION=ALSA ucm configuration files
-EAPI=7
-HOMEPAGE=https://www.alsa-project.org
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=!<media-libs/alsa-lib-1.2.1
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.1.2.tar.bz2
-_md5_=cb76907bb8664b5ad7dd6ec2ef12ceff
diff --git a/metadata/md5-cache/media-libs/gsound-1.0.2-r1 b/metadata/md5-cache/media-libs/gsound-1.0.2-r1
index e0bb6ec95190..e1cacdb5f805 100644
--- a/metadata/md5-cache/media-libs/gsound-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/gsound-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Thin GObject wrapper around the libcanberra sound event library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GSound
 IUSE=+introspection +vala
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 media-libs/libcanberra introspection? ( >=dev-libs/gobject-introspection-1.2.9:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsound/1.0/gsound-1.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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9cb5f03f2c0b6ae491e9423fb6849e0e
+_md5_=4624c6e509ae87c1a577c2271c1a6426
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.5 b/metadata/md5-cache/media-libs/harfbuzz-2.6.5
index 417055be55db..b85a5f39775b 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.5
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.5
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
+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
+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.5/harfbuzz-2.6.5.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3a14cdeaff6bdf56fdc9ced3ffd92ef
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=81c1e5fbbe0bd4ff3ac5a74ef616a9aa
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.6 b/metadata/md5-cache/media-libs/harfbuzz-2.6.6
index 98273c356627..3d4515a8e911 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.6
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
+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
@@ -12,5 +12,5 @@ REQUIRED_USE=introspection? ( glib )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/2.6.6/harfbuzz-2.6.6.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=375480ac18c525166f4054b1766f4f24
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1af36e669d6ce59569af748b7d6d7c3a
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index a54a243edcb2..87d77ce4e636 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=dev-libs/gobject-introspection-common-1.34 dev-util/ragel
 DESCRIPTION=An OpenType text shaping engine
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=375480ac18c525166f4054b1766f4f24
+_md5_=1af36e669d6ce59569af748b7d6d7c3a
diff --git a/metadata/md5-cache/media-libs/libirman-0.4.5 b/metadata/md5-cache/media-libs/libirman-0.4.5
index 571fa90557d1..3fd79c9baeaa 100644
--- a/metadata/md5-cache/media-libs/libirman-0.4.5
+++ b/metadata/md5-cache/media-libs/libirman-0.4.5
@@ -2,10 +2,10 @@ BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=library for Irman control of Unix software
 EAPI=7
-HOMEPAGE=http://www.lirc.org/software/snapshots/
+HOMEPAGE=https://www.lirc.org/software/snapshots/
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2
 SLOT=0
-SRC_URI=http://www.lirc.org/software/snapshots/libirman-0.4.5.tar.bz2
+SRC_URI=https://www.lirc.org/software/snapshots/libirman-0.4.5.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=6d603fd43c913ec67d2852fa5cc2870c
+_md5_=b35f5ddd7a25155ef575fec490f3d9e3
diff --git a/metadata/md5-cache/media-libs/libopenmpt-0.4.12 b/metadata/md5-cache/media-libs/libopenmpt-0.5.0
similarity index 97%
rename from metadata/md5-cache/media-libs/libopenmpt-0.4.12
rename to metadata/md5-cache/media-libs/libopenmpt-0.5.0
index daaba416978b..944e8178fd4c 100644
--- a/metadata/md5-cache/media-libs/libopenmpt-0.4.12
+++ b/metadata/md5-cache/media-libs/libopenmpt-0.5.0
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.4.12+release.autotools.tar.gz
+SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.0+release.autotools.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=045a6369a3b73424484c31ae0476807d
+_md5_=2c16db88272f77720d6d9de0ec7f9cdf
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200525 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200525
new file mode 100644
index 000000000000..e614054535eb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200525
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/opus:= alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=VoIP library for Telegram clients
+EAPI=7
+HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
+IUSE=+alsa +dsp libressl pulseaudio
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Unlicense
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/opus:= alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/d2e63429ec94ee178a62b55be01f1cca98e9de83.tar.gz -> libtgvoip-2.4.4_p20200525.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=9128b886a51d3b82ef7bdaad4667c4c8
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0-r2 b/metadata/md5-cache/media-libs/lv2-1.14.0-r2
index ed37009fb40d..b36853e792d9 100644
--- a/metadata/md5-cache/media-libs/lv2-1.14.0-r2
+++ b/metadata/md5-cache/media-libs/lv2-1.14.0-r2
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) plugins? ( virtual/pkgconfig ) doc? ( app-doc/doxygen dev-python/rdflib )
 DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=6
-HOMEPAGE=http://lv2plug.in/
+HOMEPAGE=https://lv2plug.in/
 IUSE=doc plugins +python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/rdflib[python_targets_python3_6(-)] ) !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
-SRC_URI=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
+SRC_URI=https://lv2plug.in/spec/lv2-1.14.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=2df0d4b65577d57c1eb5ea352b34562c
+_md5_=7f28f5eee2b3e1c80f27b511b2a09e6b
diff --git a/metadata/md5-cache/media-libs/lv2-1.16.0-r1 b/metadata/md5-cache/media-libs/lv2-1.16.0-r1
index e12f7c4f46a8..7bc54e872a4a 100644
--- a/metadata/md5-cache/media-libs/lv2-1.16.0-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.16.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
 DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=6
-HOMEPAGE=http://lv2plug.in/
+HOMEPAGE=https://lv2plug.in/
 IUSE=doc plugins python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/rdflib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/rdflib[python_targets_python3_7(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-SRC_URI=http://lv2plug.in/spec/lv2-1.16.0.tar.bz2
+SRC_URI=https://lv2plug.in/spec/lv2-1.16.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=4c43c3acd5829c3d30632fe75c661d91
+_md5_=be6bd2489b7d4fccdcbd4e2b260a1378
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.0 b/metadata/md5-cache/media-libs/mesa-20.1.0
index fafb17232bd6..3640e53476d6 100644
--- a/metadata/md5-cache/media-libs/mesa-20.1.0
+++ b/metadata/md5-cache/media-libs/mesa-20.1.0
@@ -13,4 +13,4 @@ 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	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=8a2c427d62973e47a659a28c63550132
+_md5_=45a294fcaa3847e72d21a9b30a547064
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index f2214d63f9c2..4f0640e86c1c 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=8a2c427d62973e47a659a28c63550132
+_md5_=45a294fcaa3847e72d21a9b30a547064
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index baf59d0fa3bf..1e9236725fd0 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
deleted file mode 100644
index 2693dac28ecf..000000000000
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-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(-)?] ffmpeg? ( media-video/ffmpeg:0= ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=ALSA extra plugins
-EAPI=7
-HOMEPAGE=http://www.alsa-project.org/
-IUSE=arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/alsa-lib-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(-)?] ffmpeg? ( media-video/ffmpeg:0= ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/plugins/alsa-plugins-1.2.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=004f551146e3ec729c8e12f557c659b1
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-4.0.4 b/metadata/md5-cache/media-plugins/audacious-plugins-4.0.4
new file mode 100644
index 000000000000..7cc0de23548a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-4.0.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig nls? ( dev-util/intltool )
+DEFINED_PHASES=configure prepare setup
+DEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.0.4 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+DESCRIPTION=Lightweight and versatile audio player
+EAPI=7
+HOMEPAGE=https://audacious-media-player.org/
+IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.0.4 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+REQUIRED_USE=ampache? ( http ) streamtuner? ( http )
+SLOT=0
+SRC_URI=https://distfiles.audacious-media-player.org/audacious-plugins-4.0.4.tar.bz2
+_md5_=16a9bd5c5631a3b2aa98181b4243d720
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-9999 b/metadata/md5-cache/media-plugins/audacious-plugins-9999
index a7cf4a9c9474..775338ee7cb3 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-9999
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig nls? ( dev-util/intltool ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 unpack
-DEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 ~media-sound/audacious-9999[gtk=] aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) gtk? ( x11-libs/gtk+:2 x11-libs/libXcomposite x11-libs/libXrender ) !gtk? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+DEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-9999 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) X? ( dev-qt/qtx11extras:5 )
 DESCRIPTION=Lightweight and versatile audio player
 EAPI=7
 HOMEPAGE=https://audacious-media-player.org/
-IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack
+IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack X
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 ~media-sound/audacious-9999[gtk=] aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) gtk? ( x11-libs/gtk+:2 x11-libs/libXcomposite x11-libs/libXrender ) !gtk? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-REQUIRED_USE=|| ( alsa jack pulseaudio qtmedia sdl ) ampache? ( http ) streamtuner? ( http ) gtk? ( !ampache !qtmedia !streamtuner )
+RDEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-9999 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) X? ( dev-qt/qtx11extras:5 )
+REQUIRED_USE=ampache? ( http ) streamtuner? ( http )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=46fc30cbb8ab77857b9d6f93844f9910
+_md5_=c907fd911d7fa519fe40cf9e037afd44
diff --git a/metadata/md5-cache/media-plugins/gimp-lensfun-0.2.4-r1 b/metadata/md5-cache/media-plugins/gimp-lensfun-0.2.4-r1
deleted file mode 100644
index c44b6cfef874..000000000000
--- a/metadata/md5-cache/media-plugins/gimp-lensfun-0.2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare setup
-DEPEND=media-gfx/exiv2 <media-gfx/gimp-2.10.0 >=media-libs/lensfun-0.3.2
-DESCRIPTION=Gimp plugin to correct lens distortions
-EAPI=7
-HOMEPAGE=https://seebk.github.io/GIMP-Lensfun/
-IUSE=openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-gfx/exiv2 <media-gfx/gimp-2.10.0 >=media-libs/lensfun-0.3.2
-SLOT=0
-SRC_URI=https://github.com/seebk/GIMP-Lensfun/archive/0.2.4.tar.gz -> gimp-lensfun-0.2.4.tar.gz
-_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=8bfc978b8fb21bdd334e0109e26ef10e
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 73b01a5f2eca..12dfc8d223a7 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
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
 DEPEND=~media-video/vdr-2.2.0[permashift] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: permanent timeshift by recording live TV on RAM
 EAPI=7
-HOMEPAGE=http://ein-eike.de/vdr-plugin-permashift-english/
+HOMEPAGE=https://ein-eike.de/vdr-plugin-permashift-english/
 KEYWORDS=~amd64 ~x86
 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=http://ein-eike.de/wordpress/wp-content/uploads/2014/11/vdr-permashift-1.0.1.tgz
+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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=8ff796ed8f871731bdabcc6ad7cc3101
+_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 0e1bdeb247d8..ff5d63ddfd0f 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
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
 DEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: permanent timeshift by recording live TV on RAM
 EAPI=7
-HOMEPAGE=http://ein-eike.de/vdr-plugin-permashift-english/
+HOMEPAGE=https://ein-eike.de/vdr-plugin-permashift-english/
 KEYWORDS=~amd64 ~x86
 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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=d86be5423f9c1dc6889aff0dfa38fa94
+_md5_=f5081546453d0db7f454ef2bb20cdabf
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index ce13ae43367c..16c02678b76b 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/wsjtx-2.1.2 b/metadata/md5-cache/media-radio/wsjtx-2.1.2
index 85cefff467e2..012abc115636 100644
--- a/metadata/md5-cache/media-radio/wsjtx-2.1.2
+++ b/metadata/md5-cache/media-radio/wsjtx-2.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Weak signal ham radio communication
 EAPI=6
 HOMEPAGE=http://physics.princeton.edu/pulsar/K1JT/wsjtx.html
 IUSE=doc
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 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/qtsql:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/hamlib media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc doc? ( dev-ruby/asciidoctor )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsjt/wsjtx-2.1.2.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3df5316858277c90e7636e88e66e4546
+_md5_=3e56d70267bacb032952b7e270c18972
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index fb8d79568a19..fd28e8c68379 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.1.7 b/metadata/md5-cache/media-sound/alsa-tools-1.1.7
deleted file mode 100644
index fa89604c53fa..000000000000
--- a/metadata/md5-cache/media-sound/alsa-tools-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=media-libs/alsa-lib-1.1.7 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Advanced Linux Sound Architecture tools
-EAPI=6
-HOMEPAGE=https://alsa-project.org/
-IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.1.7 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
-SLOT=0.9
-SRC_URI=https://www.alsa-project.org/files/pub/tools/alsa-tools-1.1.7.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6be8ab9131a16789be990004d06ee70
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.1 b/metadata/md5-cache/media-sound/alsa-utils-1.2.1
deleted file mode 100644
index 808f5913053e..000000000000
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=>=media-libs/alsa-lib-1.2.1 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) doc? ( app-text/xmlto )
-DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
-EAPI=7
-HOMEPAGE=https://alsa-project.org/
-IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.2.1 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
-SLOT=0.9
-SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.1.tar.bz2
-_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=f6c1c412c65e0b30823d6e8530f4c008
diff --git a/metadata/md5-cache/media-sound/audacious-4.0.4 b/metadata/md5-cache/media-sound/audacious-4.0.4
new file mode 100644
index 000000000000..2cf4f25b2531
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacious-4.0.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool )
+DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight and versatile audio player
+EAPI=7
+HOMEPAGE=https://audacious-media-player.org/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+PDEPEND=~media-plugins/audacious-plugins-4.0.4
+RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://distfiles.audacious-media-player.org/audacious-4.0.4.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc81d59b818b03d599f73c33a2527ac9
diff --git a/metadata/md5-cache/media-sound/audacious-9999 b/metadata/md5-cache/media-sound/audacious-9999
index 1570d119169c..89c4297ece77 100644
--- a/metadata/md5-cache/media-sound/audacious-9999
+++ b/metadata/md5-cache/media-sound/audacious-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme gtk? ( x11-libs/gtk+:2 ) !gtk? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Lightweight and versatile audio player
 EAPI=7
 HOMEPAGE=https://audacious-media-player.org/
-IUSE=gtk nls
+IUSE=nls
 LICENSE=BSD-2
 PDEPEND=~media-plugins/audacious-plugins-9999
 PROPERTIES=live
-RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme gtk? ( x11-libs/gtk+:2 ) !gtk? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c91e6540d5c43c549d409d71e9d906ee
+_md5_=dc81d59b818b03d599f73c33a2527ac9
diff --git a/metadata/md5-cache/media-sound/din-44.0.2 b/metadata/md5-cache/media-sound/din-44.0.2
index d3d9c6480446..536fd4be0af0 100644
--- a/metadata/md5-cache/media-sound/din-44.0.2
+++ b/metadata/md5-cache/media-sound/din-44.0.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure postinst postrm preinst prepare
 DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=a software musical instrument and audio synthesizer
 EAPI=7
-HOMEPAGE=http://dinisnoise.org/
+HOMEPAGE=https://dinisnoise.org/
 IUSE=+alsa jack
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=https://archive.org/download/dinisnoise_source_code/din-44.0.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37908b969b88838eb36af822f328d88e
+_md5_=51a2e4fa41453233de8a12b3ca042163
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.34.6 b/metadata/md5-cache/media-sound/gnome-music-3.34.6
new file mode 100644
index 000000000000..99c21b932f79
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-music-3.34.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Music management for Gnome
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Music
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+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 )
+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	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7afef8a096fc7fb0a6cf6cc830954f7
diff --git a/metadata/md5-cache/media-sound/grip-4.0.1-r1 b/metadata/md5-cache/media-sound/grip-4.0.1-r1
deleted file mode 100644
index 5bf01548dda2..000000000000
--- a/metadata/md5-cache/media-sound/grip-4.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure
-DEPEND=dev-libs/glib:2 gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=vorbis
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-4.0.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=db66b33bbb4def0e672d007086d2f590
diff --git a/metadata/md5-cache/media-sound/grip-4.1.1 b/metadata/md5-cache/media-sound/grip-4.1.1
index 1622f4b6ea2e..47769c6594d0 100644
--- a/metadata/md5-cache/media-sound/grip-4.1.1
+++ b/metadata/md5-cache/media-sound/grip-4.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ based Audio CD Player/Ripper
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/grip/
 IUSE=vorbis
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-4.1.1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e8de4f47cc79596ce21ee4264f145c77
+_md5_=fbe69f6bd8d6df18707988555e9fb13a
diff --git a/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1 b/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1-r1
similarity index 71%
rename from metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
rename to metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1-r1
index 124b33347cd9..0dd7ce59b530 100644
--- a/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
+++ b/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1-r1
@@ -1,14 +1,14 @@
 BDEPEND=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
 DEFINED_PHASES=configure prepare
-DEPEND=media-libs/ladspa-sdk virtual/jack virtual/libintl x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) gnome? ( gnome-base/libgnomeui:= ) lash? ( media-sound/lash:= ) xml? ( dev-libs/libxml2:= media-libs/liblrdf:= )
+DEPEND=media-libs/ladspa-sdk virtual/jack virtual/libintl x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) lash? ( media-sound/lash:= ) xml? ( dev-libs/libxml2:= media-libs/liblrdf:= )
 DESCRIPTION=JACK Rack is an effects rack for the JACK low latency audio API
 EAPI=7
 HOMEPAGE=http://jack-rack.sourceforge.net/
-IUSE=alsa gnome lash +xml
+IUSE=alsa lash +xml
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/ladspa-sdk virtual/jack virtual/libintl x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) gnome? ( gnome-base/libgnomeui:= ) lash? ( media-sound/lash:= ) xml? ( dev-libs/libxml2:= media-libs/liblrdf:= )
+RDEPEND=media-libs/ladspa-sdk virtual/jack virtual/libintl x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib:= ) lash? ( media-sound/lash:= ) xml? ( dev-libs/libxml2:= media-libs/liblrdf:= )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/j/jack-rack/jack-rack_1.4.8~rc1.orig.tar.gz mirror://debian/pool/main/j/jack-rack/jack-rack_1.4.8~rc1-1.debian.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0aba7ed00708199a8e31164d50946cb1
+_md5_=7e0109b110aeb01b32af2c2063b6f256
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.14 b/metadata/md5-cache/media-sound/jack2-1.9.14
index 7c71c7eced37..7719f902de0f 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.14
+++ b/metadata/md5-cache/media-sound/jack2-1.9.14
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=6
-HOMEPAGE=http://jackaudio.org/
+HOMEPAGE=https://jackaudio.org/
 IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.14/v1.9.14.tar.gz -> jack2-1.9.14.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=38127411c14dcb30764786ebdd71d950
+_md5_=7f94cf938f7c854c55fc21d72dafe91e
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
index d618c2e42d41..d824d7d713d9 100644
--- a/metadata/md5-cache/media-sound/jack2-9999
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=6
-HOMEPAGE=http://jackaudio.org/
+HOMEPAGE=https://jackaudio.org/
 IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile 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
 LICENSE=GPL-2
 PROPERTIES=live
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( classic dbus )
 SLOT=2
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=051b4b24662e17b133d346d915ad765d
+_md5_=45312d4272947e9b767531e562c43896
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.1_rc1 b/metadata/md5-cache/media-sound/mumble-1.3.1_rc1
index 028044e909df..dc0a14e2883b 100644
--- a/metadata/md5-cache/media-sound/mumble-1.3.1_rc1
+++ b/metadata/md5-cache/media-sound/mumble-1.3.1_rc1
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sq
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.1-rc1/mumble-1.3.1-rc1.tar.gz https://dl.mumble.info/mumble-1.3.1-rc1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cf8a6a5de887d70e71fce1f064f42ba
+_md5_=bb1d0665edfb9a8456fb7bc6187b41d8
diff --git a/metadata/md5-cache/media-sound/openmpt123-0.4.12 b/metadata/md5-cache/media-sound/openmpt123-0.5.0
similarity index 52%
rename from metadata/md5-cache/media-sound/openmpt123-0.4.12
rename to metadata/md5-cache/media-sound/openmpt123-0.5.0
index dc78139ea220..d76ba5ee74b3 100644
--- a/metadata/md5-cache/media-sound/openmpt123-0.4.12
+++ b/metadata/md5-cache/media-sound/openmpt123-0.5.0
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=~media-libs/libopenmpt-0.4.12 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 ) sndfile? ( media-libs/libsndfile )
+DEPEND=~media-libs/libopenmpt-0.5.0 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.4 ) sndfile? ( media-libs/libsndfile )
 DESCRIPTION=libopenmpt-based command line player for tracked music files (modules)
 EAPI=7
 HOMEPAGE=https://lib.openmpt.org/libopenmpt/
 IUSE=flac portaudio pulseaudio sdl sndfile
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=~media-libs/libopenmpt-0.4.12 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 ) sndfile? ( media-libs/libsndfile )
+RDEPEND=~media-libs/libopenmpt-0.5.0 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.4 ) sndfile? ( media-libs/libsndfile )
 SLOT=0
-SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.4.12+release.autotools.tar.gz
+SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.0+release.autotools.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b53872e65f8c8954b02107f56d943337
+_md5_=62cdaffc5a8503e7a024af9563d670d2
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.7.0.1 b/metadata/md5-cache/media-sound/yoshimi-1.7.0.1
deleted file mode 100644
index f540cc82be87..000000000000
--- a/metadata/md5-cache/media-sound/yoshimi-1.7.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Software synthesizer based on ZynAddSubFX
-EAPI=7
-HOMEPAGE=https://yoshimi.github.io/
-IUSE=+lv2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
-SLOT=0
-SRC_URI=https://github.com/Yoshimi/yoshimi/archive/1.7.0.1.tar.gz -> yoshimi-1.7.0.1.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62895061e05511326e543d155784d8fc
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.7.1 b/metadata/md5-cache/media-sound/yoshimi-1.7.1
index 3db1fc16a835..7377bf8bbf37 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.7.1
+++ b/metadata/md5-cache/media-sound/yoshimi-1.7.1
@@ -5,10 +5,10 @@ DESCRIPTION=Software synthesizer based on ZynAddSubFX
 EAPI=7
 HOMEPAGE=https://yoshimi.github.io/
 IUSE=+lv2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=https://github.com/Yoshimi/yoshimi/archive/1.7.1.tar.gz -> yoshimi-1.7.1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15e03d568949140ad33d27329bff3315
+_md5_=62895061e05511326e543d155784d8fc
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 755d49c61342..5f1c51354f89 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index f58e6d4553fb..c173c1f7e736 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.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
 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.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 )
 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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d78e22c02dcb1e8af72169ba6cf280e4
+_md5_=a636ecb58febb62fe0a57d37d56fc85b
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index 5b28c47115c2..ef2171c6e2f0 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( m
 REQUIRED_USE=ddci? ( dvb )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bb3cc5eb27920c1a63d65640c7ada63c
+_md5_=fbd6ce3e0ec9001765fc639b68b4b491
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 48ba3b6aac2a..12000e1559b7 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.3 b/metadata/md5-cache/media-video/ffmpeg-4.2.3
index e397cfd05dcb..0eb18f916111 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.2.3
+++ b/metadata/md5-cache/media-video/ffmpeg-4.2.3
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-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(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.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(-)?] ) encode? ( amrenc? ( >=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(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.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(-)?] ) snappy? ( >=app-arch/snappy-1.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(-)?] ) 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(-)?] >=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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-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(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) 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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=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(-)?] ) iec61883? ( >=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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) 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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-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(-)?] ) libaom? ( >=media-libs/libaom-1.0.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(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-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(-)?] ) libass? ( >=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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=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(-)?] ) libsoxr? ( >=media-libs/soxr-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(-)?] ) libtesseract? ( >=app-text/tesseract-4.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(-)?] ) libv4l? ( >=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(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=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(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.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(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.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(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,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:2[abi_x86_32(-)?,abi_x86_64(-)?,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.2.1-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(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.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(-)?] ) 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(-)?] >=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(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) 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(-)?] >=x11-libs/libxcb-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(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) 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? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( 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(-)?] ) ) )
 REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl?
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-altivec.patch.gz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-gcc.patch.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=def29b8707d70853797753d10d24a797
+_md5_=3f54f7a387cb82b4e9851dd13f50711f
diff --git a/metadata/md5-cache/media-video/mkclean-0.8.10 b/metadata/md5-cache/media-video/mkclean-0.8.10
index 0906b6987d94..0975a879c09e 100644
--- a/metadata/md5-cache/media-video/mkclean-0.8.10
+++ b/metadata/md5-cache/media-video/mkclean-0.8.10
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install
 DESCRIPTION=mkclean is a command line tool to clean and optimize Matroska files
 EAPI=7
-HOMEPAGE=http://www.matroska.org/downloads/mkclean.html
+HOMEPAGE=https://www.matroska.org/downloads/mkclean.html
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.10.tar.bz2
+SRC_URI=https://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.10.tar.bz2
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=bfe2b1fba5d64ed73c71eee0a2197b8e
+_md5_=95e397f5719e17221dd423442042a1d8
diff --git a/metadata/md5-cache/media-video/motion-4.3.1 b/metadata/md5-cache/media-video/motion-4.3.1
new file mode 100644
index 000000000000..00f755c78462
--- /dev/null
+++ b/metadata/md5-cache/media-video/motion-4.3.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/motion acct-user/motion virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) net-libs/libmicrohttpd v4l? ( media-libs/libv4l virtual/os-headers )
+DESCRIPTION=A software motion detector
+EAPI=7
+HOMEPAGE=https://motion-project.github.io
+IUSE=ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/motion acct-user/motion virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.3.1.tar.gz -> motion-release-4.3.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=18dbb763f13ef5697ddda49aaf58eaa9
diff --git a/metadata/md5-cache/media-video/movit-1.2.0 b/metadata/md5-cache/media-video/movit-1.2.0
index f5e06d020edf..a9944bbea69f 100644
--- a/metadata/md5-cache/media-video/movit-1.2.0
+++ b/metadata/md5-cache/media-video/movit-1.2.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile test
 DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
-HOMEPAGE=http://movit.sesse.net/
+HOMEPAGE=https://movit.sesse.net/
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
 RESTRICT=test
 SLOT=0
-SRC_URI=http://movit.sesse.net/movit-1.2.0.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
-_md5_=7a61bc9ea34115f92d7eff2c657fe287
+SRC_URI=https://movit.sesse.net/movit-1.2.0.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
+_md5_=5e53a28c4b18dccf5fe61069fd1736ff
diff --git a/metadata/md5-cache/media-video/movit-1.6.1 b/metadata/md5-cache/media-video/movit-1.6.1
index 5befbe5cf612..e40ac4e74023 100644
--- a/metadata/md5-cache/media-video/movit-1.6.1
+++ b/metadata/md5-cache/media-video/movit-1.6.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile test
 DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
-HOMEPAGE=http://movit.sesse.net/
+HOMEPAGE=https://movit.sesse.net/
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 RESTRICT=test
 SLOT=0
-SRC_URI=http://movit.sesse.net/movit-1.6.1.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
+SRC_URI=https://movit.sesse.net/movit-1.6.1.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10dc7a1586ee74c3a57beb7e575acc91
+_md5_=c945e025614a08f346a1b7a80b0a0e78
diff --git a/metadata/md5-cache/media-video/movit-1.6.2 b/metadata/md5-cache/media-video/movit-1.6.2
index b45fa46d757e..aee84d5bac36 100644
--- a/metadata/md5-cache/media-video/movit-1.6.2
+++ b/metadata/md5-cache/media-video/movit-1.6.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile test
 DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
-HOMEPAGE=http://movit.sesse.net/
+HOMEPAGE=https://movit.sesse.net/
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 RESTRICT=test
 SLOT=0
-SRC_URI=http://movit.sesse.net/movit-1.6.2.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
+SRC_URI=https://movit.sesse.net/movit-1.6.2.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=220a28fe3e9ac7b3883d5e92b65de836
+_md5_=52b55e791a1940b49bc21a20bbfd6af8
diff --git a/metadata/md5-cache/media-video/rav1e-9999 b/metadata/md5-cache/media-video/rav1e-9999
index 90b7d9d3e564..0c41887aaea5 100644
--- a/metadata/md5-cache/media-video/rav1e-9999
+++ b/metadata/md5-cache/media-video/rav1e-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=capi? ( dev-util/cargo-c )
 RESTRICT=mirror
 SLOT=0
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=dcef4f09e0178984fa990322efb88115
diff --git a/metadata/md5-cache/media-video/smplayer-18.6.0 b/metadata/md5-cache/media-video/smplayer-18.6.0
deleted file mode 100644
index 94a9140a906e..000000000000
--- a/metadata/md5-cache/media-video/smplayer-18.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=6
-HOMEPAGE=https://www.smplayer.eu/
-IUSE=autoshutdown bidi debug mpris
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=GPL-2+ BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.15.0[libass,X] >=net-misc/youtube-dl-2014.11.26 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-18.6.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5360640a1dbdc9d272c42a3a9fe016d
diff --git a/metadata/md5-cache/media-video/smplayer-19.10.2 b/metadata/md5-cache/media-video/smplayer-19.10.2
deleted file mode 100644
index 63b0b68f7c6e..000000000000
--- a/metadata/md5-cache/media-video/smplayer-19.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-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/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=7
-HOMEPAGE=https://www.smplayer.eu/
-IUSE=autoshutdown bidi debug mpris
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=GPL-2+ BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mpv[libass,X] media-video/mplayer[bidi?,libass,png,X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-19.10.2.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=366853d37f7b918902c4313865c3baf6
diff --git a/metadata/md5-cache/media-video/smplayer-20.4.2 b/metadata/md5-cache/media-video/smplayer-20.4.2
index 0927313861df..3417920108d2 100644
--- a/metadata/md5-cache/media-video/smplayer-20.4.2
+++ b/metadata/md5-cache/media-video/smplayer-20.4.2
@@ -5,10 +5,10 @@ DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
 EAPI=7
 HOMEPAGE=https://www.smplayer.eu/
 IUSE=autoshutdown bidi debug mpris
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=GPL-2+ BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mpv[libass,X] media-video/mplayer[bidi?,libass,png,X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-20.4.2.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff95dedcf34755ef2e055e326f5a270e
+_md5_=3a6257afb583bd0ff5e1429960f7412a
diff --git a/metadata/md5-cache/media-video/ushare-1.1a-r9 b/metadata/md5-cache/media-video/ushare-1.1a-r9
index cfd9b8b361e8..3c6d6e468f14 100644
--- a/metadata/md5-cache/media-video/ushare-1.1a-r9
+++ b/metadata/md5-cache/media-video/ushare-1.1a-r9
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND==net-libs/libupnp-1.6*:0 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=uShare is a UPnP (TM) A/V & DLNA Media Server
 EAPI=5
-HOMEPAGE=http://ushare.geexbox.org/
+HOMEPAGE=https://ushare.geexbox.org/
 IUSE=nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND==net-libs/libupnp-1.6*:0
 SLOT=0
-SRC_URI=http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
+SRC_URI=https://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e6ffbad3647820841f2a472fb6022fa
+_md5_=b5a045cef8f923f9dd68d0c37c372b5a
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.5 b/metadata/md5-cache/media-video/v4l2loopback-0.12.5
new file mode 100644
index 000000000000..c132146db2f2
--- /dev/null
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=v4l2 loopback device which output is it's own input
+EAPI=7
+HOMEPAGE=https://github.com/umlaeute/v4l2loopback
+IUSE=examples kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=f81cfe4031d19815800f7cfa31e6eebf
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index 4425c995422c..2a028090dd24 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=v4l2 loopback device which output is it's own input
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/umlaeute/v4l2loopback
 IUSE=examples kernel_linux kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( virtual/modutils )
 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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53ba7d0f25a2986f2ef77bc8ffc3e8b9
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=f81cfe4031d19815800f7cfa31e6eebf
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 5df153b50e6c..3ee8763801cd 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
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 604c90d69fb7..667bd697e473 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
@@ -4,10 +4,10 @@ DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address
 EAPI=6
 HOMEPAGE=https://ee.lbl.gov/
 IUSE=selinux
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+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
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7d07f5176a4c5afb6a387516dcec7163
+_md5_=43355ea774e2a83b34689f4e15ce1cc9
diff --git a/metadata/md5-cache/net-analyzer/cnet-3.3.1 b/metadata/md5-cache/net-analyzer/cnet-3.3.1
index a8aa33cff893..4c69fd322545 100644
--- a/metadata/md5-cache/net-analyzer/cnet-3.3.1
+++ b/metadata/md5-cache/net-analyzer/cnet-3.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
 DEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 DESCRIPTION=Network simulation tool
 EAPI=5
-HOMEPAGE=http://www.csse.uwa.edu.au/cnet3/
+HOMEPAGE=https://www.csse.uwa.edu.au/cnet3/
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/cnet-3.3.1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c46271ecaeaf0407c461918fc320b1c
+_md5_=d699159c1ae17d8fde8f9d92824d8aa6
diff --git a/metadata/md5-cache/net-analyzer/cnet-3.3.4 b/metadata/md5-cache/net-analyzer/cnet-3.3.4
index dcafd6c57fcf..a2dbbd6fe277 100644
--- a/metadata/md5-cache/net-analyzer/cnet-3.3.4
+++ b/metadata/md5-cache/net-analyzer/cnet-3.3.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
 DEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 DESCRIPTION=Network simulation tool
 EAPI=6
-HOMEPAGE=http://www.csse.uwa.edu.au/cnet3/
+HOMEPAGE=https://www.csse.uwa.edu.au/cnet3/
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/cnet-3.3.4.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a3fadaa09ac66c94e5aacbef910b3b8
+_md5_=066d53fd9bcaa42a0b44f8289eb86048
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202 b/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202
new file mode 100644
index 000000000000..c32505f605b2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) =net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 dev-util/cppunit
+DESCRIPTION=gnuradio fosphor block (GPU spectrum display)
+EAPI=7
+HOMEPAGE=https://sdr.osmocom.org/trac/wiki/fosphor
+IUSE=glfw qt5 wxwidgets +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) =net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/osmocom/gr-fosphor/archive/fa6761afbf8c2658782e0c7fc5d51063679b7ae4.tar.gz -> gr-fosphor-0.0_p20191202.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f17dc5b10b002bfb2d8440ff4f31476
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20200131 b/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20200131
new file mode 100644
index 000000000000..aea101f9bbb2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20200131
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-libs/boost:= dev-libs/log4cpp media-libs/freetype =net-wireless/gnuradio-3.8*:0=[qt5,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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-lang/swig:0 dev-util/cppunit
+DESCRIPTION=gnuradio fosphor block (GPU spectrum display)
+EAPI=7
+HOMEPAGE=https://sdr.osmocom.org/trac/wiki/fosphor
+IUSE=glfw qt5 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-libs/boost:= dev-libs/log4cpp media-libs/freetype =net-wireless/gnuradio-3.8*:0=[qt5,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/osmocom/gr-fosphor/archive/defdd4aca6cd157ccc3b10ea16b5b4f552f34b96.tar.gz -> gr-fosphor-0.0_p20200131.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e86332183b5e728a4db9fee333438af0
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-9999 b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
index 8b6d918d8d25..ea85f64ad703 100644
--- a/metadata/md5-cache/net-analyzer/gr-fosphor-9999
+++ b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 dev-util/cppunit
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-libs/boost:= dev-libs/log4cpp media-libs/freetype =net-wireless/gnuradio-3.8*:0=[qt5,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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-lang/swig:0 dev-util/cppunit
 DESCRIPTION=gnuradio fosphor block (GPU spectrum display)
 EAPI=7
 HOMEPAGE=https://sdr.osmocom.org/trac/wiki/fosphor
-IUSE=glfw qt5 wxwidgets +python_single_target_python2_7
+IUSE=glfw qt5 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-libs/boost:= dev-libs/log4cpp media-libs/freetype =net-wireless/gnuradio-3.8*:0=[qt5,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40e44a457920f1546eedb2fa61297509
+_md5_=e86332183b5e728a4db9fee333438af0
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-9999 b/metadata/md5-cache/net-analyzer/iptraf-ng-9999
index 5dc61715abb3..60d42d65834c 100644
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-9999
+++ b/metadata/md5-cache/net-analyzer/iptraf-ng-9999
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7:0=
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ca4133afaade3069e44a30772a2cb027
+_md5_=cc43b2cff05e920c5592cf836b10278a
diff --git a/metadata/md5-cache/net-analyzer/p0f-3.09_beta b/metadata/md5-cache/net-analyzer/p0f-3.09_beta
index f69f5daf1363..3031bcb18cc5 100644
--- a/metadata/md5-cache/net-analyzer/p0f-3.09_beta
+++ b/metadata/md5-cache/net-analyzer/p0f-3.09_beta
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare
 DEPEND=net-libs/libpcap
 DESCRIPTION=A tool to perform passive OS detection based on SYN packets
 EAPI=6
-HOMEPAGE=http://lcamtuf.coredump.cx/p0f3/
+HOMEPAGE=https://lcamtuf.coredump.cx/p0f3/
 IUSE=debug ipv6
 KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libpcap
 SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/p0f3/releases/p0f-3.09b.tgz
+SRC_URI=https://lcamtuf.coredump.cx/p0f3/releases/p0f-3.09b.tgz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4512c5c7fba58166a3c321481b873c1a
+_md5_=00dd267a4865aacc36cf6ec4ae891f47
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.4.0 b/metadata/md5-cache/net-analyzer/sarg-2.4.0
index 78dc07a7a594..12f153052eca 100644
--- a/metadata/md5-cache/net-analyzer/sarg-2.4.0
+++ b/metadata/md5-cache/net-analyzer/sarg-2.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Squid Analysis Report Generator
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/sarg/
 IUSE=bzip2 doublecheck +gd +glob ldap lzma pcre zlib
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) lzma? ( app-arch/xz-utils ) pcre? ( dev-libs/libpcre ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/sarg/sarg-2.4.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=67fdf4332e99c08b0679df677f810ce3
+_md5_=f552e4af14add769843b6516ae825eb0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.30 b/metadata/md5-cache/net-analyzer/zabbix-3.0.30
deleted file mode 100644
index ea2d60f8bcdd..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.30
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=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] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=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] ) xmpp? ( dev-libs/iksemel ) 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=mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/3.0.30/zabbix-3.0.30.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=3846a5c1f4574fc346af8955201dbab0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.31 b/metadata/md5-cache/net-analyzer/zabbix-3.0.31
index 6bcbe2ed190f..575504067fda 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.31
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.31
@@ -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 xmpp 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] ) xmpp? ( dev-libs/iksemel ) 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/stable/3.0.31/zabbix-3.0.31.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=f9b9f5ddd0a6154213de0cb749a6e4f4
+_md5_=d524ec430874a01c4f74afe64143f8e5
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.19 b/metadata/md5-cache/net-analyzer/zabbix-4.0.19
deleted file mode 100644
index 6bbc38ef5f57..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=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] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=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] ) xmpp? ( dev-libs/iksemel ) 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=mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/4.0.19/zabbix-4.0.19.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a53711629207ce72da0e95082bbf1755
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.20 b/metadata/md5-cache/net-analyzer/zabbix-4.0.20
index e247889dd11d..3bd5b4191365 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.20
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.20
@@ -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 xmpp 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] ) xmpp? ( dev-libs/iksemel ) 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/stable/4.0.20/zabbix-4.0.20.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=01f821971c2db66e09ea9b1af4d03f0d
+_md5_=aaa500d5725428b2a6969f01fcaea710
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.4.7 b/metadata/md5-cache/net-analyzer/zabbix-4.4.7
deleted file mode 100644
index 182de087c7e4..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=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] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-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
-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=mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=040ee2da68df059cfbd0ad46e48ea263
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.4.8 b/metadata/md5-cache/net-analyzer/zabbix-4.4.8
index 517a4691d7ff..b345db908480 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.4.8
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.4.8
@@ -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/stable/4.4.8/zabbix-4.4.8.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9498cb20720e634633ab42a0bcbf435f
+_md5_=a5258b41a5f866295f84e5bce914d1bc
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 3eb4e04009fe..bde81ee2a57b 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3 b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
index 5498fc8a69b7..34a8acbb0ee1 100644
--- a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
+++ b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI dev-lang/perl
 DESCRIPTION=Dialup alphapaging software
 EAPI=6
-HOMEPAGE=http://www.sendpage.org/
+HOMEPAGE=https://www.sendpage.org/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI dev-lang/perl:=
 SLOT=0
-SRC_URI=http://www.sendpage.org/download/sendpage-1.001.tar.gz
+SRC_URI=https://www.sendpage.org/download/sendpage-1.001.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b7c018852f86c61501c8aac1a57e94a
+_md5_=34d2f3bbedaca7f7bdbc5974dfb0fafe
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 078383d66712..d914b827f11e 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1 b/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
index 7fc303a3b1c4..c289610835a0 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=5
-HOMEPAGE=http://www.opendnssec.org/
+HOMEPAGE=https://www.opendnssec.org/
 IUSE=-auditor +curl debug doc eppclient mysql +signer +sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -10,6 +10,6 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns curl? ( ne
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.18.tar.gz
+SRC_URI=https://www.opendnssec.org/files/source/opendnssec-1.3.18.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=b6aaf0adc83e8fc03acb0a60f3493540
+_md5_=e7adefbd5a99c30dc1b7bf06a24ae8c8
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1 b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
index 524978a0e61f..772759dd2661 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=5
-HOMEPAGE=http://www.opendnssec.org/
+HOMEPAGE=https://www.opendnssec.org/
 IUSE=debug doc +mysql +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -10,6 +10,6 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( v
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.4.12.tar.gz
+SRC_URI=https://www.opendnssec.org/files/source/opendnssec-1.4.12.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4ddcab9b5367cd289038b2eb2283cbb
+_md5_=c9a1b014327de12b0fbcef3a4b307401
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.8.2 b/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
index 5cfce8d5cd90..4c78f6a29362 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=5
-HOMEPAGE=http://www.opendnssec.org/
+HOMEPAGE=https://www.opendnssec.org/
 IUSE=debug doc +mysql +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -10,6 +10,6 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( v
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.4.8.2.tar.gz
+SRC_URI=https://www.opendnssec.org/files/source/opendnssec-1.4.8.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=078d9a9d67fd3215d5d365dc337b8139
+_md5_=7d7bb0907d1fdaed757f5c4108a2137b
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
index 272c81bfac85..bc8b9db0957c 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=5
-HOMEPAGE=http://www.opendnssec.org/
+HOMEPAGE=https://www.opendnssec.org/
 IUSE=debug doc +mysql readline +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -10,6 +10,6 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( v
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.opendnssec.org/files/source/opendnssec-2.0.1.tar.gz
+SRC_URI=https://www.opendnssec.org/files/source/opendnssec-2.0.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df94060f5c8512858807f440a28932bd
+_md5_=25f674035c060ea9da61416ede107617
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
index 1c67fd2943ae..33357147a99d 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang )
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=7
-HOMEPAGE=http://www.opendnssec.org/
+HOMEPAGE=https://www.opendnssec.org/
 IUSE=debug doc +mysql readline +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -11,6 +11,6 @@ RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( d
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.opendnssec.org/files/source/opendnssec-2.0.3.tar.gz
+SRC_URI=https://www.opendnssec.org/files/source/opendnssec-2.0.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=6977db72737cfa8146c471658c4b1319
+_md5_=7cd2f1b50a3e68f3347cc07f93d404b1
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 4530dfed8ea8..97c43a1dd2c3 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/uftpd-2.11 b/metadata/md5-cache/net-ftp/uftpd-2.12
similarity index 94%
rename from metadata/md5-cache/net-ftp/uftpd-2.11
rename to metadata/md5-cache/net-ftp/uftpd-2.12
index c2aa6330d657..acbc4727ce63 100644
--- a/metadata/md5-cache/net-ftp/uftpd-2.11
+++ b/metadata/md5-cache/net-ftp/uftpd-2.12
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libite-1.5 >=dev-libs/libuev-2.2 !net-misc/uftp !net-ftp/atftp
 SLOT=0
-SRC_URI=https://github.com/troglobit/uftpd/releases/download/v2.11/uftpd-2.11.tar.xz
+SRC_URI=https://github.com/troglobit/uftpd/releases/download/v2.12/uftpd-2.12.tar.xz
 _md5_=b0b6ed1fd9ffb917892fdf9ab159e576
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 910161a644db..612750d17974 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76 b/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76
new file mode 100644
index 000000000000..d693ca58d22b
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.60.0.76
@@ -0,0 +1,16 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=7
+HOMEPAGE=https://www.skype.com/
+IUSE=kernel_linux abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.60.0.76-1.x86_64.rpm
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
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 b9f03f9163a2..af94c3dfafd6 100644
--- a/metadata/md5-cache/net-im/teams-1.3.00.5153
+++ b/metadata/md5-cache/net-im/teams-1.3.00.5153
@@ -9,4 +9,4 @@ 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
-_md5_=66ad967e4c072cb98387364dccb2b924
+_md5_=b7410f0c2a3cec27c0b8cebe558bcc0c
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.1.0 b/metadata/md5-cache/net-im/telegram-desktop-2.1.0
index 22eda4bcd518..4922111d7ae5 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.1.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( alsa pulseaudio ) || ( X wayland ) spell? ( ^^ ( enchant hunsp
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.1.0/tdesktop-2.1.0-full.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ca2b70ad771bc5c27faf9cbf63e43b8
+_md5_=2ccfab5ac3af5ef937b2d66820059108
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.1.8 b/metadata/md5-cache/net-im/telegram-desktop-2.1.8
new file mode 100644
index 000000000000..27e35db837fe
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.8
@@ -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-cpp/range-v3 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 dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio )
+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-cpp/range-v3 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 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.8/tdesktop-2.1.8-full.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=233187cbaf8d6e063200d4b1514a10f8
diff --git a/metadata/md5-cache/net-im/zoom-5.0.408598.0517 b/metadata/md5-cache/net-im/zoom-5.0.418682.0603
similarity index 84%
rename from metadata/md5-cache/net-im/zoom-5.0.408598.0517
rename to metadata/md5-cache/net-im/zoom-5.0.418682.0603
index 59791ca4a900..466097f5e0aa 100644
--- a/metadata/md5-cache/net-im/zoom-5.0.408598.0517
+++ b/metadata/md5-cache/net-im/zoom-5.0.418682.0603
@@ -9,6 +9,6 @@ LICENSE=all-rights-reserved Apache-2.0
 RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 amd64? ( dev-qt/qtdeclarative:5[widgets] ) x86? ( dev-qt/qtdeclarative:5 ) dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=amd64? ( https://zoom.us/client/5.0.408598.0517/zoom_x86_64.tar.xz -> zoom-5.0.408598.0517_x86_64.tar.xz ) x86? ( https://zoom.us/client/5.0.408598.0517/zoom_i686.tar.xz -> zoom-5.0.408598.0517_i686.tar.xz )
+SRC_URI=amd64? ( https://zoom.us/client/5.0.418682.0603/zoom_x86_64.tar.xz -> zoom-5.0.418682.0603_x86_64.tar.xz ) x86? ( https://zoom.us/client/5.0.418682.0603/zoom_i686.tar.xz -> zoom-5.0.418682.0603_i686.tar.xz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9029a946350fbb05f1ca103030e9b089
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index d93180056911..879cf6294498 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/ngircd-25 b/metadata/md5-cache/net-irc/ngircd-25
index fc9d2bbf6745..30e5f08c1e20 100644
--- a/metadata/md5-cache/net-irc/ngircd-25
+++ b/metadata/md5-cache/net-irc/ngircd-25
@@ -5,11 +5,11 @@ DESCRIPTION=An IRC server written from scratch
 EAPI=7
 HOMEPAGE=https://ngircd.barton.de/
 IUSE=debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib
-KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm64 x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-25.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=cee55e6815cd385186d80bff8bb190a0
+_md5_=98f05034809193a3e983e4d4bd2c7e36
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.5.1 b/metadata/md5-cache/net-irc/unrealircd-5.0.5.1
new file mode 100644
index 000000000000..7db1747e7744
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-5.0.5.1
@@ -0,0 +1,14 @@
+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.5.1.tar.gz
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=dc62ddbf4932e654dc3a2323a45bb3a6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 2260f4128284..c0e7cfad22b4 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.62.3 b/metadata/md5-cache/net-libs/glib-networking-2.62.3
index 2dc24e071558..c98d77e98ef5 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.62.3
+++ b/metadata/md5-cache/net-libs/glib-networking-2.62.3
@@ -5,11 +5,11 @@ DESCRIPTION=Network-related giomodules for glib
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 IUSE=+gnome +libproxy +ssl 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 ~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=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.60.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(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.4.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(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.62/glib-networking-2.62.3.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7edc9730b3cf948323cd78123df47d3e
+_md5_=ddc52b1d29ce8c379aa5c3f642f74259
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.13 b/metadata/md5-cache/net-libs/gnutls-3.6.13-r1
similarity index 99%
rename from metadata/md5-cache/net-libs/gnutls-3.6.13
rename to metadata/md5-cache/net-libs/gnutls-3.6.13-r1
index a4561b97dc7b..ea9e06c29abe 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.6.13
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.13-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.13.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=dd8480fe294f2315899e75d6894a5f25
+_md5_=72b37956967e112ce3c4d14d4bf9b377
diff --git a/metadata/md5-cache/net-libs/libcork-0.15.0 b/metadata/md5-cache/net-libs/libcork-0.15.0
deleted file mode 100644
index a5849bbe2893..000000000000
--- a/metadata/md5-cache/net-libs/libcork-0.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/check virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A simple, easily embeddable cross-platform C library
-EAPI=6
-HOMEPAGE=https://github.com/dcreager/libcork
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/check
-SLOT=0
-SRC_URI=https://github.com/dcreager/libcork/archive/0.15.0.tar.gz -> libcork-0.15.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb5accd735be2321fd0cfc8c76ea7e2d
diff --git a/metadata/md5-cache/net-libs/libcork-0.15.0-r1 b/metadata/md5-cache/net-libs/libcork-0.15.0-r1
new file mode 100644
index 000000000000..0c03c6ee10f4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libcork-0.15.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/check virtual/pkgconfig
+DESCRIPTION=A simple, easily embeddable cross-platform C library
+EAPI=7
+HOMEPAGE=https://github.com/dcreager/libcork
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/check
+SLOT=0
+SRC_URI=https://github.com/dcreager/libcork/archive/0.15.0.tar.gz -> libcork-0.15.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a3e0774071227f134c464f381a7c0880
diff --git a/metadata/md5-cache/net-libs/libmrss-0.19.2 b/metadata/md5-cache/net-libs/libmrss-0.19.2
index c5571b753596..78779fcf1c9c 100644
--- a/metadata/md5-cache/net-libs/libmrss-0.19.2
+++ b/metadata/md5-cache/net-libs/libmrss-0.19.2
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install
 DEPEND=net-libs/libnxml net-misc/curl
 DESCRIPTION=A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams
 EAPI=7
-HOMEPAGE=http://www.autistici.org/bakunin/libmrss/doc/
+HOMEPAGE=https://www.autistici.org/bakunin/libmrss/doc/
 IUSE=doc examples
 KEYWORDS=amd64 ~arm ~mips ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libnxml net-misc/curl
 SLOT=0
-SRC_URI=http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
-_md5_=f4bce901d633bb19b2e25af669e4c351
+SRC_URI=https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
+_md5_=f1a04a82128132346151b6aa26ac8166
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 40dd6770dd83..dd571e832970 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
 EAPI=6
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
 IUSE=static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc x86
 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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=57b9104439d2601e67955cb59ca4ad5b
+_md5_=d969c258b9b4b7b32ccd290eca19fc4a
diff --git a/metadata/md5-cache/net-libs/libnxml-0.18.3 b/metadata/md5-cache/net-libs/libnxml-0.18.3
index c94c78bad470..038164360bb9 100644
--- a/metadata/md5-cache/net-libs/libnxml-0.18.3
+++ b/metadata/md5-cache/net-libs/libnxml-0.18.3
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install
 DEPEND=net-misc/curl
 DESCRIPTION=A C-library for parsing and writing XML 1.0/1.1 files or streams
 EAPI=7
-HOMEPAGE=http://www.autistici.org/bakunin/libnxml/doc/
+HOMEPAGE=https://www.autistici.org/bakunin/libnxml/doc/
 IUSE=doc examples
 KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-misc/curl
 SLOT=0
-SRC_URI=http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
-_md5_=7b4eebc41ea90bf9617e3468720c3996
+SRC_URI=https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
+_md5_=1f0e2885e015aefb1ea80f62e0273582
diff --git a/metadata/md5-cache/net-libs/libsoup-2.70.0 b/metadata/md5-cache/net-libs/libsoup-2.70.0
index 181aef404625..7f8e7e70b2bd 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.70.0
+++ b/metadata/md5-cache/net-libs/libsoup-2.70.0
@@ -5,7 +5,7 @@ DESCRIPTION=HTTP client/server library for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
 IUSE=brotli gssapi gtk-doc +introspection samba ssl 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 ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=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(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-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(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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 gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.70/libsoup-2.70.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f0a03b96fe8dec4738cd8765fbdc88f
+_md5_=899c4af2d8ff4afd9eb4b2c779ce6d8c
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.41.0 b/metadata/md5-cache/net-libs/nghttp2-1.41.0
new file mode 100644
index 000000000000..e354760b1247
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.41.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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.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-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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
+LICENSE=MIT
+RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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.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-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.41.0/nghttp2-1.41.0.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=21fdd8f7ab42996de8bd2c4983d8341c
diff --git a/metadata/md5-cache/net-libs/nodejs-14.4.0 b/metadata/md5-cache/net-libs/nodejs-14.4.0
new file mode 100644
index 000000000000..0b4843ef0b93
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-14.4.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.37.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-65:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl +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.37.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-65:= ) 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/v14.4.0/node-v14.4.0.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c8d9a95fead3194891860277a0109cd
diff --git a/metadata/md5-cache/net-libs/onion-0.8 b/metadata/md5-cache/net-libs/onion-0.8
index c9da9bb1f117..bdf4a827f851 100644
--- a/metadata/md5-cache/net-libs/onion-0.8
+++ b/metadata/md5-cache/net-libs/onion-0.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= x11-libs/cairo ) jpeg? ( virtual/jpeg:0 ) xml? ( dev-libs/libxml2:2 sys-libs/zlib ) systemd? ( sys-apps/systemd ) sqlite? ( dev-db/sqlite:3 ) boehm-gc? ( dev-libs/boehm-gc ) libev? ( dev-libs/libev ) !libev? ( libevent? ( dev-libs/libevent ) ) redis? ( dev-libs/hiredis ) test? ( net-misc/curl ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=C library to create simple HTTP servers and Web Applications
 EAPI=5
-HOMEPAGE=http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion
+HOMEPAGE=https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion
 IUSE=gnutls pam png jpeg xml systemd sqlite boehm-gc test examples cxx -libev -libevent redis
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2+ Apache-2.0 ) AGPL-3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidmoreno/onion/archive/v0.8.tar.gz -> onion-0.8.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ade65d7de98d6666e7ea20e8742cb771
+_md5_=920ec59b23f19f7fbf8fdf1dffd92158
diff --git a/metadata/md5-cache/net-libs/onion-9999 b/metadata/md5-cache/net-libs/onion-9999
index cdb6d0b6f922..e4cfdaa6440d 100644
--- a/metadata/md5-cache/net-libs/onion-9999
+++ b/metadata/md5-cache/net-libs/onion-9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= x11-libs/cairo ) jpeg? ( virtual/jpeg:0 ) xml? ( dev-libs/libxml2:2 sys-libs/zlib ) systemd? ( sys-apps/systemd ) sqlite? ( dev-db/sqlite:3 ) boehm-gc? ( dev-libs/boehm-gc ) libev? ( dev-libs/libev ) !libev? ( libevent? ( dev-libs/libevent ) ) redis? ( dev-libs/hiredis ) test? ( net-misc/curl ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=C library to create simple HTTP servers and Web Applications
 EAPI=5
-HOMEPAGE=http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion
+HOMEPAGE=https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion
 IUSE=gnutls pam png jpeg xml systemd sqlite boehm-gc test examples cxx -libev -libevent redis
 LICENSE=|| ( GPL-2+ Apache-2.0 ) AGPL-3
 PROPERTIES=live
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( examples )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e50371cfb7c86aed7351294b9fa02a3
+_md5_=788cf815e9485684c53e27666d821fc3
diff --git a/metadata/md5-cache/net-libs/quiche-0.1.0-r1 b/metadata/md5-cache/net-libs/quiche-0.1.0-r1
index 4073bbedc97d..8b3ae2ea739f 100644
--- a/metadata/md5-cache/net-libs/quiche-0.1.0-r1
+++ b/metadata/md5-cache/net-libs/quiche-0.1.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.38/download -> backtrace-0.3.38.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/bumpalo/2.6.0/download -> bumpalo-2.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cast/0.2.2/download -> cast-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.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/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/criterion/0.3.0/download -> criterion-0.3.0.crate https://crates.io/api/v1/crates/criterion-plot/0.4.0/download -> criterion-plot-0.4.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.1/download -> crossbeam-deque-0.7.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.7.2/download -> crossbeam-epoch-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/csv/1.1.1/download -> csv-1.1.1.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/docopt/1.1.0/download -> docopt-1.1.0.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itertools/0.8.0/download -> itertools-0.8.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/js-sys/0.3.28/download -> js-sys-0.3.28.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.1/download -> memoffset-0.5.1.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.4/download -> proc-macro2-1.0.4.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.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_os/0.2.2/download -> rand_os-0.2.2.crate https://crates.io/api/v1/crates/rand_xoshiro/0.3.1/download -> rand_xoshiro-0.3.1.crate https://crates.io/api/v1/crates/rayon/1.2.0/download -> rayon-1.2.0.crate https://crates.io/api/v1/crates/rayon-core/1.6.0/download -> rayon-core-1.6.0.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/ring/0.16.9/download -> ring-0.16.9.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/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/sourcefile/0.1.4/download -> sourcefile-0.1.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.9.2/download -> strsim-0.9.2.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/tinytemplate/1.0.2/download -> tinytemplate-1.0.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/untrusted/0.7.0/download -> untrusted-0.7.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.51/download -> wasm-bindgen-0.2.51.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.51/download -> wasm-bindgen-backend-0.2.51.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.51/download -> wasm-bindgen-macro-0.2.51.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.51/download -> wasm-bindgen-macro-support-0.2.51.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.51/download -> wasm-bindgen-shared-0.2.51.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.51/download -> wasm-bindgen-webidl-0.2.51.crate https://crates.io/api/v1/crates/web-sys/0.3.28/download -> web-sys-0.3.28.crate https://crates.io/api/v1/crates/weedle/0.10.0/download -> weedle-0.10.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.1.0/download -> quiche-0.1.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03fbcf5fbf93e3c5a1825b3b33df41dd
diff --git a/metadata/md5-cache/net-libs/quiche-0.1.0_alpha4_p20190912 b/metadata/md5-cache/net-libs/quiche-0.1.0_alpha4_p20190912
index 2fa746d71fa4..c03690a680d2 100644
--- a/metadata/md5-cache/net-libs/quiche-0.1.0_alpha4_p20190912
+++ b/metadata/md5-cache/net-libs/quiche-0.1.0_alpha4_p20190912
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://github.com/cloudflare/quiche/archive/89d0317ffb5b12080a41aea2743272aac887eecd.tar.gz -> quiche-0.1.0_alpha4_p20190912.tar.gz https://github.com/google/boringssl/archive/f18bd55240b229a65df48e7905da98fff18cbf59.tar.gz -> boringssl-f18bd55240b229a65df48e7905da98fff18cbf59.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/bumpalo/2.6.0/download -> bumpalo-2.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cast/0.2.2/download -> cast-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/criterion/0.3.0/download -> criterion-0.3.0.crate https://crates.io/api/v1/crates/criterion-plot/0.4.0/download -> criterion-plot-0.4.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.1/download -> crossbeam-deque-0.7.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.7.2/download -> crossbeam-epoch-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/csv/1.1.1/download -> csv-1.1.1.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/docopt/1.1.0/download -> docopt-1.1.0.crate https://crates.io/api/v1/crates/either/1.5.2/download -> either-1.5.2.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itertools/0.8.0/download -> itertools-0.8.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/js-sys/0.3.27/download -> js-sys-0.3.27.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.1/download -> memoffset-0.5.1.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.3/download -> proc-macro2-1.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.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_os/0.2.2/download -> rand_os-0.2.2.crate https://crates.io/api/v1/crates/rand_xoshiro/0.3.1/download -> rand_xoshiro-0.3.1.crate https://crates.io/api/v1/crates/rayon/1.2.0/download -> rayon-1.2.0.crate https://crates.io/api/v1/crates/rayon-core/1.6.0/download -> rayon-core-1.6.0.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/ring/0.16.9/download -> ring-0.16.9.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/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.100/download -> serde-1.0.100.crate https://crates.io/api/v1/crates/serde_derive/1.0.100/download -> serde_derive-1.0.100.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/sourcefile/0.1.4/download -> sourcefile-0.1.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.9.2/download -> strsim-0.9.2.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/tinytemplate/1.0.2/download -> tinytemplate-1.0.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/untrusted/0.7.0/download -> untrusted-0.7.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.50/download -> wasm-bindgen-0.2.50.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.50/download -> wasm-bindgen-backend-0.2.50.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.50/download -> wasm-bindgen-macro-0.2.50.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.50/download -> wasm-bindgen-macro-support-0.2.50.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.50/download -> wasm-bindgen-shared-0.2.50.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.50/download -> wasm-bindgen-webidl-0.2.50.crate https://crates.io/api/v1/crates/web-sys/0.3.27/download -> web-sys-0.3.27.crate https://crates.io/api/v1/crates/weedle/0.10.0/download -> weedle-0.10.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=39c4c39c514b10b25ac0ec49977266ef
diff --git a/metadata/md5-cache/net-libs/quiche-0.2.0 b/metadata/md5-cache/net-libs/quiche-0.2.0
index c2155b5bb678..9be7b0a0a5a9 100644
--- a/metadata/md5-cache/net-libs/quiche-0.2.0
+++ b/metadata/md5-cache/net-libs/quiche-0.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/bumpalo/3.1.2/download -> bumpalo-3.1.2.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.49/download -> cc-1.0.49.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/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/criterion/0.3.0/download -> criterion-0.3.0.crate https://crates.io/api/v1/crates/criterion-plot/0.4.0/download -> criterion-plot-0.4.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/csv/1.1.2/download -> csv-1.1.2.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/docopt/1.1.0/download -> docopt-1.1.0.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.6/download -> hermit-abi-0.1.6.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/js-sys/0.3.35/download -> js-sys-0.3.35.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.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/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-traits/0.2.10/download -> num-traits-0.2.10.crate https://crates.io/api/v1/crates/num_cpus/1.11.1/download -> num_cpus-1.11.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.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_os/0.2.2/download -> rand_os-0.2.2.crate https://crates.io/api/v1/crates/rand_xoshiro/0.3.1/download -> rand_xoshiro-0.3.1.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/ring/0.16.9/download -> ring-0.16.9.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/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.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/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.1.0/download -> smallvec-1.1.0.crate https://crates.io/api/v1/crates/sourcefile/0.1.4/download -> sourcefile-0.1.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.13/download -> syn-1.0.13.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.11/download -> unicode-normalization-0.1.11.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.1.0/download -> unicode-xid-0.1.0.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/untrusted/0.7.0/download -> untrusted-0.7.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.58/download -> wasm-bindgen-0.2.58.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.58/download -> wasm-bindgen-backend-0.2.58.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.58/download -> wasm-bindgen-macro-0.2.58.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.58/download -> wasm-bindgen-macro-support-0.2.58.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.58/download -> wasm-bindgen-shared-0.2.58.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.58/download -> wasm-bindgen-webidl-0.2.58.crate https://crates.io/api/v1/crates/web-sys/0.3.35/download -> web-sys-0.3.35.crate https://crates.io/api/v1/crates/weedle/0.10.0/download -> weedle-0.10.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.2.0/download -> quiche-0.2.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=395439bd6281f34ab12393e4d92468d4
diff --git a/metadata/md5-cache/net-libs/quiche-0.3.0 b/metadata/md5-cache/net-libs/quiche-0.3.0
index 76fb04b079dd..16ba2521d840 100644
--- a/metadata/md5-cache/net-libs/quiche-0.3.0
+++ b/metadata/md5-cache/net-libs/quiche-0.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.2.0/download -> bumpalo-3.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/js-sys/0.3.36/download -> js-sys-0.3.36.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.67/download -> libc-0.2.67.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/ring/0.16.11/download -> ring-0.16.11.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.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/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/syn/1.0.16/download -> syn-1.0.16.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/untrusted/0.7.0/download -> untrusted-0.7.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.59/download -> wasm-bindgen-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.59/download -> wasm-bindgen-backend-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.59/download -> wasm-bindgen-macro-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.59/download -> wasm-bindgen-macro-support-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.59/download -> wasm-bindgen-shared-0.2.59.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.59/download -> wasm-bindgen-webidl-0.2.59.crate https://crates.io/api/v1/crates/web-sys/0.3.36/download -> web-sys-0.3.36.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.3.0/download -> quiche-0.3.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8dd4abea3d10fbf683a927ee4bf6ee42
diff --git a/metadata/md5-cache/net-libs/quiche-0.4.0 b/metadata/md5-cache/net-libs/quiche-0.4.0
index 3eb3e69c69b2..891418d709af 100644
--- a/metadata/md5-cache/net-libs/quiche-0.4.0
+++ b/metadata/md5-cache/net-libs/quiche-0.4.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.3.0/download -> bumpalo-3.3.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.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/cmake/0.1.43/download -> cmake-0.1.43.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/js-sys/0.3.39/download -> js-sys-0.3.39.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/once_cell/1.4.0/download -> once_cell-1.4.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/qlog/0.2.0/download -> qlog-0.2.0.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/ring/0.16.13/download -> ring-0.16.13.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/serde_with/1.4.0/download -> serde_with-1.4.0.crate https://crates.io/api/v1/crates/serde_with_macros/1.1.0/download -> serde_with_macros-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.62/download -> wasm-bindgen-0.2.62.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.62/download -> wasm-bindgen-backend-0.2.62.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.62/download -> wasm-bindgen-macro-0.2.62.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.62/download -> wasm-bindgen-macro-support-0.2.62.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.62/download -> wasm-bindgen-shared-0.2.62.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.62/download -> wasm-bindgen-webidl-0.2.62.crate https://crates.io/api/v1/crates/web-sys/0.3.39/download -> web-sys-0.3.39.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.4.0/download -> quiche-0.4.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fbfbf3d6f4c6ccc45326f6406432dfc
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index 7edfc25155cb..8ee8befe3d26 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -7,5 +7,5 @@ IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 PROPERTIES=live
 SLOT=0/0
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fbfbf3d6f4c6ccc45326f6406432dfc
diff --git a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2 b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
deleted file mode 100644
index 2a6de1cdd6c5..000000000000
--- a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework
-EAPI=6
-HOMEPAGE=https://github.com/qxmpp-project/qxmpp/
-IUSE=debug doc opus +speex test theora vpx
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v0.9.3.tar.gz -> qxmpp-0.9.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=8950d0aa19a63eb6e422914c1c96e46d
diff --git a/metadata/md5-cache/net-libs/qxmpp-1.2.0 b/metadata/md5-cache/net-libs/qxmpp-1.2.0
index 51876e9c9c9d..25f1a3cade52 100644
--- a/metadata/md5-cache/net-libs/qxmpp-1.2.0
+++ b/metadata/md5-cache/net-libs/qxmpp-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework
 EAPI=7
 HOMEPAGE=https://github.com/qxmpp-project/qxmpp/
 IUSE=debug doc opus +speex test theora vpx
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v1.2.0.tar.gz -> qxmpp-1.2.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbedbbf949de4d8924daaeb2761572a4
+_md5_=dcb7637a5418b28991d6a9d24f20b1e2
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.28.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.28.2
index 8a6ee0bd1d4b..624b1f9d5bfc 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.28.2
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.28.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X test
-KEYWORDS=amd64 arm64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~sparc x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.28.2.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cb08c2485aa3f4a15512fd3380a3b3e
+_md5_=8831186299fc8fe7e1468e0b75862deb
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index a48071a3039b..910506b6c749 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/smtptools-0.2.3 b/metadata/md5-cache/net-mail/smtptools-0.2.3
index b3e7127d73ff..472c26f1a852 100644
--- a/metadata/md5-cache/net-mail/smtptools-0.2.3
+++ b/metadata/md5-cache/net-mail/smtptools-0.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=prepare
 DEPEND=!net-mail/qtools >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 collection of tools to send or receive mails with SMTP
 EAPI=4
-HOMEPAGE=http://www.ohse.de/uwe/software/smtptools.html
+HOMEPAGE=https://www.ohse.de/uwe/software/smtptools.html
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86
 LICENSE=GPL-2
 RDEPEND=!net-mail/qtools
 SLOT=0
 SRC_URI=ftp://ftp.ohse.de/uwe/releases/smtptools-0.2.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66c22f735fa3adba42c35930f1de74e5
+_md5_=934f73e6dd88e5149647ef22d6e10b10
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index bc95034a777d..2574737df1f4 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/axel-2.17.8 b/metadata/md5-cache/net-misc/axel-2.17.8
index d91ee370da68..ec52ca9d85ba 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.8
+++ b/metadata/md5-cache/net-misc/axel-2.17.8
@@ -5,10 +5,10 @@ DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
 IUSE=debug libressl nls ssl
-KEYWORDS=~amd64 ~hppa ~ppc ppc64 sparc ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.8/axel-2.17.8.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=59e33c8c6ab72ca0ef84652cf1724cdd
+_md5_=6967dd44b71dd475dbe2266a9bb4076e
diff --git a/metadata/md5-cache/net-misc/dropbox-97.4.467 b/metadata/md5-cache/net-misc/dropbox-97.4.467
deleted file mode 100644
index 61ea8e29c9fa..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-97.4.467
+++ /dev/null
@@ -1,15 +0,0 @@
-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-97.4.467.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-97.4.467.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=692e69f8e621f7def1fb24896301ce69
diff --git a/metadata/md5-cache/net-misc/dropbox-98.4.158 b/metadata/md5-cache/net-misc/dropbox-98.4.158
index 41220c253d9a..b1beb30f1665 100644
--- a/metadata/md5-cache/net-misc/dropbox-98.4.158
+++ b/metadata/md5-cache/net-misc/dropbox-98.4.158
@@ -5,11 +5,11 @@ 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
+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-98.4.158.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-98.4.158.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2af051a87d6d9d6d2a797b4fab1582ae
+_md5_=692e69f8e621f7def1fb24896301ce69
diff --git a/metadata/md5-cache/net-misc/gerbera-1.5.0 b/metadata/md5-cache/net-misc/gerbera-1.5.0
deleted file mode 100644
index d37d8ea9c786..000000000000
--- a/metadata/md5-cache/net-misc/gerbera-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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
-DESCRIPTION=UPnP Media Server
-EAPI=7
-HOMEPAGE=https://gerbera.io
-IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib kernel_linux
-KEYWORDS=~amd64 ~x86
-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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b440ff6552aac164e41780d33fde1e7
diff --git a/metadata/md5-cache/net-misc/gerbera-1.5.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.5.0-r1
new file mode 100644
index 000000000000..3c3f8e1e6951
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gerbera-1.5.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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
+DESCRIPTION=UPnP Media Server
+EAPI=7
+HOMEPAGE=https://gerbera.io
+IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib kernel_linux
+KEYWORDS=~amd64 ~x86
+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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0aa85bc9b4ad5098b82e7f0513b4e64a
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index 8e7bd15f6abd..777ea3ded3ca 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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
+DEPEND=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
 DESCRIPTION=UPnP Media Server
 EAPI=7
 HOMEPAGE=https://gerbera.io
 IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib kernel_linux
 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
+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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f3a87d6ccc690490c3a48fc6679681b
+_md5_=14b86280452e125fe2fc62a0c69d7a96
diff --git a/metadata/md5-cache/net-misc/mikutter-3.8.6 b/metadata/md5-cache/net-misc/mikutter-3.8.6
index 6f993599a419..bf8a3aeacab0 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.8.6
+++ b/metadata/md5-cache/net-misc/mikutter-3.8.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst prepare setup test unpa
 DEPEND=test? ( ruby_targets_ruby24? ( <dev-ruby/addressable-2.6[ruby_targets_ruby24(-)] dev-ruby/delayer[ruby_targets_ruby24(-)] >=dev-ruby/delayer-deferred-2.0[ruby_targets_ruby24(-)] >=dev-ruby/diva-0.3.2[ruby_targets_ruby24(-)] dev-ruby/httpclient[ruby_targets_ruby24(-)] dev-ruby/json:0[ruby_targets_ruby24(-)] dev-ruby/instance_storage[ruby_targets_ruby24(-)] dev-ruby/memoist[ruby_targets_ruby24(-)] dev-ruby/moneta[ruby_targets_ruby24(-)] dev-ruby/nokogiri[ruby_targets_ruby24(-)] >=dev-ruby/oauth-0.5.1[ruby_targets_ruby24(-)] >=dev-ruby/pluggaloid-1.1.1[ruby_targets_ruby24(-)] dev-ruby/rcairo[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gettext-3.2.9[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gtk2-3.3.0[ruby_targets_ruby24(-)] >dev-ruby/ruby-hmac-0.4[ruby_targets_ruby24(-)] dev-ruby/totoridipjp[ruby_targets_ruby24(-)] dev-ruby/twitter-text:=[ruby_targets_ruby24(-)] >dev-ruby/typed-array-0.1[ruby_targets_ruby24(-)] virtual/ruby-ssl[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( <dev-ruby/addressable-2.6[ruby_targets_ruby25(-)] dev-ruby/delayer[ruby_targets_ruby25(-)] >=dev-ruby/delayer-deferred-2.0[ruby_targets_ruby25(-)] >=dev-ruby/diva-0.3.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:0[ruby_targets_ruby25(-)] dev-ruby/instance_storage[ruby_targets_ruby25(-)] dev-ruby/memoist[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.1[ruby_targets_ruby25(-)] >=dev-ruby/pluggaloid-1.1.1[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gettext-3.2.9[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gtk2-3.3.0[ruby_targets_ruby25(-)] >dev-ruby/ruby-hmac-0.4[ruby_targets_ruby25(-)] dev-ruby/totoridipjp[ruby_targets_ruby25(-)] dev-ruby/twitter-text:=[ruby_targets_ruby25(-)] >dev-ruby/typed-array-0.1[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=6
-HOMEPAGE=http://mikutter.hachune.net/
+HOMEPAGE=https://mikutter.hachune.net/
 IUSE=+libnotify test ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=~amd64
 LICENSE=GPL-3
@@ -10,6 +10,6 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.8.6.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
+SRC_URI=https://mikutter.hachune.net/bin/mikutter.3.8.6.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6917af49c51532bbf30e72dba71904c4
+_md5_=d8f4d7cb0c8525a96b5f696d8b89af03
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 0f5a9c95cc41..4b6596ec1091 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst prepare setup test unpa
 DEPEND=test? ( ruby_targets_ruby24? ( <dev-ruby/addressable-2.6[ruby_targets_ruby24(-)] dev-ruby/delayer[ruby_targets_ruby24(-)] >=dev-ruby/delayer-deferred-2.0[ruby_targets_ruby24(-)] >=dev-ruby/diva-0.3.2[ruby_targets_ruby24(-)] dev-ruby/httpclient[ruby_targets_ruby24(-)] dev-ruby/json:0[ruby_targets_ruby24(-)] dev-ruby/instance_storage[ruby_targets_ruby24(-)] dev-ruby/memoist[ruby_targets_ruby24(-)] dev-ruby/moneta[ruby_targets_ruby24(-)] dev-ruby/nokogiri[ruby_targets_ruby24(-)] >=dev-ruby/oauth-0.5.1[ruby_targets_ruby24(-)] >=dev-ruby/pluggaloid-1.1.1[ruby_targets_ruby24(-)] dev-ruby/rcairo[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gettext-3.2.9[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gtk2-3.3.0[ruby_targets_ruby24(-)] >dev-ruby/ruby-hmac-0.4[ruby_targets_ruby24(-)] dev-ruby/totoridipjp[ruby_targets_ruby24(-)] dev-ruby/twitter-text:=[ruby_targets_ruby24(-)] >dev-ruby/typed-array-0.1[ruby_targets_ruby24(-)] virtual/ruby-ssl[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( <dev-ruby/addressable-2.6[ruby_targets_ruby25(-)] dev-ruby/delayer[ruby_targets_ruby25(-)] >=dev-ruby/delayer-deferred-2.0[ruby_targets_ruby25(-)] >=dev-ruby/diva-0.3.2[ruby_targets_ruby25(-)] dev-ruby/httpclient[ruby_targets_ruby25(-)] dev-ruby/json:0[ruby_targets_ruby25(-)] dev-ruby/instance_storage[ruby_targets_ruby25(-)] dev-ruby/memoist[ruby_targets_ruby25(-)] dev-ruby/moneta[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] >=dev-ruby/oauth-0.5.1[ruby_targets_ruby25(-)] >=dev-ruby/pluggaloid-1.1.1[ruby_targets_ruby25(-)] dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gettext-3.2.9[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gtk2-3.3.0[ruby_targets_ruby25(-)] >dev-ruby/ruby-hmac-0.4[ruby_targets_ruby25(-)] dev-ruby/totoridipjp[ruby_targets_ruby25(-)] dev-ruby/twitter-text:=[ruby_targets_ruby25(-)] >dev-ruby/typed-array-0.1[ruby_targets_ruby25(-)] virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=6
-HOMEPAGE=http://mikutter.hachune.net/
+HOMEPAGE=https://mikutter.hachune.net/
 IUSE=+libnotify test ruby_targets_ruby24 ruby_targets_ruby25
 LICENSE=GPL-3
 PROPERTIES=live
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6917af49c51532bbf30e72dba71904c4
+_md5_=d8f4d7cb0c8525a96b5f696d8b89af03
diff --git a/metadata/md5-cache/net-misc/ris-linux-0.4-r1 b/metadata/md5-cache/net-misc/ris-linux-0.4-r1
index 7937fdf06600..8349acaac0e7 100644
--- a/metadata/md5-cache/net-misc/ris-linux-0.4-r1
+++ b/metadata/md5-cache/net-misc/ris-linux-0.4-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)] )
 DESCRIPTION=BINL server to doing Windows(r) RIS
 EAPI=5
-HOMEPAGE=http://oss.netfarm.it/guides/pxe.php
+HOMEPAGE=https://oss.netfarm.it/guides/pxe.php
 IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=|| ( net-ftp/atftp net-ftp/tftp-hpa ) net-misc/dhcp net-fs/samba sys-boot/syslinux python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-SRC_URI=http://oss.netfarm.it/guides/ris-linux-0.4.tar.gz
+SRC_URI=https://oss.netfarm.it/guides/ris-linux-0.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a76120cc40e5646d373d728b598a469f
+_md5_=7f77d88be221b1464046e81b0621a3c8
diff --git a/metadata/md5-cache/net-misc/socat-9999 b/metadata/md5-cache/net-misc/socat-9999
index 496ac7e49a8e..e928f764955d 100644
--- a/metadata/md5-cache/net-misc/socat-9999
+++ b/metadata/md5-cache/net-misc/socat-9999
@@ -1,6 +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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-text/yodl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=app-text/yodl
 DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=7
 HOMEPAGE=http://www.dest-unreach.org/socat/
@@ -10,4 +9,4 @@ PROPERTIES=live
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=00b2be30c3ecfdbee4c9741ae11da99e
+_md5_=a5df8ee84df092cb30dd36ee30948682
diff --git a/metadata/md5-cache/net-misc/spiped-1.6.0-r1 b/metadata/md5-cache/net-misc/spiped-1.6.0-r1
index 37897c838d51..765c4b51ec6a 100644
--- a/metadata/md5-cache/net-misc/spiped-1.6.0-r1
+++ b/metadata/md5-cache/net-misc/spiped-1.6.0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=compile install postinst
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=secure pipe daemon
 EAPI=6
@@ -9,4 +9,5 @@ LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !net-mail/qlogtools
 SLOT=0
 SRC_URI=http://www.tarsnap.com/spiped/spiped-1.6.0.tgz
-_md5_=8eee854431af46b03b103af561e0ce2a
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=b4421e16263e52a9b3ebe53237ab33e9
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index 25b04f56e596..1d36a51095c6 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ef6475c3ed503ae0a53603cce65532c5
diff --git a/metadata/md5-cache/net-misc/usbip-4.13 b/metadata/md5-cache/net-misc/usbip-4.13
index fb29e802d236..c1b031c1dfba 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13
+++ b/metadata/md5-cache/net-misc/usbip-4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=37ba62a20e3cdefca00a73f5f7ff4c0f
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.2.2 b/metadata/md5-cache/net-misc/x2goclient-4.1.2.2
index 6821f03d8739..508a7df22184 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.2.2
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=The X2Go Qt client
 EAPI=7
 HOMEPAGE=http://www.x2go.org
 IUSE=ldap
-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/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27c63643f8086faa726a34f10ae897e3
+_md5_=8819f4c6c74fd07212ddc4aba44896b2
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index b61355f8ce94..7574ab5bab03 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/newsboat-2.19-r1 b/metadata/md5-cache/net-news/newsboat-2.19-r1
index 55b835b8a18b..d17a079630ca 100644
--- a/metadata/md5-cache/net-news/newsboat-2.19-r1
+++ b/metadata/md5-cache/net-news/newsboat-2.19-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT Unlicense
 RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.19/newsboat-2.19.tar.xz https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/backtrace/0.3.13/download -> backtrace-0.3.13.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.28/download -> backtrace-sys-0.1.28.crate https://crates.io/api/v1/crates/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.29/download -> cc-1.0.29.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.12/download -> curl-sys-0.4.12.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gettext-rs/0.4.1/download -> gettext-rs-0.4.1.crate https://crates.io/api/v1/crates/gettext-sys/0.19.8/download -> gettext-sys-0.19.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/locale_config/0.2.2/download -> locale_config-0.2.2.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/once_cell/0.1.8/download -> once_cell-0.1.8.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/parking_lot/0.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/proptest/0.7.2/download -> proptest-0.7.2.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.3/download -> rand_jitter-0.1.3.crate https://crates.io/api/v1/crates/rand_os/0.1.2/download -> rand_os-0.1.2.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.4.2/download -> regex-syntax-0.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.5/download -> regex-syntax-0.6.5.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.13/download -> rustc-demangle-0.1.13.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusty-fork/0.2.1/download -> rusty-fork-0.2.1.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tempfile/3.0.6/download -> tempfile-3.0.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wait-timeout/0.1.5/download -> wait-timeout-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=12fbd1c9e1213a225fa48e04b77b9633
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 7bbfb19f5645..140435391cc9 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
deleted file mode 100644
index d86e8235cfb0..000000000000
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 app-arch/unzip dev-util/desktop-file-utils >=virtual/jdk-1.5 >=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=BitTorrent client in Java, formerly called Azureus
-EAPI=5
-HOMEPAGE=http://www.vuze.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 BSD
-PDEPEND=~net-p2p/vuze-coreplugins-4.8.1.2
-RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=desktop	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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=116c2afce6beb73290c3e0a680e7123c
diff --git a/metadata/md5-cache/net-p2p/vuze-coreplugins-4.8.1.2 b/metadata/md5-cache/net-p2p/vuze-coreplugins-4.8.1.2
deleted file mode 100644
index de32d383e528..000000000000
--- a/metadata/md5-cache/net-p2p/vuze-coreplugins-4.8.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=~net-p2p/vuze-4.8.1.2 app-arch/unzip
-DESCRIPTION=Core plugins for Vuze that are included in upstream distribution
-EAPI=5
-HOMEPAGE=http://www.vuze.com/
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 BSD
-RDEPEND=~net-p2p/vuze-4.8.1.2
-SLOT=0
-SRC_URI=http://azureus.sourceforge.net/plugins/azplugins_2.1.7.jar http://azureus.sourceforge.net/plugins/azrating_1.3.1.jar http://azureus.sourceforge.net/plugins/azupdater_1.8.17.zip http://azureus.sourceforge.net/plugins/azupnpav_0.4.6.zip
-_md5_=c3935b039f7fe116a3afac3f2a40bcd5
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 26190d098b15..4468476b8a96 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.13 b/metadata/md5-cache/net-proxy/haproxy-1.8.13
deleted file mode 100644
index 224e31615b44..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=6
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=amd64 arm ~ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a96f6a5458cd3a0e9b7709917a28e04b
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.9 b/metadata/md5-cache/net-proxy/haproxy-1.8.9
deleted file mode 100644
index da85a5d1e407..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=6
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=amd64 arm ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4c6eccd379572eb9149e2747718cc5da
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.15 b/metadata/md5-cache/net-proxy/haproxy-2.1.5
similarity index 76%
rename from metadata/md5-cache/net-proxy/haproxy-1.9.15
rename to metadata/md5-cache/net-proxy/haproxy-2.1.5
index 3179e2d80b93..e254365f6f67 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.15
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.5
@@ -4,12 +4,12 @@ DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( d
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+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
-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	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ecbab5aaaabcac3b177ca9cf27227946
+SRC_URI=http://haproxy.1wt.eu/download/2.1/src/haproxy-2.1.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=d6427deae489f8833c8d5a3379a374f8
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.1.1 b/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
new file mode 100644
index 000000000000..92498b8663c0
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/flask-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hypothesis-4.50.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parver-0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zstandard-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
+EAPI=7
+HOMEPAGE=https://mitmproxy.org/
+IUSE=test test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.1.1.tar.gz -> mitmproxy-5.1.1.tar.gz
+_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=fb34deafc9ec0e761b08ff130537fba6
diff --git a/metadata/md5-cache/net-proxy/rejik-3.2.10 b/metadata/md5-cache/net-proxy/rejik-3.2.10
index e0ef8ca2e800..7cc0c88561f0 100644
--- a/metadata/md5-cache/net-proxy/rejik-3.2.10
+++ b/metadata/md5-cache/net-proxy/rejik-3.2.10
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prepare
 DEPEND=dev-libs/libpcre
 DESCRIPTION=A squid redirector used for blocking unwanted content
 EAPI=4
-HOMEPAGE=http://rejik.ru/
+HOMEPAGE=https://rejik.ru/
 IUSE=banlists
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-perl/Text-Iconv dev-perl/XML-Parser net-proxy/squid
 SLOT=0
-SRC_URI=http://rejik.ru/download/redirector-3.2.10.tgz banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )
+SRC_URI=https://rejik.ru/download/redirector-3.2.10.tgz banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62a4b57a2d94e959342f9e70593958c2
+_md5_=d810067efefe609e64a5d7a17545ce9e
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index b0fcef90fca3..309ee5d1550d 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
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 ab6881e48e24..bb86dd34b8dc 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
@@ -11,4 +11,4 @@ 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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0af91413a95c8ce5db3e0cacd9678510
+_md5_=f88cdf002830c3657a69c1d77996f91c
diff --git a/metadata/md5-cache/net-wireless/chirp-20200430 b/metadata/md5-cache/net-wireless/chirp-20200430
index 8983e8cadcbf..01efb4c96bce 100644
--- a/metadata/md5-cache/net-wireless/chirp-20200430
+++ b/metadata/md5-cache/net-wireless/chirp-20200430
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm 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/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python]
 DESCRIPTION=Free open-source tool for programming your amateur radio
 EAPI=7
-HOMEPAGE=http://chirp.danplanet.com
+HOMEPAGE=https://chirp.danplanet.com
 IUSE=radioreference python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://trac.chirp.danplanet.com/chirp_daily/daily-20200430/chirp-daily-20200430.tar.gz
+SRC_URI=https://trac.chirp.danplanet.com/chirp_daily/daily-20200430/chirp-daily-20200430.tar.gz
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e826ed3bb77ba2f8ec6ee30633037897
+_md5_=48a53e1ea3d271e12cec2972e827308f
diff --git a/metadata/md5-cache/net-wireless/chirp-99999999 b/metadata/md5-cache/net-wireless/chirp-99999999
index 62d2d15ff18b..d455fa9c6c7a 100644
--- a/metadata/md5-cache/net-wireless/chirp-99999999
+++ b/metadata/md5-cache/net-wireless/chirp-99999999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm 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/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python] dev-vcs/mercurial
 DESCRIPTION=Free open-source tool for programming your amateur radio
 EAPI=7
-HOMEPAGE=http://chirp.danplanet.com
+HOMEPAGE=https://chirp.danplanet.com
 IUSE=radioreference python_targets_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=365c59c8b0d623d84a83528116281968
+_md5_=48a53e1ea3d271e12cec2972e827308f
diff --git a/metadata/md5-cache/net-wireless/dump1090-1.15_pre20180509 b/metadata/md5-cache/net-wireless/dump1090-1.15_pre20180509
deleted file mode 100644
index f928a754dae2..000000000000
--- a/metadata/md5-cache/net-wireless/dump1090-1.15_pre20180509
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-wireless/rtl-sdr virtual/libusb:1
-DESCRIPTION=simple Mode S decoder for RTLSDR devices
-EAPI=6
-HOMEPAGE=https://github.com/mutability/dump1090
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-wireless/rtl-sdr virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/mutability/dump1090/archive/fb5942dba6505a21cbafc7905a5a7c513b214dc9.tar.gz -> dump1090-1.15_pre20180509.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6a1d162f450d16467490c7745739bcd
diff --git a/metadata/md5-cache/net-wireless/dump1090-3.7.2 b/metadata/md5-cache/net-wireless/dump1090-3.7.2
index cfa6c0e76267..8b6f3ccbe497 100644
--- a/metadata/md5-cache/net-wireless/dump1090-3.7.2
+++ b/metadata/md5-cache/net-wireless/dump1090-3.7.2
@@ -10,4 +10,4 @@ RDEPEND=bladerf? ( net-wireless/bladerf:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) s
 SLOT=0
 SRC_URI=https://github.com/flightaware/dump1090/archive/v3.7.2.tar.gz -> dump1090-3.7.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0bbc1a454a9c10e81f06731c36717120
+_md5_=4bc5e6f49c498130f17aa506c9cab4c0
diff --git a/metadata/md5-cache/net-wireless/dump1090-9999 b/metadata/md5-cache/net-wireless/dump1090-9999
index 9b84378eaea5..91d3f33f74b3 100644
--- a/metadata/md5-cache/net-wireless/dump1090-9999
+++ b/metadata/md5-cache/net-wireless/dump1090-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=bladerf? ( net-wireless/bladerf:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sys-libs/ncurses:= virtual/libusb:1
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=108c553a0e8ce0bcb38b6db1a727c443
+_md5_=baf0cda0ad1ae9112aa8d2b1151480de
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3
deleted file mode 100644
index d5cf4bf3c9bd..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] ) !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[python_single_target_python2_7(-)?] ) grc? ( python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/pygtk:2[python_targets_python2_7(-)] ) ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_single_target_python2_7(-)?] ) wavelet? ( sci-libs/gsl ) dev-lang/swig virtual/pkgconfig python_single_target_python2_7? ( dev-python/cheetah[python_targets_python2_7(-)] doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=5
-HOMEPAGE=https://www.gnuradio.org/
-IUSE=alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] ) !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[python_single_target_python2_7(-)?] ) grc? ( python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/pygtk:2[python_targets_python2_7(-)] ) ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_single_target_python2_7(-)?] ) wavelet? ( sci-libs/gsl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog )
-SLOT=0/3.6.5.1
-SRC_URI=https://www.gnuradio.org/releases/gnuradio/gnuradio-3.6.5.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fa75f89b74838e42fd0dbe6046d878b
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
deleted file mode 100644
index 6bd4c4e100fa..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=6
-HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-RESTRICT=!test? ( test )
-SLOT=0/3.7.9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a290e62d102c6b1f4f8c3c03b909d341
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1
new file mode 100644
index 000000000000..cad1db3e72bc
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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/boost:0=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:0=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) dev-libs/log4cpp python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) sci-libs/fftw:3.0= sci-libs/mpir sci-libs/volk alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl sci-libs/scipy ) filter? ( sci-libs/scipy ) grc? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_6? ( dev-python/PyQt5[opengl,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( sci-libs/scipy ) uhd? ( python_single_target_python3_6? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) utils? ( python_single_target_python3_6? ( dev-python/click[python_targets_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/click[python_targets_python3_7(-)] dev-python/click-plugins[python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( sci-libs/gsl dev-libs/gmp sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11 ) !<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=7
+HOMEPAGE=https://www.gnuradio.org/
+IUSE=+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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/boost:0=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:0=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) dev-libs/log4cpp python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) sci-libs/fftw:3.0= sci-libs/mpir sci-libs/volk alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl sci-libs/scipy ) filter? ( sci-libs/scipy ) grc? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_6? ( dev-python/PyQt5[opengl,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( sci-libs/scipy ) uhd? ( python_single_target_python3_6? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) utils? ( python_single_target_python3_6? ( dev-python/click[python_targets_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/click[python_targets_python3_7(-)] dev-python/click-plugins[python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( sci-libs/gsl dev-libs/gmp sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
+RESTRICT=test
+SLOT=0/3.8.1.0
+SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.1.0/gnuradio-3.8.1.0.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce952ebd6ba82f36c36cec114ad3eb38
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index ca9a59f22ee7..4e7f28de11b6 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -1,14 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] dev-libs/log4cpp ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[qt5(+)] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+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/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-libs/boost:0=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:0=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) dev-libs/log4cpp python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) sci-libs/fftw:3.0= sci-libs/mpir sci-libs/volk alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl sci-libs/scipy ) filter? ( sci-libs/scipy ) grc? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_6? ( dev-python/PyQt5[opengl,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( sci-libs/scipy ) uhd? ( python_single_target_python3_6? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) utils? ( python_single_target_python3_6? ( dev-python/click[python_targets_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/click[python_targets_python3_7(-)] dev-python/click-plugins[python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( sci-libs/gsl dev-libs/gmp sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11 ) !<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
+IUSE=+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] dev-libs/log4cpp ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[qt5(+)] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-RESTRICT=!test? ( test )
+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/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-libs/boost:0=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:0=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) dev-libs/log4cpp python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) sci-libs/fftw:3.0= sci-libs/mpir sci-libs/volk alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl sci-libs/scipy ) filter? ( sci-libs/scipy ) grc? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_6? ( dev-python/PyQt5[opengl,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( sci-libs/scipy ) uhd? ( python_single_target_python3_6? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) utils? ( python_single_target_python3_6? ( dev-python/click[python_targets_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/click[python_targets_python3_7(-)] dev-python/click-plugins[python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( sci-libs/gsl dev-libs/gmp sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
+RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521cee5ee09c7334358f5e801a84abd2
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bbc22a89e241fc48f49fe316392f7a4
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1 b/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
index f891063bee82..79e403a23620 100644
--- a/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
+++ b/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
 EAPI=6
-HOMEPAGE=http://gqrx.dk/
+HOMEPAGE=https://gqrx.dk/
 IUSE=gr-audio portaudio pulseaudio
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 SRC_URI=https://github.com/csete/gqrx/archive/v2.11.5.tar.gz -> gqrx-2.11.5.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13bfa32dd0b79181b753a3bef3c5654d
+_md5_=1e845a0e14d326361cb711cb60a30c06
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.12.1 b/metadata/md5-cache/net-wireless/gqrx-2.12.1
index 2920e2170eaf..d3934cb4c5bf 100644
--- a/metadata/md5-cache/net-wireless/gqrx-2.12.1
+++ b/metadata/md5-cache/net-wireless/gqrx-2.12.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
 EAPI=7
-HOMEPAGE=http://gqrx.dk/
+HOMEPAGE=https://gqrx.dk/
 IUSE=gr-audio portaudio pulseaudio
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 SRC_URI=https://github.com/csete/gqrx/archive/v2.12.1.tar.gz -> gqrx-2.12.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37aa50a94d65e3297852d3791778135f
+_md5_=22ace939027c533b9937ac5d994d4a6b
diff --git a/metadata/md5-cache/net-wireless/gqrx-9999 b/metadata/md5-cache/net-wireless/gqrx-9999
index cfc05b10f50c..ee0e7f3584d1 100644
--- a/metadata/md5-cache/net-wireless/gqrx-9999
+++ b/metadata/md5-cache/net-wireless/gqrx-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
 EAPI=7
-HOMEPAGE=http://gqrx.dk/
+HOMEPAGE=https://gqrx.dk/
 IUSE=gr-audio portaudio pulseaudio
 LICENSE=GPL-3
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37aa50a94d65e3297852d3791778135f
+_md5_=22ace939027c533b9937ac5d994d4a6b
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
deleted file mode 100644
index e3689ae326db..000000000000
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
-EAPI=6
-HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0/0.0_p20180402
-SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/c969b3fd2059472a28dee6f911083dd03d1dd569.tar.gz -> gr-ieee802154-0.0_p20180402.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6e5240573cb7314fa456535b087f37e
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606
new file mode 100644
index 000000000000..caf6359523ff
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0
+DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
+EAPI=7
+HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0/0.0_p20190606
+SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/d3d94023c71af9e6d7721f7412fba88ff5325234.tar.gz -> gr-ieee802154-0.0_p20190606.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9512edef1a33beaeb72ca5fe963bb96a
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
new file mode 100644
index 000000000000..2a552cf834b8
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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-lang/swig:0
+DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
+EAPI=7
+HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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/0.0_p20191006
+SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/a3c79af96e18de3eb3a76659e1669a370efccf17.tar.gz -> gr-ieee802154-0.0_p20191006.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82dcf549a1ed02694ff53fafafae2b7f
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-9999 b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
index a2fb4ff488ad..371763a68634 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-9999
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
@@ -1,13 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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-lang/swig:0
 DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
-IUSE=+python_single_target_python2_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6e5240573cb7314fa456535b087f37e
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82dcf549a1ed02694ff53fafafae2b7f
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3-r2 b/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
deleted file mode 100644
index d71ba8d1bdd3..000000000000
--- a/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GNU Radio IIO Blocks
-EAPI=6
-HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/v0.3.tar.gz -> gr-iio-0.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1418038bffe19f7218505cf3515db84
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3-r3 b/metadata/md5-cache/net-wireless/gr-iio-0.3-r3
new file mode 100644
index 000000000000..f963330a9384
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-3.7*:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
+DESCRIPTION=GNU Radio IIO Blocks
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-3.7*:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/v0.3.tar.gz -> gr-iio-0.3.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8985216dca9ba9fc2d00245bb7ea7c0e
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1 b/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
new file mode 100644
index 000000000000..610aa72952dc
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
+DESCRIPTION=GNU Radio IIO Blocks
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:=
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/733c8a05e74b7d10fbaef502cc82d025ae35a1fb.tar.gz -> gr-iio-0.3_p20191219.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=53422a7754bf981a8136f0e33aba472b
diff --git a/metadata/md5-cache/net-wireless/gr-iio-9999 b/metadata/md5-cache/net-wireless/gr-iio-9999
index 5b4433c1878c..84b16e1c8cfc 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-9999
+++ b/metadata/md5-cache/net-wireless/gr-iio-9999
@@ -1,13 +1,14 @@
+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=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
 DESCRIPTION=GNU Radio IIO Blocks
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
-IUSE=+python_single_target_python2_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
+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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:=
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1418038bffe19f7218505cf3515db84
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=53422a7754bf981a8136f0e33aba472b
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2 b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
deleted file mode 100644
index ad019ee8d3cb..000000000000
--- a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=gnuradio I/Q balancing
-EAPI=6
-HOMEPAGE=http://git.osmocom.org/gr-iqbal/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0/0.37.2
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-iqbal-0.37.2.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47fb0dcf4dd13556fe63befb9a841928
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.3 b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.3
new file mode 100644
index 000000000000..3dda2755b222
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DESCRIPTION=gnuradio I/Q balancing
+EAPI=7
+HOMEPAGE=http://git.osmocom.org/gr-iqbal/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND==net-wireless/gnuradio-3.7*:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0/0.37.3
+SRC_URI=https://github.com/osmocom/gr-iqbal/archive/v0.37.3.tar.gz -> gr-iqbal-0.37.3.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dab9a8ad54972a17699dbeb968c5a3f
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1 b/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
new file mode 100644
index 000000000000..cc6cf0dae361
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DESCRIPTION=gnuradio I/Q balancing
+EAPI=7
+HOMEPAGE=http://git.osmocom.org/gr-iqbal/
+IUSE=doc 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*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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/0.38.1
+SRC_URI=https://github.com/osmocom/gr-iqbal/archive/v0.38.1.tar.gz -> gr-iqbal-0.38.1.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f72c64304c5313f9220b9c9e57500b43
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-9999 b/metadata/md5-cache/net-wireless/gr-iqbal-9999
index 3e1864afa537..63e7f9449c6c 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-9999
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-9999
@@ -1,13 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 DESCRIPTION=gnuradio I/Q balancing
-EAPI=6
+EAPI=7
 HOMEPAGE=http://git.osmocom.org/gr-iqbal/
-IUSE=+python_single_target_python2_7
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-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/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47fb0dcf4dd13556fe63befb9a841928
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f72c64304c5313f9220b9c9e57500b43
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5
deleted file mode 100644
index 624936c527aa..000000000000
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
-EAPI=6
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0/0.1.4_p20180626
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20180626.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9eec6e087b4e00ffbef3cca75bc2f1e7
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
similarity index 54%
rename from metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5
rename to metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
index 71f38f2cb2ee..4ab36024187d 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= =net-wireless/gnuradio-3.7*:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
 IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= =net-wireless/gnuradio-3.7*:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/0.1.5
 SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.1.5.tar.gz -> gr-osmosdr-0.1.5.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d986d79f807d9ef047a474f997700d
+_md5_=2c15fd9cc12be052e7e3c2973dafde4d
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.0 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.0
new file mode 100644
index 000000000000..d2834cb60a1f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
+EAPI=7
+HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
+IUSE=airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0/0.2.0
+SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.2.0.tar.gz -> gr-osmosdr-0.2.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=047710648cb108a59b692e597f318a98
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 87220f391562..daf90522a08c 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
+IUSE=airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/9999
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0d986d79f807d9ef047a474f997700d
+_md5_=047710648cb108a59b692e597f318a98
diff --git a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418 b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418
new file mode 100644
index 000000000000..de1422a61fb9
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) =net-wireless/gnuradio-3.7*:=[python_single_target_python2_7(-)?]
+DESCRIPTION=Paints monochrome images into the waterfall of a receiver
+EAPI=7
+HOMEPAGE=https://github.com/drmpeg/gr-paint
+IUSE=doc +python_single_target_python2_7
+KEYWORDS=~amd64
+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/boost:=[python_targets_python2_7(-)] ) =net-wireless/gnuradio-3.7*:=[python_single_target_python2_7(-)?] media-gfx/imagemagick
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/drmpeg/gr-paint/archive/e36b2c638061d14f1b3c3bf3e889a8c99c273930.tar.gz -> gr-paint-0.0_p20200418.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e7b2666df7358fb106c85ff51068319f
diff --git a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517 b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
new file mode 100644
index 000000000000..9bb5eb7ae266
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
+DESCRIPTION=Paints monochrome images into the waterfall of a receiver
+EAPI=7
+HOMEPAGE=https://github.com/drmpeg/gr-paint
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-gfx/imagemagick
+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/drmpeg/gr-paint38/archive/9cb4eabe3b570ccd1f53837681607d73501b5c1e.tar.gz -> gr-paint-0.0_p20200517.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c7d00c8a500bee54022dc2bfdbc70b2
diff --git a/metadata/md5-cache/net-wireless/gr-paint-9999 b/metadata/md5-cache/net-wireless/gr-paint-9999
index 49fdb34d9d7b..58d0ec65ccb4 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-9999
+++ b/metadata/md5-cache/net-wireless/gr-paint-9999
@@ -1,14 +1,15 @@
 BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) net-wireless/gnuradio:=[python_single_target_python2_7(-)?]
+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-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Paints monochrome images into the waterfall of a receiver
 EAPI=7
 HOMEPAGE=https://github.com/drmpeg/gr-paint
-IUSE=doc +python_single_target_python2_7
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) net-wireless/gnuradio:=[python_single_target_python2_7(-)?] media-gfx/imagemagick
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
+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/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-gfx/imagemagick
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8db62cbf76c52604771f6015f2ea3490
+_md5_=9c7d00c8a500bee54022dc2bfdbc70b2
diff --git a/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1 b/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
index 2bf5a30fec92..68cc5aaf161b 100644
--- a/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
+++ b/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Utilities for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products
 EAPI=7
-HOMEPAGE=http://hostap.epitest.fi/
+HOMEPAGE=https://hostap.epitest.fi/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://hostap.epitest.fi/releases/hostap-utils-0.4.7.tar.gz
+SRC_URI=https://hostap.epitest.fi/releases/hostap-utils-0.4.7.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=512f7a783eea0af093a4ef50a79461f8
+_md5_=a8861214a090b27b4302cb51ec4236e4
diff --git a/metadata/md5-cache/net-wireless/uhd-3.10.3.0 b/metadata/md5-cache/net-wireless/uhd-3.10.3.0
deleted file mode 100644
index c422b97e28a0..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.10.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses:0[tinfo] dev-python/mako dev-python/cheetah app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=http://code.ettus.com/redmine/ettus/projects/uhd/wiki
-IUSE=+python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0/1
-SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_010_003_000.tar.gz -> EttusResearch-UHD-3.10.3.0.tar.gz http://files.ettus.com/binaries/images/uhd-images_003.010.003.000-release.zip
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=424497cf815020e0e8c5113769d73e26
diff --git a/metadata/md5-cache/net-wireless/uhd-3.11.0.0 b/metadata/md5-cache/net-wireless/uhd-3.11.0.0
deleted file mode 100644
index adbf17f4babe..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.11.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/3.11
-SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_011_000_000.tar.gz -> EttusResearch-UHD-3.11.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_3.11.0.0_images.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e6fb3fab293e4558ea773546b5ea2ca
diff --git a/metadata/md5-cache/net-wireless/uhd-3.12.0.0 b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
deleted file mode 100644
index e06c9a20ac7b..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.12.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/3.12
-SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.12.0.0.tar.gz -> EttusResearch-UHD-3.12.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.12.0.0/uhd-images_3.12.0.0.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb2d7bd36124f68aedcc234abf854bd5
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.0.1 b/metadata/md5-cache/net-wireless/uhd-3.13.0.1
deleted file mode 100644
index 0c0c8f002359..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.13.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/3.13
-SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.0.1.tar.gz -> EttusResearch-UHD-3.13.0.1.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.0.1/uhd-images_3.13.0.1.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb2d7bd36124f68aedcc234abf854bd5
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.1.0 b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
deleted file mode 100644
index c2d4fe1d77ed..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.13.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/3.13
-SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.1.0.tar.gz -> EttusResearch-UHD-3.13.1.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.1.0/uhd-images_3.13.1.0.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bfc713c03b442c1483f1a9ccb13b311d
diff --git a/metadata/md5-cache/net-wireless/uhd-3.14.0.0 b/metadata/md5-cache/net-wireless/uhd-3.14.0.0
deleted file mode 100644
index 930238246924..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.14.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/3.14
-SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.14.0.0.tar.gz -> EttusResearch-UHD-3.14.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.14.0.0/uhd-images_3.14.0.0.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bfc713c03b442c1483f1a9ccb13b311d
diff --git a/metadata/md5-cache/net-wireless/uhd-3.14.1.1 b/metadata/md5-cache/net-wireless/uhd-3.14.1.1
deleted file mode 100644
index 332e9c71c98a..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.14.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/3.14.1
-SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.14.1.1.tar.gz -> EttusResearch-UHD-3.14.1.1.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.14.1.1/uhd-images_3.14.1.1.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dedcd3e652f52833099017b2cfb4e1b
diff --git a/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1 b/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1
index f31fb49b6023..f81ab6ee66b0 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1
+++ b/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.15.0
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.15.0.0.tar.gz -> EttusResearch-UHD-3.15.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.15.0.0/uhd-images_3.15.0.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7e8f2e4c6fd6ba26fae9d8357402fb0
+_md5_=d7bf12e716749aba5092ce2edc5cea31
diff --git a/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100 b/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
new file mode 100644
index 000000000000..d9dcc58450ff
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] python_single_target_python3_6? ( || ( dev-python/numpy-python2[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( || ( dev-python/numpy-python2[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( || ( dev-python/numpy-python2[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) dev-python/requests[python_targets_python3_8(-)] ) doc? ( app-doc/doxygen ) python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] ) app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
+EAPI=6
+HOMEPAGE=https://kb.ettus.com
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] python_single_target_python3_6? ( || ( dev-python/numpy-python2[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( || ( dev-python/numpy-python2[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( || ( dev-python/numpy-python2[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) dev-python/requests[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
+SLOT=0/3.15.0
+SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.15.0.0.tar.gz -> EttusResearch-UHD-3.15.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.15.0.0/uhd-images_3.15.0.0.tar.xz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4882042df0b70e8099632bb92154c43
diff --git a/metadata/md5-cache/net-wireless/urh-2.8.4 b/metadata/md5-cache/net-wireless/urh-2.8.4
deleted file mode 100644
index 4a8644cf5270..000000000000
--- a/metadata/md5-cache/net-wireless/urh-2.8.4
+++ /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=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) 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
-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 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_single_target_python3_6(-),-python_single_target_python3_7(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.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/jopohl/urh/archive/v2.8.4.tar.gz -> urh-2.8.4.tar.gz
-_eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=dee3ddcc479f1167c61d82d55f4b4bcb
diff --git a/metadata/md5-cache/net-wireless/urh-2.8.8 b/metadata/md5-cache/net-wireless/urh-2.8.8
new file mode 100644
index 000000000000..8c9b156f1f6b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/urh-2.8.8
@@ -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=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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:= )
+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
+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(-)]
+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	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=2a02930f4ce659cb6659de37d9ccaa27
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index 6890ca8fc981..3e3198eca1b4 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 ) >=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(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_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 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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(-)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) 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
+IUSE=bladerf hackrf plutosdr rtlsdr 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 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_single_target_python3_6(-),-python_single_target_python3_7(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=dee3ddcc479f1167c61d82d55f4b4bcb
+_md5_=2a02930f4ce659cb6659de37d9ccaa27
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 5a93e35c4181..f5d4aaf42532 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.15 b/metadata/md5-cache/sci-chemistry/mopac7-1.15
deleted file mode 100644
index 91eeeced8aa2..000000000000
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libf2c >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
-DESCRIPTION=Autotooled, updated version of a powerful, fast semi-empirical package
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/mopac7/
-IUSE=gmxmopac7 static-libs
-KEYWORDS=amd64 ppc x86 ~amd64-linux
-LICENSE=public-domain
-RDEPEND=dev-libs/libf2c virtual/fortran
-SLOT=0
-SRC_URI=http://www.bioinformatics.org/ghemical/download/current/mopac7-1.15.tar.gz http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2867fc8118337cc1a30d2814ccbf0cb
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1 b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
index ff6de7f9565e..0aa83c2aa239 100644
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
+++ b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Autotooled, updated version of a powerful, fast semi-empirical packa
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/mopac7/
 IUSE=gmxmopac7 static-libs
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=dev-libs/libf2c virtual/fortran
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/current/mopac7-1.15.tar.gz http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=057cceda2eb9cdc143bb4ca909a429c1
+_md5_=de26a344ed3b63ce8e266a5ddb96f4ab
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3 b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
index 60507b487aa5..fa7619b98292 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-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=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[opengl,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(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib
+DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_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(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib
 DESCRIPTION=A Python-extensible molecular graphics system
 EAPI=7
 HOMEPAGE=https://www.pymol.org/
-IUSE=web python_targets_python3_6 python_targets_python3_7
+IUSE=web python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=PSF-2.2
-RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[opengl,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(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib sci-chemistry/chemical-mime-data python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_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(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib sci-chemistry/chemical-mime-data python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz -> pymol-2.3.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec9eed0ed3baedbe1727b4d841c697ff
+_md5_=5246fa2eacb13aed2cbc6304a6c76c26
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.6 b/metadata/md5-cache/sci-chemistry/votca-csg-1.6
index d1429a680f0e..7c13e806dbbf 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.6
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.6
@@ -5,11 +5,11 @@ 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
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.6 )
 RDEPEND=~sci-libs/votca-tools-1.6 >=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.tar.gz -> votca-csg-1.6.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.6/votca-csg-manual-1.6.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.6.tar.gz -> votca-csg-tutorials-1.6.tar.gz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f40596a2f1ae394e6bfd55fea0dd5295
+_md5_=90c05c7fb05e7d379926a0e5633f07e9
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6
index a0e7af1716dd..81213855e9f1 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6
@@ -4,10 +4,10 @@ DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6
 DESCRIPTION=Extra applications for votca-csg
 EAPI=7
 HOMEPAGE=http://www.votca.org
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6
 SLOT=0
 SRC_URI=https://github.com/votca/csgapps/archive/v1.6.tar.gz -> votca-csgapps-1.6.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a8967eebba12e43625c68bc0c7217e9
+_md5_=e67467de1c5933943fe81c1594c66ddb
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6
index 2c83257fe076..7a5e205ed275 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6
@@ -4,10 +4,10 @@ DEPEND=~sci-libs/votca-tools-1.6 >=dev-cpp/eigen-3.3 sci-libs/hdf5[cxx] ~sci-che
 DESCRIPTION=Votca excitation and charge properties module
 EAPI=7
 HOMEPAGE=http://www.votca.org
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=~sci-libs/votca-tools-1.6 >=dev-cpp/eigen-3.3 sci-libs/hdf5[cxx] ~sci-chemistry/votca-csg-1.6 sci-libs/libxc
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v1.6.tar.gz -> votca-xtp-1.6.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9721c07805f551f8df7b236c5cce6a75
+_md5_=7b8541d3c595008bc7786d5e55777dd0
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 9265f7d9ebda..0a0e20570619 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4 b/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
index 3cc6004b1626..73153ea36133 100644
--- a/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
+++ b/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Digital Chart of the World for GMT 5 or later
 EAPI=7
 HOMEPAGE=https://www.soest.hawaii.edu/wessel/dcw/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://www.soest.hawaii.edu/pwessel/dcw/dcw-gmt-1.1.4.tar.gz
-_md5_=26f00b335951a53b0767571eb73df588
+_md5_=7fe643d0eaa4c0cc58b1dda61928b061
diff --git a/metadata/md5-cache/sci-geosciences/gmt-5.4.4 b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
index e51a8da8b7ea..2a9bb4218aa2 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-5.4.4
+++ b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Powerful map generator
 EAPI=7
 HOMEPAGE=https://gmt.soest.hawaii.edu/
 IUSE=doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ gmttria? ( Artistic )
 RDEPEND=app-text/ghostscript-gpl net-misc/curl >=sci-libs/netcdf-4.1:=[hdf5] sys-libs/zlib fftw? ( sci-libs/fftw:3.0= ) gdal? ( sci-libs/gdal:= ) lapack? ( virtual/lapack ) pcre? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2 ) !sci-biology/probcons sci-geosciences/dcw-gmt sci-geosciences/gshhg-gmt
 REQUIRED_USE=?? ( pcre pcre2 )
 SLOT=5
 SRC_URI=mirror://gmt/gmt-5.4.4-src.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5baaeb33f44ddb56ef94d784f1fa6d
+_md5_=fe4ac2e54a1ace915b1ec6888de52875
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-7.29 b/metadata/md5-cache/sci-geosciences/gpxsee-7.29
index fc17fed5c3d1..020a46d01400 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-7.29
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-7.29
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport
 DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
 EAPI=7
 HOMEPAGE=https://www.gpxsee.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/tumic0/GPXSee/archive/7.29.tar.gz -> gpxsee-7.29.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4b10a11bd1445907188de31e4162047
+_md5_=9b7b4a4e97d3e5043fda6999eea5a7a8
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3ea17875c433..8e675f258cf1 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/btf-1.2.6 b/metadata/md5-cache/sci-libs/btf-1.2.6
index 72dc84d36f8a..7408006f745f 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 ~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_=6d9b23d47dbc0b495b876f74e78752a7
+_md5_=f058d8e60268a89395092777bfc22219
diff --git a/metadata/md5-cache/sci-libs/cxsparse-3.2.0 b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
index a24e8a3f053d..2fc3a9cb1886 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 ~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	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=28a44e480e2cd8f849408873bb68aeba
+_md5_=90d610bb9c71ce4a16877de2e2d16c01
diff --git a/metadata/md5-cache/sci-libs/geos-3.8.1 b/metadata/md5-cache/sci-libs/geos-3.8.1
index a76724af94f6..1953c5944b98 100644
--- a/metadata/md5-cache/sci-libs/geos-3.8.1
+++ b/metadata/md5-cache/sci-libs/geos-3.8.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=ruby? ( dev-lang/ruby:* )
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=7
-HOMEPAGE=http://trac.osgeo.org/geos/
+HOMEPAGE=https://trac.osgeo.org/geos/
 IUSE=doc ruby static-libs
 KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=ruby? ( dev-lang/ruby:* )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.8.1.tar.bz2
-_md5_=d808b31510c4a44fa1f3b000fdfc9d16
+_md5_=3ee1d4043519604854ae5a1cdca07342
diff --git a/metadata/md5-cache/sci-libs/klu-1.3.9 b/metadata/md5-cache/sci-libs/klu-1.3.9
index d934384001f8..41f83848cbb5 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 ~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_=95dbd0f78e788c77d6497ed183030652
+_md5_=320d3875413b7a452613f3246b6c1bbd
diff --git a/metadata/md5-cache/sci-libs/lapack-3.8.0 b/metadata/md5-cache/sci-libs/lapack-3.8.0
index 34a65b91cf67..e16f7fdb236b 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.8.0
+++ b/metadata/md5-cache/sci-libs/lapack-3.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=BLAS,CBLAS,LAPACK,LAPACKE reference implementations
 EAPI=7
 HOMEPAGE=http://www.netlib.org/lapack/
 IUSE=lapacke doc eselect-ldso
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.8.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=050a3cbeb21f6c510b6ee1c80c703b32
+_md5_=c7022fc8e78078fc7a182298c5b61f9c
diff --git a/metadata/md5-cache/sci-libs/ldl-2.2.6 b/metadata/md5-cache/sci-libs/ldl-2.2.6
index 8a48057e5d75..1aa3a48733a6 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 ~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_=1563947cf5f9f979702cee520a9d4c96
+_md5_=5a017cd46f0e9fdde7ed4aec7f3c294c
diff --git a/metadata/md5-cache/sci-libs/libxc-2.2.3 b/metadata/md5-cache/sci-libs/libxc-2.2.3
index eaa4f7ee8ec4..fe0c755581e5 100644
--- a/metadata/md5-cache/sci-libs/libxc-2.2.3
+++ b/metadata/md5-cache/sci-libs/libxc-2.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=A library of exchange-correlation functionals for use in DFT
 EAPI=5
 HOMEPAGE=https://octopus-code.org/wiki/Libxc
 IUSE=fortran static-libs -test
-KEYWORDS=amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=LGPL-3
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=https://www.tddft.org/programs/octopus/download/libxc/libxc-2.2.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90933af97a0609abadbdc54549967574
+_md5_=526504f237916b16a5ef1fa4d83bcd9d
diff --git a/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0 b/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
index 14e40a9b50ec..42a41f88880c 100644
--- a/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
+++ b/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:= virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Bayesian Filtering Library
 EAPI=5
-HOMEPAGE=http://orocos.org/bfl
+HOMEPAGE=https://orocos.org/bfl
 IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://people.mech.kuleuven.be/~tdelaet/bfl_tar/orocos-bfl-0.8.0-src.tar.bz2
+SRC_URI=https://people.mech.kuleuven.be/~tdelaet/bfl_tar/orocos-bfl-0.8.0-src.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38344d62a503de12ae727d0197da7ce1
+_md5_=732f363d5ab12feb16c75d5f55dc3bd8
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1 b/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
index dded38567abd..fff620e77072 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-cpp/eigen:3 test? ( dev-util/cppunit ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Kinematics and Dynamics Library (KDL)
 EAPI=5
-HOMEPAGE=http://www.orocos.org/kdl
+HOMEPAGE=https://www.orocos.org/kdl
 IUSE=doc test examples models
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.3.1.tar.gz -> orocos_kinematics_dynamics-1.3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57068c262363c651882ae97ac279d7c0
+_md5_=74dd02c8b44757d803c677ee45b07178
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0 b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
index 5516f8d2464d..bb393c860d76 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-cpp/eigen:3 test? ( dev-util/cppunit ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Kinematics and Dynamics Library (KDL)
 EAPI=5
-HOMEPAGE=http://www.orocos.org/kdl
+HOMEPAGE=https://www.orocos.org/kdl
 IUSE=doc test examples models
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78858cac7af03a2787f741ce33a2d5cd
+_md5_=cd35c01ee430f67348e5e2386d73b725
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-9999 b/metadata/md5-cache/sci-libs/orocos_kdl-9999
index a344aa87bcf1..b8508d5a44c5 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-9999
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-cpp/eigen:3 test? ( dev-util/cppunit ) doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Kinematics and Dynamics Library (KDL)
 EAPI=5
-HOMEPAGE=http://www.orocos.org/kdl
+HOMEPAGE=https://www.orocos.org/kdl
 IUSE=doc test examples models
 LICENSE=LGPL-2.1
 PROPERTIES=live
@@ -11,4 +11,4 @@ REQUIRED_USE=examples? ( models )
 RESTRICT=!test? ( test )
 SLOT=0/14
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78858cac7af03a2787f741ce33a2d5cd
+_md5_=cd35c01ee430f67348e5e2386d73b725
diff --git a/metadata/md5-cache/sci-libs/spqr-2.0.9 b/metadata/md5-cache/sci-libs/spqr-2.0.9
index 6ccf15e10564..de2efedc4ef1 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 ~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_=6703c98250476fffecfea9f4d2907cc0
+_md5_=6ca28e9011fefdbd77c3f506ba632048
diff --git a/metadata/md5-cache/sci-libs/suitesparse-5.4.0 b/metadata/md5-cache/sci-libs/suitesparse-5.4.0
index 9edc23abc680..715fba39567e 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 ~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_=bdd8cbc7f30de2c2757224d002846996
+_md5_=02e8b429ceac3c978bc36fc73e694272
diff --git a/metadata/md5-cache/sci-libs/ta-lib-0.4.0 b/metadata/md5-cache/sci-libs/ta-lib-0.4.0
index 5c90f24f1734..fc8de98de501 100644
--- a/metadata/md5-cache/sci-libs/ta-lib-0.4.0
+++ b/metadata/md5-cache/sci-libs/ta-lib-0.4.0
@@ -2,10 +2,10 @@ BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Technical Analysis Library for analyzing financial markets trends
 EAPI=7
-HOMEPAGE=http://www.ta-lib.org/
+HOMEPAGE=https://www.ta-lib.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/ta-lib/ta-lib-0.4.0-src.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=943956727a8b1b6f95a56afc921ed80d
+_md5_=71f6a5bf3ef07b814e0cf1a8abb41f9c
diff --git a/metadata/md5-cache/sci-libs/volk-2.3.0 b/metadata/md5-cache/sci-libs/volk-2.3.0
new file mode 100644
index 000000000000..c2e7f0ee41c2
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/volk-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<net-wireless/gnuradio-3.8 dev-libs/boost dev-lang/orc dev-python/mako dev-python/six
+DESCRIPTION=vector optimized library of kernels
+EAPI=7
+HOMEPAGE=http://libvolk.org
+IUSE=+orc
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=!<net-wireless/gnuradio-3.8 dev-libs/boost dev-lang/orc
+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-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6edf73b35e2cc4925271cbb07cf4b90e
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.6 b/metadata/md5-cache/sci-libs/votca-tools-1.6
index 63dfb9624a10..28d5f7b49639 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.6
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.6
@@ -4,10 +4,10 @@ DEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 sci-libs/fftw:3.0 >=a
 DESCRIPTION=Votca tools library
 EAPI=7
 HOMEPAGE=http://www.votca.org
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+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.tar.gz -> votca-tools-1.6.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b0e1520b57ddf6b0ea1156d7e09dfda
+_md5_=34c1cada1df375efab95653290684290
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3dfcf7b9cdbc..45643d02ad04 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.2.0 b/metadata/md5-cache/sci-mathematics/octave-5.2.0
index d8a28981f6f8..2254d709c164 100644
--- a/metadata/md5-cache/sci-mathematics/octave-5.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-5.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=High-level interactive language for numerical computations
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/octave/
 IUSE=curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5.2.0
 SRC_URI=mirror://gnu/octave/octave-5.2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94f2cab6c54614d14144ea3a7f3c128e
+_md5_=189fb34d07488ff06fcc498134471ebf
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 8af7b57d59f5..6c86d3c4d091 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.05_p01 b/metadata/md5-cache/sci-physics/geant-4.10.05_p01
index 86c01d0dff5d..5e67fc679f3f 100644
--- a/metadata/md5-cache/sci-physics/geant-4.10.05_p01
+++ b/metadata/md5-cache/sci-physics/geant-4.10.05_p01
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) zlib? ( sys-libs/zlib ) prefix? ( app-shells/tcsh ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Toolkit for simulation of passage of particles through matter
 EAPI=6
-HOMEPAGE=http://geant4.cern.ch/
+HOMEPAGE=http://geant4.web.cern.ch/
 IUSE=+data dawn doc examples gdml geant3 inventor motif opengl qt5 raytracerx static-libs threads vrml zlib
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) g
 SLOT=4
 SRC_URI=http://geant4.cern.ch/support/source/geant4.10.05.p01.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0ea30fddb03b0edad4b9365f1e01f1a
+_md5_=c9aa58fcb6dc487247cb1dedf8bb7ed6
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.6-r1 b/metadata/md5-cache/sci-physics/geant-4.10.6-r1
index b545f9226dec..909e5934a527 100644
--- a/metadata/md5-cache/sci-physics/geant-4.10.6-r1
+++ b/metadata/md5-cache/sci-physics/geant-4.10.6-r1
@@ -2,7 +2,7 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Toolkit for simulation of passage of particles through matter
 EAPI=7
-HOMEPAGE=https://geant4.cern.ch/
+HOMEPAGE=https://geant4.web.cern.ch/
 IUSE=+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83be8a236d28015cec966390758dcff7
+_md5_=c8502a738676402d09eebd3740126e60
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.6_beta1-r1 b/metadata/md5-cache/sci-physics/geant-4.10.6_beta1-r1
index f8d393e380bb..d6d8fb28d89f 100644
--- a/metadata/md5-cache/sci-physics/geant-4.10.6_beta1-r1
+++ b/metadata/md5-cache/sci-physics/geant-4.10.6_beta1-r1
@@ -2,7 +2,7 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Toolkit for simulation of passage of particles through matter
 EAPI=7
-HOMEPAGE=https://geant4.cern.ch/
+HOMEPAGE=https://geant4.web.cern.ch/
 IUSE=+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.b01.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83be8a236d28015cec966390758dcff7
+_md5_=c8502a738676402d09eebd3740126e60
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1 b/metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1
index 5c932f099555..e0ff83e1bfa1 100644
--- a/metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1
+++ b/metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1
@@ -2,7 +2,7 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Toolkit for simulation of passage of particles through matter
 EAPI=7
-HOMEPAGE=https://geant4.cern.ch/
+HOMEPAGE=https://geant4.web.cern.ch/
 IUSE=+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p01.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83be8a236d28015cec966390758dcff7
+_md5_=c8502a738676402d09eebd3740126e60
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.6_p2 b/metadata/md5-cache/sci-physics/geant-4.10.6_p2
new file mode 100644
index 000000000000..f19f7a311a68
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/geant-4.10.6_p2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Toolkit for simulation of passage of particles through matter
+EAPI=7
+HOMEPAGE=https://geant4.web.cern.ch/
+IUSE=+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs threads vrml
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=geant4
+RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.1.3:2=[threads?] data? ( ~sci-physics/geant-data-4.10.6_p1 ) dawn? ( media-gfx/dawn ) doc? ( ~app-doc/geant-docs-4.10.6 ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 )
+SLOT=4
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p02.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef2b81802fc5721794887ba6d9f35766
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.10.6-r1 b/metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
index 96dc6f60f24d..f53b1521c527 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
+++ b/metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.9.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.4.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.1.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.2.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.5.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz
-_md5_=e55fa7e0c7f50b9bfe0422cdcac965f8
+_md5_=46193dfe861e95cd2e1e087d1133aa32
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.10.6_beta1-r1 b/metadata/md5-cache/sci-physics/geant-data-4.10.6_beta1-r1
index ab4ca690e9e1..a7ae64a0f405 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.10.6_beta1-r1
+++ b/metadata/md5-cache/sci-physics/geant-data-4.10.6_beta1-r1
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.7.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.5.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.1.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.2.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz
-_md5_=195b0f537195d49b90a6e5ea1ea0b7ce
+_md5_=f3412e4390955a761f42871f776b7596
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.10.6_p1-r1 b/metadata/md5-cache/sci-physics/geant-data-4.10.6_p1-r1
index ba7c57891da6..0530b6793341 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.10.6_p1-r1
+++ b/metadata/md5-cache/sci-physics/geant-data-4.10.6_p1-r1
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.9.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.4.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.1.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.2.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.5.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz
-_md5_=1dad602d5c79e5e3b2d77bd37964888a
+_md5_=22cee1cc1ec90f8e331e4ee56b70a3d0
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b7c0b6ce1652..7593eb029dbf 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/apply-default-acl-0.4.3 b/metadata/md5-cache/sys-apps/apply-default-acl-0.4.4
similarity index 95%
rename from metadata/md5-cache/sys-apps/apply-default-acl-0.4.3
rename to metadata/md5-cache/sys-apps/apply-default-acl-0.4.4
index 131109809ef0..06e935ff0025 100644
--- a/metadata/md5-cache/sys-apps/apply-default-acl-0.4.3
+++ b/metadata/md5-cache/sys-apps/apply-default-acl-0.4.4
@@ -8,5 +8,5 @@ LICENSE=AGPL-3
 RDEPEND=sys-apps/acl
 RESTRICT=test
 SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/apply-default-acl-0.4.3.tar.xz
+SRC_URI=http://michael.orlitzky.com/code/releases/apply-default-acl-0.4.4.tar.xz
 _md5_=a98667f73a8dbd03931a214eefdb7ad1
diff --git a/metadata/md5-cache/sys-apps/bat-0.12.1-r1 b/metadata/md5-cache/sys-apps/bat-0.12.1-r1
index 42ed635c67b7..3ab9114a3d69 100644
--- a/metadata/md5-cache/sys-apps/bat-0.12.1-r1
+++ b/metadata/md5-cache/sys-apps/bat-0.12.1-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlice
 RDEPEND=sys-libs/zlib !>app-backup/bacula-9.2[qt5]
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/assert_cmd/0.11.1/download -> assert_cmd-0.11.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.35/download -> backtrace-0.3.35.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bat/0.12.1/download -> bat-0.12.1.crate https://crates.io/api/v1/crates/bincode/1.1.4/download -> bincode-1.1.4.crate https://crates.io/api/v1/crates/bindgen/0.50.0/download -> bindgen-0.50.0.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.7/download -> blake2b_simd-0.5.7.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.41/download -> cc-1.0.41.crate https://crates.io/api/v1/crates/cexpr/0.3.5/download -> cexpr-0.3.5.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clang-sys/0.28.1/download -> clang-sys-0.28.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clicolors-control/1.0.1/download -> clicolors-control-1.0.1.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/console/0.8.0/download -> console-0.8.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.4.0/download -> escargot-0.4.0.crate https://crates.io/api/v1/crates/escargot/0.5.0/download -> escargot-0.5.0.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/flate2/1.0.11/download -> flate2-1.0.11.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/git2/0.10.0/download -> git2-0.10.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/libgit2-sys/0.9.0/download -> libgit2-sys-0.9.0.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.12/download -> miniz-sys-0.1.12.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.2/download -> miniz_oxide-0.3.2.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/onig/5.0.0/download -> onig-5.0.0.crate https://crates.io/api/v1/crates/onig_sys/69.2.0/download -> onig_sys-69.2.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.15/download -> pkg-config-0.3.15.crate https://crates.io/api/v1/crates/plist/0.4.2/download -> plist-0.4.2.crate https://crates.io/api/v1/crates/predicates/1.0.1/download -> predicates-1.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.2/download -> proc-macro2-1.0.2.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.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.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/redox_users/0.3.1/download -> redox_users-0.3.1.crate https://crates.io/api/v1/crates/regex/1.2.1/download -> regex-1.2.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.11/download -> regex-syntax-0.6.11.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/rust-argon2/0.5.1/download -> rust-argon2-0.5.1.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.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/safemem/0.3.2/download -> safemem-0.3.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.99/download -> serde-1.0.99.crate https://crates.io/api/v1/crates/serde_derive/1.0.99/download -> serde_derive-1.0.99.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/shell-words/0.1.0/download -> shell-words-0.1.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/syntect/3.2.1/download -> syntect-3.2.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/termios/0.3.1/download -> termios-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=14ff49cf5e54928e1afa4495f5cf764b
diff --git a/metadata/md5-cache/sys-apps/bat-0.13.0 b/metadata/md5-cache/sys-apps/bat-0.13.0
index 16ddebe0c3f1..4f631963a91a 100644
--- a/metadata/md5-cache/sys-apps/bat-0.13.0
+++ b/metadata/md5-cache/sys-apps/bat-0.13.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlice
 RDEPEND=sys-libs/zlib !>app-backup/bacula-9.2[qt5]
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anymap/0.12.1/download -> anymap-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/0.12.0/download -> assert_cmd-0.12.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.45/download -> backtrace-0.3.45.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.34/download -> backtrace-sys-0.1.34.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bat/0.13.0/download -> bat-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bindgen/0.50.1/download -> bindgen-0.50.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cexpr/0.3.6/download -> cexpr-0.3.6.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/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clang-sys/0.28.1/download -> clang-sys-0.28.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clicolors-control/1.0.1/download -> clicolors-control-1.0.1.crate https://crates.io/api/v1/crates/console/0.10.0/download -> console-0.10.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/deunicode/1.1.0/download -> deunicode-1.1.0.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/escargot/0.5.0/download -> escargot-0.5.0.crate https://crates.io/api/v1/crates/failure/0.1.7/download -> failure-0.1.7.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.13.0/download -> git2-0.13.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.0+0.99.0/download -> libgit2-sys-0.12.0+0.99.0.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/liquid/0.19.0/download -> liquid-0.19.0.crate https://crates.io/api/v1/crates/liquid-compiler/0.19.0/download -> liquid-compiler-0.19.0.crate https://crates.io/api/v1/crates/liquid-derive/0.19.0/download -> liquid-derive-0.19.0.crate https://crates.io/api/v1/crates/liquid-error/0.19.0/download -> liquid-error-0.19.0.crate https://crates.io/api/v1/crates/liquid-interpreter/0.19.0/download -> liquid-interpreter-0.19.0.crate https://crates.io/api/v1/crates/liquid-value/0.19.1/download -> liquid-value-0.19.1.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/onig/5.0.0/download -> onig-5.0.0.crate https://crates.io/api/v1/crates/onig_sys/69.2.0/download -> onig_sys-69.2.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/plist/0.4.2/download -> plist-0.4.2.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.14/download -> proc-macro-hack-0.5.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/proc-quote/0.2.2/download -> proc-quote-0.2.2.crate https://crates.io/api/v1/crates/proc-quote-impl/0.2.2/download -> proc-quote-impl-0.2.2.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.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.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.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/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/0.1.0/download -> shell-words-0.1.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/smallvec/1.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syntect/3.3.0/download -> syntect-3.3.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/termios/0.3.1/download -> termios-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=bfbc6db5c21b12cabfefa6da421aeb4b
diff --git a/metadata/md5-cache/sys-apps/bat-0.15.0 b/metadata/md5-cache/sys-apps/bat-0.15.0
index 3653c7046daf..bf033c98402f 100644
--- a/metadata/md5-cache/sys-apps/bat-0.15.0
+++ b/metadata/md5-cache/sys-apps/bat-0.15.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlice
 RDEPEND=sys-libs/zlib !>app-backup/bacula-9.2[qt5]
 SLOT=0
 SRC_URI=https://github.com/sharkdp/bat/archive/v0.15.0.tar.gz -> bat-0.15.0.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anymap/0.12.1/download -> anymap-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.46/download -> backtrace-0.3.46.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.36/download -> backtrace-sys-0.1.36.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bindgen/0.50.1/download -> bindgen-0.50.1.crate https://crates.io/api/v1/crates/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.crate https://crates.io/api/v1/crates/cexpr/0.3.6/download -> cexpr-0.3.6.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/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clang-sys/0.28.1/download -> clang-sys-0.28.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clicolors-control/1.0.1/download -> clicolors-control-1.0.1.crate https://crates.io/api/v1/crates/console/0.10.0/download -> console-0.10.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/failure/0.1.7/download -> failure-0.1.7.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fancy-regex/0.3.3/download -> fancy-regex-0.3.3.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.13.3/download -> git2-0.13.3.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.11/download -> hermit-abi-0.1.11.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.3.2/download -> indexmap-1.3.2.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kstring/0.1.0/download -> kstring-0.1.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.4+1.0.0/download -> libgit2-sys-0.12.4+1.0.0.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/liquid/0.20.0/download -> liquid-0.20.0.crate https://crates.io/api/v1/crates/liquid-core/0.20.0/download -> liquid-core-0.20.0.crate https://crates.io/api/v1/crates/liquid-derive/0.20.0/download -> liquid-derive-0.20.0.crate https://crates.io/api/v1/crates/liquid-lib/0.20.0/download -> liquid-lib-0.20.0.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/once_cell/1.3.1/download -> once_cell-1.3.1.crate https://crates.io/api/v1/crates/onig/5.0.0/download -> onig-5.0.0.crate https://crates.io/api/v1/crates/onig_sys/69.2.0/download -> onig_sys-69.2.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/plist/0.5.5/download -> plist-0.5.5.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.15/download -> proc-macro-hack-0.5.15.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/proc-quote/0.3.2/download -> proc-quote-0.3.2.crate https://crates.io/api/v1/crates/proc-quote-impl/0.3.2/download -> proc-quote-impl-0.3.2.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.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.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/serde_derive/1.0.106/download -> serde_derive-1.0.106.crate https://crates.io/api/v1/crates/serde_json/1.0.51/download -> serde_json-1.0.51.crate https://crates.io/api/v1/crates/serde_yaml/0.8.11/download -> serde_yaml-0.8.11.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/0.1.0/download -> shell-words-0.1.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/smallvec/1.3.0/download -> smallvec-1.3.0.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.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syntect/4.1.1/download -> syntect-4.1.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/termios/0.3.2/download -> termios-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.2/download -> xml-rs-0.8.2.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=da489b7e4c53e63b87c31fe01269c395
diff --git a/metadata/md5-cache/sys-apps/bleachbit-3.0 b/metadata/md5-cache/sys-apps/bleachbit-3.0
deleted file mode 100644
index a1acbd559d9a..000000000000
--- a/metadata/md5-cache/sys-apps/bleachbit-3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/gettext 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(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Clean junk to free disk space and to maintain privacy
-EAPI=7
-HOMEPAGE=https://www.bleachbit.org
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/scandir[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://download.bleachbit.org/bleachbit-3.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	89b310c534a033a3566e0f26419daa81	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5fbfe83c68c41597f98d358192594aac
diff --git a/metadata/md5-cache/sys-apps/colorized-logs-2.5 b/metadata/md5-cache/sys-apps/colorized-logs-2.5
index 3eeb31bb76e2..d157977e8535 100644
--- a/metadata/md5-cache/sys-apps/colorized-logs-2.5
+++ b/metadata/md5-cache/sys-apps/colorized-logs-2.5
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tools for logs with ANSI color
 EAPI=7
 HOMEPAGE=https://github.com/kilobyte/colorized-logs/
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kilobyte/colorized-logs/archive/v2.5.tar.gz -> colorized-logs-2.5.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=152ad1a9d9f830f93a57dcda5fb56a39
+_md5_=a8f773a2fa852e7b248fe0448414387b
diff --git a/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2 b/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2
deleted file mode 100644
index 9df4a16e7579..000000000000
--- a/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libatasmart:0= sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive TUI S.M.A.R.T viewer
-EAPI=6
-HOMEPAGE=https://github.com/otakuto/crazydiskinfo
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libatasmart:0= sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/otakuto/crazydiskinfo/archive/1.0.2.tar.gz -> crazydiskinfo-1.0.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b46318b3f3395873cca8cf51357a74c
diff --git a/metadata/md5-cache/sys-apps/crazydiskinfo-1.1.0 b/metadata/md5-cache/sys-apps/crazydiskinfo-1.1.0
index 876cd770cb9b..72dea7073dd8 100644
--- a/metadata/md5-cache/sys-apps/crazydiskinfo-1.1.0
+++ b/metadata/md5-cache/sys-apps/crazydiskinfo-1.1.0
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libatasmart:0= sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/otakuto/crazydiskinfo/archive/1.1.0.tar.gz -> crazydiskinfo-1.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6bad14172814197bd9934c41e2932c7
+_md5_=87452dfdef43d5465f5edd6ff2acf0f2
diff --git a/metadata/md5-cache/sys-apps/exa-0.9.0 b/metadata/md5-cache/sys-apps/exa-0.9.0
index e48aed6ca469..22496539fc0d 100644
--- a/metadata/md5-cache/sys-apps/exa-0.9.0
+++ b/metadata/md5-cache/sys-apps/exa-0.9.0
@@ -11,5 +11,5 @@ RDEPEND=git? ( dev-libs/libgit2:= net-libs/http-parser:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.0/download -> ansi_term-0.12.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.7/download -> datetime-0.4.7.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/exa/0.9.0/download -> exa-0.9.0.crate https://crates.io/api/v1/crates/git2/0.9.1/download -> git2-0.9.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.51/download -> libc-0.2.51.crate https://crates.io/api/v1/crates/libgit2-sys/0.8.1/download -> libgit2-sys-0.8.1.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/number_prefix/0.3.0/download -> number_prefix-0.3.0.crate https://crates.io/api/v1/crates/openssl-src/111.3.0+1.1.1c/download -> openssl-src-111.3.0+1.1.1c.crate https://crates.io/api/v1/crates/openssl-sys/0.9.47/download -> openssl-sys-0.9.47.crate https://crates.io/api/v1/crates/pad/0.1.5/download -> pad-0.1.5.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.8/download -> zoneinfo_compiled-0.4.8.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=fa302ff67e8ed662ab86faccbb89ddb2
diff --git a/metadata/md5-cache/sys-apps/fd-7.4.0 b/metadata/md5-cache/sys-apps/fd-7.4.0
index dd6aa1546c51..7360c72ea780 100644
--- a/metadata/md5-cache/sys-apps/fd-7.4.0
+++ b/metadata/md5-cache/sys-apps/fd-7.4.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v7.4.0.tar.gz -> fd-7.4.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.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.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/ctrlc/3.1.3/download -> ctrlc-3.1.3.crate https://crates.io/api/v1/crates/diff/0.1.11/download -> diff-0.1.11.crate https://crates.io/api/v1/crates/filetime/0.2.7/download -> filetime-0.2.7.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.6.0/download -> lscolors-0.6.0.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.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/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=28149f97c49d51e8d86fa4afbcb06c4b
diff --git a/metadata/md5-cache/sys-apps/fd-7.5.0 b/metadata/md5-cache/sys-apps/fd-7.5.0
index 7ea113263297..f39c2fe0cc55 100644
--- a/metadata/md5-cache/sys-apps/fd-7.5.0
+++ b/metadata/md5-cache/sys-apps/fd-7.5.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v7.5.0.tar.gz -> fd-7.5.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.4/download -> ctrlc-3.1.4.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/fd-find/7.5.0/download -> fd-find-7.5.0.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/ignore/0.4.12/download -> ignore-0.4.12.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.6.0/download -> lscolors-0.6.0.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=054fd6a8e6618aefd4338aae5a8ffbc0
diff --git a/metadata/md5-cache/sys-apps/fd-8.0.0 b/metadata/md5-cache/sys-apps/fd-8.0.0
index 31c8030c2099..b876f2950d30 100644
--- a/metadata/md5-cache/sys-apps/fd-8.0.0
+++ b/metadata/md5-cache/sys-apps/fd-8.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v8.0.0.tar.gz -> fd-8.0.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.28/download -> anyhow-1.0.28.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.4/download -> ctrlc-3.1.4.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/fd-find/8.0.0/download -> fd-find-8.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.9/download -> filetime-0.2.9.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.11/download -> hermit-abi-0.1.11.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/ignore/0.4.14/download -> ignore-0.4.14.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.7.0/download -> lscolors-0.7.0.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/regex/1.3.6/download -> regex-1.3.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.4/download -> winapi-util-0.1.4.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=dddb6b7149d6285ca7bb8eadacf892c6
diff --git a/metadata/md5-cache/sys-apps/fd-8.1.1 b/metadata/md5-cache/sys-apps/fd-8.1.1
index 3f5ccc9ad1d7..73117da49054 100644
--- a/metadata/md5-cache/sys-apps/fd-8.1.1
+++ b/metadata/md5-cache/sys-apps/fd-8.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v8.1.1.tar.gz -> fd-8.1.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.31/download -> anyhow-1.0.31.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.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.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.4/download -> ctrlc-3.1.4.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/fd-find/8.1.1/download -> fd-find-8.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/ignore/0.4.15/download -> ignore-0.4.15.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.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.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.7.0/download -> lscolors-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f0f26f3c87e0cf01aae253a4cba243a
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.1.0 b/metadata/md5-cache/sys-apps/hwloc-2.1.0
index ec65723a84ef..97646e9693ff 100644
--- a/metadata/md5-cache/sys-apps/hwloc-2.1.0
+++ b/metadata/md5-cache/sys-apps/hwloc-2.1.0
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) libudev? ( virtual/libudev ) netloc? ( !sys-apps/netloc ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=7
-HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
+HOMEPAGE=https://www.open-mpi.org/projects/hwloc/
 IUSE=cairo +cpuid cuda debug gl libudev netloc nvml +pci plugins static-libs svg xml 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
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) libudev? ( virtual/libudev ) netloc? ( !sys-apps/netloc ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/15
-SRC_URI=http://www.open-mpi.org/software/hwloc/v2.1/downloads/hwloc-2.1.0.tar.bz2
+SRC_URI=https://www.open-mpi.org/software/hwloc/v2.1/downloads/hwloc-2.1.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f73201737ebfc850ee68ad52f2e235b4
+_md5_=e7f9e08751375a0acb69896c059d7a29
diff --git a/metadata/md5-cache/sys-apps/lsd-0.16.0 b/metadata/md5-cache/sys-apps/lsd-0.16.0
index bea4a168c4f2..d2cc00578e4e 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.16.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.16.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.16.0.tar.gz -> lsd-0.16.0.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.55/download -> libc-0.2.55.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/lsd/0.16.0/download -> lsd-0.16.0.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempfile/3.0.8/download -> tempfile-3.0.8.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=fa32ddaf1d7e4da703fd6d2301d11bcf
diff --git a/metadata/md5-cache/sys-apps/lsd-0.17.0 b/metadata/md5-cache/sys-apps/lsd-0.17.0
index ce645816b35b..031c038d3771 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.17.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.17.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.17.0.tar.gz -> lsd-0.17.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/0.11.1/download -> assert_cmd-0.11.1.crate https://crates.io/api/v1/crates/assert_fs/0.11.3/download -> assert_fs-0.11.3.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.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/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.9/download -> chrono-0.4.9.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/escargot/0.4.0/download -> escargot-0.4.0.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/globwalk/0.5.0/download -> globwalk-0.5.0.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.65/download -> libc-0.2.65.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.6.0/download -> lscolors-0.6.0.crate https://crates.io/api/v1/crates/lsd/0.17.0/download -> lsd-0.17.0.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.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/predicates/1.0.1/download -> predicates-1.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.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/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.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/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.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.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.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/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=5161828779db264fd3cf8295226fc6c7
diff --git a/metadata/md5-cache/sys-apps/man-db-2.9.2 b/metadata/md5-cache/sys-apps/man-db-2.9.2
new file mode 100644
index 000000000000..a59bec896db3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-db-2.9.2
@@ -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.2.tar.xz
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=90841d55ce5e657c95f094c69ebcc493
diff --git a/metadata/md5-cache/sys-apps/man-db-9999 b/metadata/md5-cache/sys-apps/man-db-9999
index 3331ba34786a..67859f4c16d5 100644
--- a/metadata/md5-cache/sys-apps/man-db-9999
+++ b/metadata/md5-cache/sys-apps/man-db-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 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
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=4c223c29e6f38f58ab4b57ee288daa37
+_md5_=90841d55ce5e657c95f094c69ebcc493
diff --git a/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1 b/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
index f9ba45915129..5017e98a7a4a 100644
--- a/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
+++ b/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst setup
 DESCRIPTION=NewRelic System Monitor
 EAPI=6
-HOMEPAGE=http://www.newrelic.com/
+HOMEPAGE=https://www.newrelic.com/
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=newrelic Apache-2.0 MIT ISC openssl GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.newrelic.com/server_monitor/archive/1.1.2.124/newrelic-sysmond-1.1.2.124-linux.tar.gz
 _eclasses_=user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=0cb671061e919a743debd7f1cf6267e2
+_md5_=5472fdffb8fa1da0952d9d17f7c33ae3
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.100 b/metadata/md5-cache/sys-apps/portage-2.3.100-r1
similarity index 95%
rename from metadata/md5-cache/sys-apps/portage-2.3.100
rename to metadata/md5-cache/sys-apps/portage-2.3.100-r1
index c1ce026bee45..f98f24f82db1 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.100
+++ b/metadata/md5-cache/sys-apps/portage-2.3.100-r1
@@ -10,6 +10,6 @@ PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.
 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.100.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.100.tar.bz2
+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	89b310c534a033a3566e0f26419daa81	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1df76b00d953ae88baafcf21151b44b
+_md5_=3e51038c74b852d16400994039288a89
diff --git a/metadata/md5-cache/sys-apps/qdirstat-1.6.1 b/metadata/md5-cache/sys-apps/qdirstat-1.6.1
index 1ba697fec01b..726ce8e114ae 100644
--- a/metadata/md5-cache/sys-apps/qdirstat-1.6.1
+++ b/metadata/md5-cache/sys-apps/qdirstat-1.6.1
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-libs/zlib
 DESCRIPTION=Qt-based directory statistics
 EAPI=7
 HOMEPAGE=https://github.com/shundhammer/qdirstat
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-libs/zlib dev-lang/perl dev-perl/URI
 SLOT=0
 SRC_URI=https://github.com/shundhammer/qdirstat/archive/1.6.1.tar.gz -> qdirstat-1.6.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ee6526c9a14e7dfd341c102e823affc
+_md5_=1ab11b9bc796c2bf48fabe03f0d85363
diff --git a/metadata/md5-cache/sys-apps/ripgrep-11.0.2 b/metadata/md5-cache/sys-apps/ripgrep-11.0.2
index 134a3c79c447..c581d152bbcf 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-11.0.2
+++ b/metadata/md5-cache/sys-apps/ripgrep-11.0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/11.0.2.tar.gz -> ripgrep-11.0.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.4/download -> aho-corasick-0.7.4.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.6/download -> bstr-0.2.6.crate https://crates.io/api/v1/crates/bytecount/0.5.1/download -> bytecount-0.5.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.38/download -> cc-1.0.38.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.17/download -> encoding_rs-0.8.17.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.6/download -> encoding_rs_io-0.1.6.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.7/download -> getrandom-0.1.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.60/download -> libc-0.2.60.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.1/download -> pcre2-0.2.1.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.2/download -> pcre2-sys-0.2.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.15/download -> pkg-config-0.3.15.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/rand/0.7.0/download -> rand-0.7.0.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.0/download -> rand_core-0.5.0.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/regex/1.2.0/download -> regex-1.2.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.10/download -> regex-syntax-0.6.10.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.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.98/download -> serde-1.0.98.crate https://crates.io/api/v1/crates/serde_derive/1.0.98/download -> serde_derive-1.0.98.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.42/download -> syn-0.15.42.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.5/download -> ucd-util-0.1.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.3/download -> utf8-ranges-1.0.3.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=75d94478fa02aadb88e6371cea2f649e
diff --git a/metadata/md5-cache/sys-apps/ripgrep-12.0.1 b/metadata/md5-cache/sys-apps/ripgrep-12.0.1
index 5c08026720f7..a1ce5222ab0f 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-12.0.1
+++ b/metadata/md5-cache/sys-apps/ripgrep-12.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/12.0.1.tar.gz -> ripgrep-12.0.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bytecount/0.6.0/download -> bytecount-0.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/encoding_rs/0.8.22/download -> encoding_rs-0.8.22.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/grep/0.2.5/download -> grep-0.2.5.crate https://crates.io/api/v1/crates/grep-cli/0.1.4/download -> grep-cli-0.1.4.crate https://crates.io/api/v1/crates/grep-matcher/0.1.4/download -> grep-matcher-0.1.4.crate https://crates.io/api/v1/crates/grep-pcre2/0.1.4/download -> grep-pcre2-0.1.4.crate https://crates.io/api/v1/crates/grep-printer/0.1.4/download -> grep-printer-0.1.4.crate https://crates.io/api/v1/crates/grep-regex/0.1.7/download -> grep-regex-0.1.7.crate https://crates.io/api/v1/crates/grep-searcher/0.1.7/download -> grep-searcher-0.1.7.crate https://crates.io/api/v1/crates/hermit-abi/0.1.9/download -> hermit-abi-0.1.9.crate https://crates.io/api/v1/crates/ignore/0.4.14/download -> ignore-0.4.14.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.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.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.3/download -> pcre2-0.2.3.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.2/download -> pcre2-sys-0.2.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/regex/1.3.6/download -> regex-1.3.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.crate https://crates.io/api/v1/crates/serde_json/1.0.50/download -> serde_json-1.0.50.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.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.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/thread_local/1.0.1/download -> thread_local-1.0.1.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/walkdir/2.3.1/download -> walkdir-2.3.1.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-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=405d88ee0515ab036913f7cb98d7e364
diff --git a/metadata/md5-cache/sys-apps/ripgrep-12.1.1 b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
index 36e2097d8c89..fea1f0558f69 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-12.1.1
+++ b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/12.1.1.tar.gz -> ripgrep-12.1.1.tar.gz https://github.com/BurntSushi/ripgrep/releases/download/12.1.1/ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.12.1/download -> base64-0.12.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/bytecount/0.6.0/download -> bytecount-0.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.54/download -> cc-1.0.54.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.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.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.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.3/download -> pcre2-0.2.3.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.2/download -> pcre2-sys-0.2.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.17/download -> proc-macro2-1.0.17.crate https://crates.io/api/v1/crates/quote/1.0.6/download -> quote-1.0.6.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.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.27/download -> syn-1.0.27.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.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/thread_local/1.0.1/download -> thread_local-1.0.1.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/walkdir/2.3.1/download -> walkdir-2.3.1.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-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d21d5387a1ff182599e22027822bac68
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.10 b/metadata/md5-cache/sys-apps/rng-tools-6.10
index fd8b30caf2ad..bf707da1fbf4 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-6.10
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.10
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:0= sys-fs/sysfsutils jitterentropy? ( app-crypt/jittere
 SLOT=0
 SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.10.tar.gz -> rng-tools-6.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=478da4fbad2441f6c666db3be65567ec
+_md5_=417657682fb6fa69e5420293ffe2d5fd
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.18 b/metadata/md5-cache/sys-apps/sandbox-2.18
index 157c0de5a922..9623244f3d40 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.18
+++ b/metadata/md5-cache/sys-apps/sandbox-2.18
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/sandbox-2.18.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=e0c200ce46fcd1cced29dff6e8b5f5a5
+_md5_=52f980d8128fe2ddd66f077f55c7e435
diff --git a/metadata/md5-cache/sys-apps/systemd-244.3 b/metadata/md5-cache/sys-apps/systemd-244.3
index fc2dc1c26cc9..d2f48f3d4322 100644
--- a/metadata/md5-cache/sys-apps/systemd-244.3
+++ b/metadata/md5-cache/sys-apps/systemd-244.3
@@ -5,7 +5,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -14,4 +14,4 @@ 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	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	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	d3e75048a89c0445838d2f44e5c65d97	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=b7b85616c9502a6477ec5a5a9a6f76c2
+_md5_=9b2023a3eee1ae729306dfa723d78737
diff --git a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2 b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
index 762036353e03..b91623e807df 100644
--- a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
+++ b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.40:2
 DESCRIPTION=Filtering proxy for D-Bus connections
 EAPI=7
 HOMEPAGE=https://github.com/flatpak/xdg-dbus-proxy
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
-_md5_=5d500a2520d236a3e29774b1c74677a4
+_md5_=3533380173485c0594ed07db32a4d27b
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 04744d8a0aed..1c5d42371bf7 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/realtime-base-0.1 b/metadata/md5-cache/sys-auth/realtime-base-0.1
index 79f38c04824c..f13fb33bb960 100644
--- a/metadata/md5-cache/sys-auth/realtime-base-0.1
+++ b/metadata/md5-cache/sys-auth/realtime-base-0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst setup
 DESCRIPTION=Sets up realtime scheduling
 EAPI=6
-HOMEPAGE=http://jackaudio.org/faq/linux_rt_config.html
+HOMEPAGE=https://jackaudio.org/faq/linux_rt_config.html
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=public-domain
 RDEPEND=sys-libs/pam
 SLOT=0
 _eclasses_=user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=eeb409bea05e4cb58edf814fab1ebd64
+_md5_=0857b73eabad0bf325a427cd00392f88
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 59d22a6f7dba..f749568b3a78 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0 b/metadata/md5-cache/sys-block/blktrace-1.1.0
index a389b64a08ed..e73c6ebb94c3 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare setup
 DEPEND=sys-kernel/linux-headers doc? ( virtual/latex-base >=app-text/texlive-core-2014 ) dev-libs/libaio
 DESCRIPTION=btrace can show detailed info about what is happening on a block device io queue
 EAPI=5
-HOMEPAGE=http://git.kernel.dk/cgit/blktrace/
+HOMEPAGE=https://git.kernel.dk/cgit/blktrace/
 IUSE=doc kernel_linux
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ebebae1dc463abe3f92d140ff9100a4
+_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 f76e1c0a39f1..09fab9e13292 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install setup
 DEPEND=dev-libs/libaio sys-kernel/linux-headers doc? ( virtual/latex-base >=app-text/texlive-core-2014 )
 DESCRIPTION=btrace can show detailed info about what is happening on a block device io queue
 EAPI=6
-HOMEPAGE=http://git.kernel.dk/cgit/blktrace/
+HOMEPAGE=https://git.kernel.dk/cgit/blktrace/
 IUSE=doc kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b73b619f690ce295e8b407716e1088f5
+_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 f70de3d46d0f..83eae6c71b60 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.2.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.2.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install setup
 DEPEND=dev-libs/libaio sys-kernel/linux-headers doc? ( virtual/latex-base >=app-text/texlive-core-2014 )
 DESCRIPTION=show detailed info about what is happening on a block device io queue
 EAPI=6
-HOMEPAGE=http://git.kernel.dk/cgit/blktrace/
+HOMEPAGE=https://git.kernel.dk/cgit/blktrace/
 IUSE=doc kernel_linux
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2
+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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a51be9223a2efe6a53b080a45683630
+_md5_=fb677ef0bb6ebc79d19cbed0258d60e3
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index c109bf6e7fa3..f422ef7912c3 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/colo-1.22 b/metadata/md5-cache/sys-boot/colo-1.22
index 443201bd1749..cabc468c753d 100644
--- a/metadata/md5-cache/sys-boot/colo-1.22
+++ b/metadata/md5-cache/sys-boot/colo-1.22
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=CObalt LOader - Modern bootloader for Cobalt MIPS machines
 EAPI=6
-HOMEPAGE=http://www.colonel-panic.org/cobalt-mips/
+HOMEPAGE=https://www.colonel-panic.org/cobalt-mips/
 KEYWORDS=-* ~mips
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
-SRC_URI=http://www.colonel-panic.org/cobalt-mips/colo/colo-1.22.tar.gz
+SRC_URI=https://www.colonel-panic.org/cobalt-mips/colo/colo-1.22.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=532d723fb6dd6501d8bb8858daf9b13b
+_md5_=b23f6b34dfa3b91205b8ff396a51788b
diff --git a/metadata/md5-cache/sys-boot/silo-1.4.14_p20200602 b/metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
new file mode 100644
index 000000000000..06798bf6ed53
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend unpack
+DEPEND=sys-fs/e2fsprogs sys-apps/sparc-utils
+DESCRIPTION=SPARC/UltraSPARC Improved Loader, a boot loader for sparc
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary
+IUSE=tilo-only
+KEYWORDS=-* ~sparc
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/silo-9277bfd433e398d0a6eabec79edead52d4cb8125.tar.gz -> silo-1.4.14_p20200602.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=89e2a5ed6929def7c34449e5462a4e76
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5e83f07ec932..131e319f3c39 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.3 b/metadata/md5-cache/sys-cluster/ceph-15.2.3
index cfbe363aec19..c2c153b50888 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.3
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.3
@@ -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	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	89b310c534a033a3566e0f26419daa81	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82e33991348151db4ca8c8d563c5a0e9
+_md5_=fe2cf1d3c92e585f0ee25dd59b52b24c
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.25 b/metadata/md5-cache/sys-cluster/galera-25.3.25
index ce786799c11d..c6556e1431c0 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.25
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.25
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
-HOMEPAGE=http://galeracluster.com
+HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.25.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=827bd88329bd4912e7583e8695eaa717
+_md5_=5f708cce464c62ec0c4111b7d6b995d2
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.26 b/metadata/md5-cache/sys-cluster/galera-25.3.26
index 84377ff441d6..e9f7d99266fb 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.26
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.26
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
-HOMEPAGE=http://galeracluster.com
+HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/galera-25.3.26/src/galera-25.3.26.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f173d6604f84c8b3aa99aad5ae4aeb75
+_md5_=b9d69e4d5ab895a4f2534bcc85777910
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.28 b/metadata/md5-cache/sys-cluster/galera-25.3.28
index 08799772aba9..7997f0ea41ec 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.28
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.28
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
-HOMEPAGE=http://galeracluster.com
+HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/galera-25.3.28/src/galera-25.3.28.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=213391c3107a51d3dc7e4ea56ca744c5
+_md5_=837fc0e20ba876d6232e686227d7065a
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.28-r1 b/metadata/md5-cache/sys-cluster/galera-25.3.28-r1
index 67eee216bc8b..5126941ee93c 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.28-r1
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.28-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
-HOMEPAGE=http://galeracluster.com
+HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/galera-25.3.28/src/galera-25.3.28.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=97cf805b03ad4103ceb02e29aa13767d
+_md5_=eaf5e8ea1812b522382e95da5e4cd7c2
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.2 b/metadata/md5-cache/sys-cluster/galera-26.4.2
index 871dc89a5519..89bff41cea35 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.2
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
-HOMEPAGE=http://galeracluster.com
+HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/galera-26.4.2/src/galera-26.4.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=1573c88d8895cfb17ee6013f60d91a2e
+_md5_=34cfb8e8da6af7f5edabc666c7076761
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.3 b/metadata/md5-cache/sys-cluster/galera-26.4.3
index 3da59dce2e18..b6b30ae3bd59 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.3
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
-HOMEPAGE=http://galeracluster.com
+HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/galera-26.4.3/src/galera-26.4.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=c8608d5377e029bb766f5f72c92769c6
+_md5_=d2f5789d34ac3bf445a30df753a14f2a
diff --git a/metadata/md5-cache/sys-cluster/keepalived-2.0.20 b/metadata/md5-cache/sys-cluster/keepalived-2.0.20
index dc8721052cc7..3fcb909641bc 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-2.0.20
+++ b/metadata/md5-cache/sys-cluster/keepalived-2.0.20
@@ -5,10 +5,10 @@ DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server pro
 EAPI=7
 HOMEPAGE=https://www.keepalived.org/
 IUSE=+bfd dbus -json regex snmp
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 regex? ( >=dev-libs/libpcre2-8 ) dbus? ( sys-apps/dbus dev-libs/glib:2 ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
 SLOT=0
 SRC_URI=https://www.keepalived.org/software/keepalived-2.0.20.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=844d55e8adddc8f202a88c812bf77696
+_md5_=cfeedae235d02a90f45d4bbdeed8c53e
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f6301db65e8b..8c8f35eb5ad4 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
index 2598b3baf5c1..ece4fd9a37ae 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=6.5.0
-SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	26ed66a1cb3d078a5499359bf03a6349	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=ffce34a2fa7419fe0c6c4d5fd464480b
+_md5_=09e172f2325a592bc7cf272e4df26c72
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r2 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r2
index 8eb52b108ead..819680430326 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r2
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=6.5.0
-SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	26ed66a1cb3d078a5499359bf03a6349	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=69af1463d8c31767fee3eec0c56f3648
+_md5_=a50db549def8e2246e9baffa58530f4f
diff --git a/metadata/md5-cache/sys-devel/llvmgold-10 b/metadata/md5-cache/sys-devel/llvmgold-10
index 9ea2244bc943..191c5002c1dd 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-10
+++ b/metadata/md5-cache/sys-devel/llvmgold-10
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:10[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=0ca0e2014eb1a7dd2d7514480cd7fbd2
+_md5_=0146571a7c05812e099e6def0e24317a
diff --git a/metadata/md5-cache/sys-devel/llvmgold-8 b/metadata/md5-cache/sys-devel/llvmgold-8
index d89d3f3b4b7e..158eb082c819 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-8
+++ b/metadata/md5-cache/sys-devel/llvmgold-8
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:8[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=4c5e318d86ecd9d8474b768a7a135252
+_md5_=baddf499185d15a2edc71e33259e70c3
diff --git a/metadata/md5-cache/sys-devel/llvmgold-9 b/metadata/md5-cache/sys-devel/llvmgold-9
index d4b981b399cb..e7301aa09312 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-9
+++ b/metadata/md5-cache/sys-devel/llvmgold-9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:9[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=9cc465798748a738eb6e87ff6c3031fa
+_md5_=5003580d2b4450d5151101028dc8e2b4
diff --git a/metadata/md5-cache/sys-devel/prelink-99999999 b/metadata/md5-cache/sys-devel/prelink-99999999
index f534b5e1e171..ab15dddc34a6 100644
--- a/metadata/md5-cache/sys-devel/prelink-99999999
+++ b/metadata/md5-cache/sys-devel/prelink-99999999
@@ -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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst prepare unpack
+DEFINED_PHASES=configure install postinst prepare test unpack
 DEPEND=>=dev-libs/elfutils-0.100 selinux? ( sys-libs/libselinux ) !dev-libs/libelf sys-libs/binutils-libs
 DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
 EAPI=7
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/elfutils-0.100 selinux? ( sys-libs/libselinux ) !dev-libs/libelf
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=f24c507d5b2513773e7bfc8025293dbf
+_md5_=6535f0317d540b6e192c7feb87414b95
diff --git a/metadata/md5-cache/sys-devel/qconf-2.3 b/metadata/md5-cache/sys-devel/qconf-2.3
deleted file mode 100644
index 89756868dbec..000000000000
--- a/metadata/md5-cache/sys-devel/qconf-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
-DESCRIPTION=./configure like generator for qmake-based projects
-EAPI=6
-HOMEPAGE=https://github.com/psi-plus/qconf
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=http://psi-im.org/files/qconf/qconf-2.3.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=6c5d28665f3568e821f6061e71df34d9
diff --git a/metadata/md5-cache/sys-devel/qconf-2.4 b/metadata/md5-cache/sys-devel/qconf-2.4
deleted file mode 100644
index b4af41fbc5a7..000000000000
--- a/metadata/md5-cache/sys-devel/qconf-2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
-DESCRIPTION=./configure like generator for qmake-based projects
-EAPI=6
-HOMEPAGE=https://github.com/psi-plus/qconf
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=http://psi-im.org/files/qconf/qconf-2.4.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=611c2eeeb669cdf88a3b28af3b4a4c0e
diff --git a/metadata/md5-cache/sys-devel/qconf-2.5 b/metadata/md5-cache/sys-devel/qconf-2.5
index 7e3c3c738aa5..ad88996de6b9 100644
--- a/metadata/md5-cache/sys-devel/qconf-2.5
+++ b/metadata/md5-cache/sys-devel/qconf-2.5
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
 DESCRIPTION=./configure like generator for qmake-based projects
 EAPI=7
 HOMEPAGE=https://github.com/psi-im/qconf
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/psi-im/qconf/archive/v2.5.tar.gz -> qconf-2.5.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=a0161104c31e2d25c16fedcdb876a51f
+_md5_=4e4de0ce2bfdea1651d0bd4a434d18fd
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 8b983bfe8dc4..f5d9ce17bd89 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20200508_p20200508 b/metadata/md5-cache/sys-firmware/intel-microcode-20200520_p20200601
similarity index 91%
rename from metadata/md5-cache/sys-firmware/intel-microcode-20200508_p20200508
rename to metadata/md5-cache/sys-firmware/intel-microcode-20200520_p20200601
index 29bad07f56b7..8b851212312b 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20200508_p20200508
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20200520_p20200601
@@ -10,6 +10,6 @@ RDEPEND=hostonly? ( sys-apps/iucode_tool )
 REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20200508.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20200508.tar.xz
+SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20200520.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20200601.tar.xz
 _eclasses_=linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=a59d353a58b037113bb23649974333d7
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index df344a7da2f9..09709085a35a 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.14.2 b/metadata/md5-cache/sys-fs/ncdu-1.14.2
index 79bd2bdc6ea7..9ae1cba8ef83 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.14.2
+++ b/metadata/md5-cache/sys-fs/ncdu-1.14.2
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
 DESCRIPTION=NCurses Disk Usage
 EAPI=7
 HOMEPAGE=https://dev.yorhel.nl/ncdu/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-1.14.2.tar.gz
-_md5_=6b3980a0a51484e3e09e08eb7f28e851
+_md5_=2b77d464fe6ea4991acf27f3868064b5
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.14.1 b/metadata/md5-cache/sys-fs/ncdu-1.15
similarity index 52%
rename from metadata/md5-cache/sys-fs/ncdu-1.14.1
rename to metadata/md5-cache/sys-fs/ncdu-1.15
index 3fe9a3c36e4b..4e82cfd66997 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.14.1
+++ b/metadata/md5-cache/sys-fs/ncdu-1.15
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
 DESCRIPTION=NCurses Disk Usage
 EAPI=7
 HOMEPAGE=https://dev.yorhel.nl/ncdu/
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode]
 SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdu-1.14.1.tar.gz
-_md5_=2b77d464fe6ea4991acf27f3868064b5
+SRC_URI=https://dev.yorhel.nl/download/ncdu-1.15.tar.gz
+_md5_=6b3980a0a51484e3e09e08eb7f28e851
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 e66b6644a8cc..60417c7c81a1 100644
--- a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
+++ b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-lang/perl:= ) parport? ( sys-kernel/linux-headers ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Access 1-Wire devices like a filesystem
 EAPI=6
-HOMEPAGE=http://owfs.org/ https://sourceforge.net/projects/owfs/
+HOMEPAGE=https://owfs.org/ https://sourceforge.net/projects/owfs/
 IUSE=debug ftdi ftpd fuse httpd parport perl python tcl usb zeroconf python_targets_python2_7 kernel_linux
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ 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	89b310c534a033a3566e0f26419daa81	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5633734ec7af1a99ef8371a9c76f3c7d
+_md5_=803eaa94637e9883c16c2edcac23fb00
diff --git a/metadata/md5-cache/sys-fs/sandboxfs-0.1.1 b/metadata/md5-cache/sys-fs/sandboxfs-0.1.1
index dd18840b5d0e..4f501ea4630e 100644
--- a/metadata/md5-cache/sys-fs/sandboxfs-0.1.1
+++ b/metadata/md5-cache/sys-fs/sandboxfs-0.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense
 RDEPEND=sys-fs/fuse:0 profile? ( dev-util/google-perftools )
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-0.1.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/arc-swap/0.4.5/download -> arc-swap-0.4.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/backtrace/0.3.46/download -> backtrace-0.3.46.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.35/download -> backtrace-sys-0.1.35.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/cpuprofiler/0.0.4/download -> cpuprofiler-0.0.4.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/failure/0.1.7/download -> failure-0.1.7.crate https://crates.io/api/v1/crates/failure_derive/0.1.7/download -> failure_derive-0.1.7.crate https://crates.io/api/v1/crates/fuse/0.3.1/download -> fuse-0.3.1.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/hermit-abi/0.1.10/download -> hermit-abi-0.1.10.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.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.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.12.1/download -> nix-0.12.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.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.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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/regex/1.3.6/download -> regex-1.3.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.crate https://crates.io/api/v1/crates/serde_json/1.0.50/download -> serde_json-1.0.50.crate https://crates.io/api/v1/crates/signal-hook/0.1.13/download -> signal-hook-0.1.13.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.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/thread-scoped/1.0.2/download -> thread-scoped-1.0.2.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.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/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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-util/0.1.4/download -> winapi-util-0.1.4.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	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=9316e4b6b12e944da6e381fb79620cea
diff --git a/metadata/md5-cache/sys-fs/sandboxfs-0.2.0 b/metadata/md5-cache/sys-fs/sandboxfs-0.2.0
index 942b40b6b336..bf2a55af804e 100644
--- a/metadata/md5-cache/sys-fs/sandboxfs-0.2.0
+++ b/metadata/md5-cache/sys-fs/sandboxfs-0.2.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense
 RDEPEND=sys-fs/fuse:0 profile? ( dev-util/google-perftools )
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-0.2.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/backtrace/0.3.46/download -> backtrace-0.3.46.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.37/download -> backtrace-sys-0.1.37.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.52/download -> cc-1.0.52.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/cpuprofiler/0.0.4/download -> cpuprofiler-0.0.4.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/failure/0.1.7/download -> failure-0.1.7.crate https://crates.io/api/v1/crates/failure_derive/0.1.7/download -> failure_derive-0.1.7.crate https://crates.io/api/v1/crates/fuse/0.3.1/download -> fuse-0.3.1.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.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.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.12.1/download -> nix-0.12.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.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.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.4/download -> quote-1.0.4.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/sandboxfs/0.2.0/download -> sandboxfs-0.2.0.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/serde_derive/1.0.106/download -> serde_derive-1.0.106.crate https://crates.io/api/v1/crates/serde_json/1.0.52/download -> serde_json-1.0.52.crate https://crates.io/api/v1/crates/signal-hook/0.1.14/download -> signal-hook-0.1.14.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/syn/1.0.18/download -> syn-1.0.18.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/thread-scoped/1.0.2/download -> thread-scoped-1.0.2.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/threadpool/1.8.0/download -> threadpool-1.8.0.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.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/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate
-_eclasses_=cargo	4cfad681317daaca938cc223bc0166a3	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	d8e0b70112b94f60618f3def70bfb16e	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e64db95595c8f362e13e39eef53329da
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b2a5b095ba84..dda38edb7528 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
index 09e8d614790e..ee1cc313e753 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.138
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-147.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-147.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-147.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-147.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-147.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-147.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-147.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-147.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-147.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1817b7410db36769e68b59d72f5e968b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
index 3fce8949c7e8..744ee76a30ae 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.143
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-152.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-152.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-152.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-152.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-152.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-152.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-152.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-152.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-152.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdebd609d79dcb0a52d7e36641da6b3d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
index 8316c2d872b8..bf80e1c102df 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.144
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-153.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-153.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-153.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-153.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-153.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-153.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-153.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-153.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aa8afe5a7f31110d53f424fc3c8d590
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
index 0195a92be56b..04e86c36c660 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.145
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-154.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-154.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-154.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-154.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-154.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-154.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-154.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-154.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-154.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21db3be65d3e9cdaaa84d5bf9ba3a8dd
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
index 87037b3d1b1e..eb7e6a5a1a23 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.146
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-155.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-155.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-155.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-155.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-155.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-155.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-155.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-155.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-155.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fa0b3c45d68849861a0e7ea18e4cf97
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
index 0148b23fb23e..572c9a8ead32 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.147
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-156.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-156.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-156.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-156.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-156.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-156.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-156.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-156.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-156.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=902485ef69809fb8c813263eb2a10070
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
index ed5acdf6309f..505f7c3eb3de 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.148
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-157.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-157.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-157.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-157.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-157.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-157.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-157.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2a70c765a6a64441271e738e92dc7d8
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
index 722b4fb0cb00..b0154cf0431f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.149
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-158.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-158.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-158.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-158.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-158.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-158.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-158.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-158.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0cca2dabba47dcaafef89c714f7a6ffc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
index 46d601291e2e..a371af9be6f6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.150
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20191021.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-159.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-159.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-159.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-159.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-159.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-159.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-159.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-159.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf984944c0282e0e7f2a5b8c29815e6c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
index 194f948033a9..9d9a0ab3c495 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.66
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-66.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-66.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-66.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-66.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-66.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-66.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-66.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-66.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-66.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a0a5f9b9ee27dca68d154ff61399290
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
index c3ecfeaa946b..258fc334d509 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.72
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-71.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-71.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-71.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-71.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-71.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-71.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-71.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-71.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-71.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a176205d50a8c548c21ad6705f442dbd
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
index fb2531a3316c..6427f41c522b 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.73
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-72.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-72.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-72.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-72.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-72.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-72.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-72.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-72.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-72.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4927148c0a23a82ac194c833244e78c0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
index a658efa165d7..b34d173ad111 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.74
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-73.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-73.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-73.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-73.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-73.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-73.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-73.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-73.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-73.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a51879bf7bdb0161f7525a5bd7776301
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
index 34a1ba552361..a2662a4c320d 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.75
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-74.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-74.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-74.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-74.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-74.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-74.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-74.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-74.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d61a1f12915ff94898410e9d67426080
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
index 2d0d8c0312b3..2f37c1b926e6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.76
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-75.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-75.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-75.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-75.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-75.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-75.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-75.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-75.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aedbcdbed154c377dea8c5b766e7bb75
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
index 8b4fab137d1f..786b64713540 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.77
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-76.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-76.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-76.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-76.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-76.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-76.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-76.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-76.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4bd61e56e4a33ec2535a6ffc49f0941d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
index cfeceef736c4..b3ea4a753f35 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.78
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-77.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-77.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-77.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-77.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-77.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-77.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-77.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-77.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-77.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a59de7fd069601cec1447204b28c20b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
index 0d0972aff74c..b6366f894c23 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.79
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-78.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-78.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-78.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-78.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-78.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-78.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-78.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-78.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0690208d5a5d8b770d061c551fda734b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
index c6f0336171c7..2a942a5d9de9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.80
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.63+_p20191021.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-79.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-79.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-79.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-79.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-79.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-79.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-79.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-79.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=716d6b05b93761def5446a6f82dfb978
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
index 6c72aa8c77f2..948ea382076c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.13
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-13.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0a21e956219e543aed57261997cdb24
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
index 2ede8c204ce1..c3b176dab3e4 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.14
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-14.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-14.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-14.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-14.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e534a5a28c6aca499e8d449213b155a4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
index 6c4f7cccc46e..550ddc898ecc 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.15
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-15.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=963e2b1722c7ce2e1e8f62656e5384a1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
index 518207f97e2a..b1dd146a114b 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.16
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-16.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-16.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-16.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-16.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-16.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-16.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-16.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-16.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=04589113582263adf3e6665a5f751385
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
index e341df869a46..996c79e1dab7 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-17.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aab04cdca543f8f4464452e47f4b2e9b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
index b85368e90190..7379a63c533d 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.18
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-18.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-18.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-18.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-18.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-18.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-18.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-18.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfa7662a75e144658d6c1cc769dea6e0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
index 12e396b14cf0..1ab648b02c3f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.19
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-19.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a553b0e114bdd76a1da030206ce9a8e6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
index 4fe7335d5167..ebfbb6d959a3 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.20
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2.5+_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-20.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-20.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.2-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.2-20.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.2-20.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c71a565a756fb6e4f106f3aed71bddc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
index 6034e7c2c701..15d9a7c5b425 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-2.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfc412a0c5daa06d731d1d580ecdf8d6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
index 65849361842e..a687ef255a1e 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-3.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=334e4a82ed776a57b4d8d2ae502167cb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
index fe2551e7ddb3..07295f5af91f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-4.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fd837a03c9917ccbfb29a375602fa37
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
index 94968d7f44de..3c73eb632007 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-5.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-5.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-5.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-5.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6101d4717fd4ef918bcebec77e8ee04d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
index 537abb5bb637..cde69869e857 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-6.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=486cd3cec438477e88dde20d1db94967
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
index 347e71e366d8..96003e4bec38 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.6-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20190909.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-8.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5242e0097a2f28e3fc2dc3a5ce07b89
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7 b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
index a17747d135c2..f0d89cd055ab 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3.7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.3_p20191021.tar.xz !vanilla? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.3-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.3-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.3-9.experimental.tar.xz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bb9e718c37217378c60e597670fb974b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.4.31 b/metadata/md5-cache/sys-kernel/ck-sources-5.4.31
index 8b68f63f98fb..3bdb20570984 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.4.31
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.4.31
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 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	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=b2eaddf94b5d1d44b905600ff56dc1cc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.4.37 b/metadata/md5-cache/sys-kernel/ck-sources-5.4.37
index 9f533c201520..5a2f6fcd4645 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.4.37
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.4.37
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.37
 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-37.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-37.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-37.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-37.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-37.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-37.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-37.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-37.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-37.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	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=029128b2aa7dd16b9faa7fb553a40c3c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
index e43d81958443..45f766a42ab7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.178
 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-188.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-188.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-188.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-188.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-188.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-188.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-188.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-188.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-188.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e3ae0819d4be7d6d1ec86baba1e5aa2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.179 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.179
index 7061642fec75..4ae160e41238 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.179
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.179
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.179
 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-189.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-189.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-189.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-189.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-189.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-189.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-189.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-189.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-189.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=1d4ffc2d84a6bb17da5df58b0db3a432
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.180 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.180
index 86b1bd284481..8e0b8b199f68 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.180
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.180
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.180
 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-190.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-190.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-190.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-190.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-190.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-190.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-190.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-190.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-190.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e672c106d4eb2e0402c785f43bc5c9e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.181 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.181
index 4c44b86ccb49..5a5ffc1cd928 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.181
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.181
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.181
 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-191.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-191.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-191.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-191.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-191.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-191.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-191.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-191.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-191.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=c7c397b5077d96cedb34ebe218a9ac1d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
index bad1e9b75609..102d2359a251 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.182
 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-192.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-192.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-192.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-192.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-192.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-192.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-192.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-192.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-192.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d735688f89ff2a1f9f0a2fe697c31d73
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183
new file mode 100644
index 000000000000..2adc02177c36
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183
@@ -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.183
+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-193.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-193.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-193.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-193.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-193.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-193.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-193.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-193.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-193.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=367ba1dfb8f0e35c06efc39fa0871a30
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
index 2ea4871bd801..1cd9da1c8a58 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.120
 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-119.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-119.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-119.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-119.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-119.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-119.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-119.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-119.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-119.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=90754527370cd6977cbec43215d555ce
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.121 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.121
index 3db8a1da6b42..85ef6886071a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.121
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.121
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.121
 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-120.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-120.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-120.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-120.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-120.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-120.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-120.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-120.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-120.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=374a5210ec6f6219fe8eb398b481f9ef
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.122 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.122
index 43b4f9c598df..549d0480eb26 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.122
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.122
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.122
 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-121.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-121.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-121.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-121.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-121.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-121.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-121.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-121.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-121.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=59f54d2783dca088f2928fe91818a0e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
index 2f68cb6373f0..07c19cfd7386 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.123
 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-122.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-122.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-122.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-122.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-122.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-122.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-122.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-122.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-122.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=93d873b6ee4d68feb2de7583475ad614
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.124 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.124
index d0c8a7ba2c94..599719d7b76b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.124
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.124
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.124
 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-123.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-123.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-123.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-123.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-123.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-123.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-123.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-123.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-123.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6044fc0f6b2c0706a7576a00a65f9643
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.125 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.125
index 9cda0749217f..a01de335de77 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.125
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.125
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.125
 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-124.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-124.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-124.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-124.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-124.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-124.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-124.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-124.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-124.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6e6452cb7da2aa0b3d1b42325ba75603
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126
new file mode 100644
index 000000000000..7434f12c9ac3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126
@@ -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.126
+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-125.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-125.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-125.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-125.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-125.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-125.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-125.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-125.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-125.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=d4e131f73e4b90cb7e59e553343180cf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
index 0924c8d0b43d..de93f31753bd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.221
 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-222.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-222.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-222.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-222.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-222.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-222.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-222.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-222.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-222.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=bbb4cd4903b28194d7193f5657d57632
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.222 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.222
index f64c106cb024..e5f2eb5de181 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.222
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.222
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.222
 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-223.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-223.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-223.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-223.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-223.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-223.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-223.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-223.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-223.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=31d574b99ec0ab8713df6885c8651b18
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.223 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.223
index ed4799a0b543..cb47da0b2e7a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.223
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.223
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.223
 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-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-224.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-224.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-224.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-224.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-224.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-224.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-224.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-224.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=5f390f1544c7315e3f7463b973556f5f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.224 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.224
index caf15c76e5c9..8d800b28c229 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.224
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.224
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.224
 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-225.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-225.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-225.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-225.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-225.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-225.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-225.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-225.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-225.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d9f34d9e12541024f1961c4dc50f0120
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
index dc001f780e87..cc2c7ce6d07b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.225
 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-226.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-226.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-226.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-226.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-226.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-226.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-226.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-226.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-226.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e5a53a472e09a74ec51afc3c2a520fb7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226
new file mode 100644
index 000000000000..98fe8dd338f9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226
@@ -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.226
+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-227.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-227.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-227.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-227.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-227.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-227.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-227.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-227.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-227.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=98ae198b569b708d2e8ae6ab72b91de6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
index 7e1f10c1b2b8..b71dc61fb7a3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.221
 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-225.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-225.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-225.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-225.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-225.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-225.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-225.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-225.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-225.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=33130caaa3ccc24ba82a29fe658f4215
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.222 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.222
index 0ce11c93f28e..3b71cef8f3b2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.222
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.222
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.222
 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-226.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-226.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-226.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-226.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-226.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-226.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-226.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-226.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-226.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e5a53a472e09a74ec51afc3c2a520fb7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.223 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.223
index 9cc58dccdccc..99eaa36aa7d5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.223
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.223
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.223
 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-227.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-227.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-227.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-227.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-227.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-227.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-227.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-227.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-227.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=98ae198b569b708d2e8ae6ab72b91de6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.224 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.224
index 385fd1d635cc..28f616a66bc7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.224
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.224
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.224
 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-228.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-228.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-228.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-228.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-228.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-228.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-228.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-228.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-228.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=119a7691e3cd8d8a51bd8045f2a5d4bf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
index 8988ba04161c..20d8e918ba17 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.225
 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-229.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-229.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-229.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-229.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-229.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-229.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-229.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-229.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-229.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=e9ef4e9728c578cd0a4235c5c0c89c63
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226
new file mode 100644
index 000000000000..cc77e95b582b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226
@@ -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.226
+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-230.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-230.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-230.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-230.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-230.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-230.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-230.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-230.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-230.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=06f29479d310d6255054018227b1c613
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
index f6ec010797db..a270355d903c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.38
 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-38.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-38.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-38.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-38.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-38.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-38.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-38.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-38.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-38.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=933105739b5d29ec261c129c0f1ad005
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.39 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.39
index 9dca6890046d..96058e523a65 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.39
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.39
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.39
 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-39.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-39.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-39.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-39.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-39.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-39.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-39.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-39.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-39.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=a535a8bc9ab40f7fcd3d1cfcba60db16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.40
index 4106035e2999..1ec4be7ca29a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.40
 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-40.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-40.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-40.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-40.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-40.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-40.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=7d14037a710ac417ce42ee1bfc5c3827
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
index f74acd2f93f6..0dde256b7725 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.41
 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-41.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-41.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-41.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-41.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-41.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-41.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-41.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-41.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-41.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=397a7fdb0ca588736735c6ab488ed2f8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.42 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.42
index f2d5f9581f9b..12af74e1c402 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.42
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.42
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.42
 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-42.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-42.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-42.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-42.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-42.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-42.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-42.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-42.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-42.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=23ae84fd5b588a07c57666fc94bec81e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.43 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.43
index fd41b62ccda4..a23e54a6537a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.43
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.43
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.43
 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-43.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-43.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-43.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-43.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-43.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-43.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-43.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-43.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-43.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=09564c4bf0ded9fa24ead32c308b98c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44
new file mode 100644
index 000000000000..c5e123bb2c18
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44
@@ -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.44
+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-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-44.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-44.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-44.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-44.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-44.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-44.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-44.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-44.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=0df706ec84eb469ba5f6e3576e314af7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.10
index 23bb6e9d1017..39aa5fc6f326 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.10
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.10
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.10
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-13.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=26f03992bc57621b6b39a2dca9a25835
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.11
index c7bbc7e2960f..dfe60230fb7e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.11
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.11
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-15.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f8381e972ba5855a50b034e6143a9571
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.12
index e9b94a2ffcff..7edd48b45754 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.12
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-16.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-16.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-16.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-16.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-16.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-16.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-16.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-16.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=610c1ba8df3ec8cf4f4eec02567bc010
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
index 031cd205494f..dacec3a4b888 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.13
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-17.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=3dc31952751e35985040d00f29611058
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.14
index 2fb5b38dc6a6..63e0bd13269c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.14
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.14
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.14
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-18.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-18.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-18.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-18.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-18.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-18.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-18.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=0de363113ce850c2d59c348dca9ef08b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.15
index 788c0ff09004..a6e1f85dd0b5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.15
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.15
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.15
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-19.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=8df9ab62aa23184d4fc7753da46bc916
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16
new file mode 100644
index 000000000000..5ff097e78c98
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.6 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.6.16
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-20.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-20.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-20.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-20.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=623a5d4cde78e9675103508c1cb7fbb2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.9
index 1268d7e60931..ea09c9cd170c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.9
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.9
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-12.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-12.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-12.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-12.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=71fddb69a945e674a726ac352fcbf4a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
index 56c1f1e49a40..d4e0ca84c9d7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.0
 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 experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=eaf7b6c723f028df333e1677397b25c9
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc1
index 27f36c8635b8..a275949b5677 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc1/v5.6 -> patch-5.7-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc2
index 803832b1d5a3..8b174ea28ce2 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc2
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc2/v5.6 -> patch-5.7-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc3
index e213e0499386..a56a67c5ff29 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc3
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc3/v5.6 -> patch-5.7-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc4
index 29cf8646ba3f..03716c6c5ef6 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc4
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc4/v5.6 -> patch-5.7-rc4.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc5
index 8d50845b4b9c..4afa7715285d 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc5
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc5
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc5/v5.6 -> patch-5.7-rc5.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc6
index 2127dd4c0377..6af6ed73e7b1 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc6
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc6
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc6/v5.6 -> patch-5.7-rc6.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc7 b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc7
index bc953b123803..dc34857511dc 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.7_rc7
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.7_rc7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7_rc7
 SRC_URI=https://git.kernel.org/torvalds/p/v5.7-rc7/v5.6 -> patch-5.7-rc7.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=f7e296f23d89eb9c59271a0ad75e7613
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index a26e40bc7f71..02b01491f214 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=7473fbec72c0fc5338c08c3fd3d07096
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index 3c5597cf078e..801311dd1d48 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=303272bc8f97d0039f6bb0f231f9f97c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index d4e20a7fa202..95f7d65fbca1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=5b56280b7be153e420f220825811e54d
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index 982802cb8b43..a1f52d7f122c 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=4ad70e3eb60d79af9d68479007ea084c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 663fdedd3a35..0b0e12d5013d 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=85c38bb174de51bf8ba559c6aa4b2d7c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4 b/metadata/md5-cache/sys-kernel/linux-headers-5.4
index 4d48753482f3..a4b9b4d3b0ee 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=991952e77ae73aa82c907422cdd68165
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
index dd53a364e7a0..5ccb992bb715 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux system headers
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
 IUSE=headers-only
-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
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-2.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=0e51f4ab5e59c3fdfe0351eb0ac071a0
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=34c35421cd509bdddf5b735dd473dbb4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.5 b/metadata/md5-cache/sys-kernel/linux-headers-5.5
index d34d99336c32..6c8a2b66f611 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.5
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz mirror://gentoo/gentoo-headers-5.5-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.5-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=04d8000922d98cbd55a05074717e8d38
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.6 b/metadata/md5-cache/sys-kernel/linux-headers-5.6
index 8cc53157de38..e58e55e6eab2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.6
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz mirror://gentoo/gentoo-headers-5.6-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.6-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=b94dffba7664a869c984d27bf35e2ffd
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.7 b/metadata/md5-cache/sys-kernel/linux-headers-5.7
index 753f2a91bcfb..75086279dfdd 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.7
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz mirror://gentoo/gentoo-headers-5.7-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.7-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=b94dffba7664a869c984d27bf35e2ffd
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.149 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
index 926e207658dd..cb8b631197df 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.149
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.149.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5027788810911aa18959e0cef70ecd4
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20 b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
index c1c75110d5b5..a67c53ec4dce 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.20
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.18.20.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/mipsgit-4.18.0-20181112.diff.xz mirror://gentoo/mips-sources-4.18.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56dae897a0cbdd350e18bc366510331d
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.79 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
index 431c997e1750..4710d25d67b8 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.79
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.79.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/mips-sources-4.19.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3acc227a6a94c226082cc9d10d1fef9
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.20.17 b/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
index 99c8587425c4..a40feac41663 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.20.17.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.tar.xz mirror://gentoo/mips-sources-4.20.0-patches-v1.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca38d2455e02d97e94d7536d183240c2
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.196 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
index 2f06a77bbbb7..3494666ffcb2 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e6342ed11d529d37a3ff54a97c96d8b
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.196 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
index 96d314b59628..dc62df6d9b2a 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=382ed1c063df6d2e9bc130eea2d7ee16
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.4_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.4_p6
index 9855889c3006..d62a28a75085 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.4_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.4_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4_p6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.4...v5.4-pf6.diff -> pf-sources-5.4_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.4-1.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e04c22de4b5c0fd1520450643c2e01ff
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.5_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.5_p8
index f28e4e788130..1293029d9e0c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.5_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.5_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.5_p8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.5...v5.5-pf8.diff -> pf-sources-5.5_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.5-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.5-1.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4574f37786b15b23b805dda59cc78f9c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p1
index cd94ced71917..715cb8056dea 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf1.diff -> pf-sources-5.6_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p2
index abc1e9589c64..b097216ae3e6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf2.diff -> pf-sources-5.6_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p3
index 3d3bc13d7aeb..6c0ee34fd9b6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf3.diff -> pf-sources-5.6_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p4
index 3a28ced2c554..ab0dc90b42bf 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf4.diff -> pf-sources-5.6_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p5
index 7f6e68e4a50a..8efdd7c9e62d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf5.diff -> pf-sources-5.6_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p6
index 58c89951fc1b..8198b3788213 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf6.diff -> pf-sources-5.6_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
index b253de33962d..d9b56bc24b57 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf7.diff -> pf-sources-5.6_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
index 9fad7abd44e9..b79db0410101 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6_p8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf8.diff -> pf-sources-5.6_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	f818331411666c019e77dc2779a8ee31	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1
new file mode 100644
index 000000000000..2ae525f3f8eb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p1
@@ -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_p1
+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-pf1.diff -> pf-sources-5.7_p1.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	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4574f37786b15b23b805dda59cc78f9c
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index ec3dec481ec7..1d4a75da9216 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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.9999
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=043cc21f7f575cd909e2d77fef0a0fb0
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
index 5a8388c72adb..7b06abb863f0 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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.9999
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=043cc21f7f575cd909e2d77fef0a0fb0
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
index 930ca2b0b8e6..20154400473d 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.170_p75
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.170.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.170-rt75.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.170-rt75.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
index a145083ee013..655aeff18e2e 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.124_p53
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.124.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.124-rt53.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.124-rt53.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
index 75592681cc96..3fe1a307dd8e 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.220_p197
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.220.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.220-rt197.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.220-rt197.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
index 4ea1da19ab7a..f8305da227e9 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.224_p144
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.224.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.224-rt144.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.224-rt144.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
index 25c9fa5b15b9..b29714861b0e 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.40_p24
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.40.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.40-rt24.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.40-rt24.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7 b/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
index 038288053f9f..bc30b08e3fef 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.14_p7
 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 deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.14-rt7.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.14-rt7.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84
index ca46bf9271d8..236fb923d180 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.16.84
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.16.84.xz https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.182 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.183
similarity index 77%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.182
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.183
index fe3862ccfac2..1ad1e644a559 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.182
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.183
@@ -8,7 +8,7 @@ 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.182
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.182.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SLOT=4.14.183
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.183.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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.125 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.126
similarity index 77%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.125
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.126
index 094e0ac997f6..1548a409cad2 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.125
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.126
@@ -8,7 +8,7 @@ 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.125
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.125.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SLOT=4.19.126
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.126.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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.225 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.226
similarity index 77%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.225
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.226
index 73f6a8b11c2e..bdaab735ffda 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.225
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.226
@@ -8,7 +8,7 @@ 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.225
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.225.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SLOT=4.4.226
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.226.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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.225 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.226
similarity index 77%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.225
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.226
index df4a4cdccb5b..934a75a9a046 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.225
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.226
@@ -8,7 +8,7 @@ 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.225
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.225.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SLOT=4.9.226
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.226.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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.43 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.44
similarity index 77%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.43
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.44
index 7581354e191c..9f5e7d46e9d6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.43
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.44
@@ -8,7 +8,7 @@ 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.43
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.43.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SLOT=5.4.44
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.44.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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.15 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.16
similarity index 77%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.6.15
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.6.16
index d11c7c10653f..c3f626cac957 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.15
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.16
@@ -8,7 +8,7 @@ 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.15
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.15.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+SLOT=5.6.16
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.16.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	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.0
index 6a066d9527f5..7df22f4cb5c4 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.7.0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index 8d239b8d181e..ba7e60b63fff 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.16.26.xz https://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=5668a47c58461eb3e14a3d6890f51dda
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.4.15 b/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
index 762a4d7985ca..b4f2def70ad0 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.4.15
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.15
 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-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.4.15-zen1/v5.4.15-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.5.13 b/metadata/md5-cache/sys-kernel/zen-sources-5.5.13
index 42d21dc3f8d6..8578847d3bb0 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.5.13
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.5.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.5.13
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.5-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.5-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.5-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.5-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.5-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.5-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.5.13-zen1/v5.5.13-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.6.9 b/metadata/md5-cache/sys-kernel/zen-sources-5.6.9
index c01841a3ca57..16bb30078576 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.6.9
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.6.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.6.9
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.6.9-zen1/v5.6.9-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	75c031f59bce156dbdbfb3b42d1c9974	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=4e39805d9e1eca3815af9f08350cde89
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index c54763828fbb..a13caf45e51f 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/memwatch-0.1.0 b/metadata/md5-cache/sys-process/memwatch-0.1.0
deleted file mode 100644
index 5581a24c254c..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://bitbucket.org/PascalRD/memwatch/
-KEYWORDS=amd64 x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.1.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97fc6a6b3a78da02293ec6eaecae8cb0
diff --git a/metadata/md5-cache/sys-process/memwatch-0.2.0 b/metadata/md5-cache/sys-process/memwatch-0.2.0
deleted file mode 100644
index 3de2181f5f70..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://bitbucket.org/PascalRD/memwatch/
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.2.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=985800aff86cb099f381304a6ee235d5
diff --git a/metadata/md5-cache/sys-process/memwatch-0.2.1 b/metadata/md5-cache/sys-process/memwatch-0.2.1
deleted file mode 100644
index c299d8b20ecb..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://bitbucket.org/PascalRD/memwatch/
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.2.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=985800aff86cb099f381304a6ee235d5
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.0 b/metadata/md5-cache/sys-process/memwatch-0.3.0
deleted file mode 100644
index 02aec3aaecc8..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://unixdev.ru/memwatch
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.3.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbb0cee85dd00cd64b62204b9078176b
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.0-r1 b/metadata/md5-cache/sys-process/memwatch-0.3.0-r1
deleted file mode 100644
index d9ad320649f3..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://unixdev.ru/memwatch
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.3.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.1 b/metadata/md5-cache/sys-process/memwatch-0.3.1
deleted file mode 100644
index e43bb2e92df8..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://unixdev.ru/memwatch
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.3.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.2 b/metadata/md5-cache/sys-process/memwatch-0.3.2
deleted file mode 100644
index 5c4316c65062..000000000000
--- a/metadata/md5-cache/sys-process/memwatch-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Interactive memory viewer
-EAPI=6
-HOMEPAGE=https://unixdev.ru/memwatch
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://unixdev.ru/src/memwatch-0.3.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.3 b/metadata/md5-cache/sys-process/memwatch-0.3.3
index bc45c4e77025..9d9557c0463a 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.3.3
+++ b/metadata/md5-cache/sys-process/memwatch-0.3.3
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Interactive memory viewer
 EAPI=6
 HOMEPAGE=https://unixdev.ru/memwatch
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.3.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7154c653d7414b21f8c5929ee5bacea8
+_md5_=c4dd740606e20ce7f38426ad16d0e5dc
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index ff8562ec39c8..e31fcc016544 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/blas-3.8 b/metadata/md5-cache/virtual/blas-3.8
index e803a414ab16..945d28e1e9af 100644
--- a/metadata/md5-cache/virtual/blas-3.8
+++ b/metadata/md5-cache/virtual/blas-3.8
@@ -3,7 +3,7 @@ DEPEND=>=sci-libs/lapack-3.8[eselect-ldso?] eselect-ldso? ( || ( >=sci-libs/lapa
 DESCRIPTION=Virtual for FORTRAN 77 BLAS implementation
 EAPI=7
 IUSE=eselect-ldso
-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
+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
 RDEPEND=>=sci-libs/lapack-3.8[eselect-ldso?] eselect-ldso? ( || ( >=sci-libs/lapack-3.8[eselect-ldso] sci-libs/openblas[eselect-ldso] sci-libs/blis[eselect-ldso] ) )
 SLOT=0
-_md5_=5c2a5c631afb9fa36ab1cad04c821feb
+_md5_=00400d15a7d45c83e48e3efc45718aec
diff --git a/metadata/md5-cache/virtual/lapack-3.8 b/metadata/md5-cache/virtual/lapack-3.8
index 1bccde220056..a70bb3ffea5d 100644
--- a/metadata/md5-cache/virtual/lapack-3.8
+++ b/metadata/md5-cache/virtual/lapack-3.8
@@ -3,7 +3,7 @@ DEPEND=>=sci-libs/lapack-3.8.0[eselect-ldso?] eselect-ldso? ( || ( >=sci-libs/la
 DESCRIPTION=Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation
 EAPI=7
 IUSE=eselect-ldso
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=>=sci-libs/lapack-3.8.0[eselect-ldso?] eselect-ldso? ( || ( >=sci-libs/lapack-3.8.0[eselect-ldso] sci-libs/openblas[eselect-ldso] ) )
 SLOT=0
-_md5_=2a9c2ae0afbc7711ba32177c891dab26
+_md5_=839a29a4674b1c19a6fbec4a906db767
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1
similarity index 57%
rename from metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0
rename to metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1
index 270908e9f879..41f34dbc3955 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
 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=|| ( =dev-lang/perl-5.30.2* ~perl-core/Compress-Raw-Bzip2-2.89.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.89.0 !>perl-core/Compress-Raw-Bzip2-2.89.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.30.2* =dev-lang/perl-5.30.3* ~perl-core/Compress-Raw-Bzip2-2.89.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.89.0 !>perl-core/Compress-Raw-Bzip2-2.89.0-r999
 SLOT=0
-_md5_=0feb120e49fd8a9de428b42ff265ae11
+_md5_=4bd046b8c5803ad23f237a5b3dd8c1f8
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc
new file mode 100644
index 000000000000..c08acc8fcab4
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Module-CoreList
+EAPI=6
+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
+RDEPEND=|| ( =dev-lang/perl-5.30.3* ~perl-core/Module-CoreList-5.202.6.13.0_rc ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.6.13.0_rc !>perl-core/Module-CoreList-5.202.6.13.0_rc-r999
+SLOT=0
+_md5_=132986e38953b9e121f6962f82eee8d7
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index a6b7b105607f..cac841de39cc 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.1-r1 b/metadata/md5-cache/www-apache/mod_security-2.9.1-r1
index c97a111f260c..ee26e01529d5 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.1-r1
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst setup
 DEPEND=dev-libs/apr dev-libs/apr-util[openssl] dev-libs/libxml2 dev-libs/libpcre[jit?] fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( dev-lang/lua:0 ) mlogc? ( net-misc/curl ) www-servers/apache[apache2_modules_unique_id] doc? ( app-doc/doxygen ) =www-servers/apache-2*
 DESCRIPTION=Application firewall and intrusion detection for Apache
 EAPI=5
-HOMEPAGE=http://www.modsecurity.org/
+HOMEPAGE=https://www.modsecurity.org/
 IUSE=doc fuzzyhash geoip jit json lua mlogc
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
@@ -10,6 +10,6 @@ PDEPEND=>=www-apache/modsecurity-crs-2.2.6-r1
 RDEPEND=dev-libs/apr dev-libs/apr-util[openssl] dev-libs/libxml2 dev-libs/libpcre[jit?] fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( dev-lang/lua:0 ) mlogc? ( net-misc/curl ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) mlogc? ( dev-lang/perl ) =www-servers/apache-2*
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz
+SRC_URI=https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=92b2363a2d3fc772b95d43c09094c418
+_md5_=4f5e19357da86f04d202c80d0fc849c6
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.3 b/metadata/md5-cache/www-apache/mod_security-2.9.3
index c9c13fffcbce..fe067ca96e67 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.3
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst setup
 DEPEND=dev-libs/apr dev-libs/apr-util[openssl] dev-libs/libxml2 dev-libs/libpcre[jit?] fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( dev-lang/lua:0 ) mlogc? ( net-misc/curl ) www-servers/apache[apache2_modules_unique_id] doc? ( app-doc/doxygen ) =www-servers/apache-2*
 DESCRIPTION=Application firewall and intrusion detection for Apache
 EAPI=6
-HOMEPAGE=http://www.modsecurity.org/
+HOMEPAGE=https://www.modsecurity.org/
 IUSE=doc fuzzyhash geoip jit json lua mlogc
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -10,6 +10,6 @@ PDEPEND=>=www-apache/modsecurity-crs-2.2.6-r1
 RDEPEND=dev-libs/apr dev-libs/apr-util[openssl] dev-libs/libxml2 dev-libs/libpcre[jit?] fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( dev-lang/lua:0 ) mlogc? ( net-misc/curl ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) mlogc? ( dev-lang/perl ) =www-servers/apache-2*
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz
+SRC_URI=https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de
-_md5_=91fee5bf3df4c8b1459f5f796ecd01a7
+_md5_=d7827db89a5a75e17cd4e7ec07bd712d
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.4 b/metadata/md5-cache/www-apache/passenger-6.0.4
index 64b7ff7242c4..c47e2468bb97 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.4
+++ b/metadata/md5-cache/www-apache/passenger-6.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
 IUSE=apache2 debug test apache2 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.4.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f889b8d7960fe937399984c914c2ad0f
+_md5_=5d313558f910db8c0bc191f385b8c200
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 3c05a1350948..93b0290c25c4 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/gitea-1.10.6 b/metadata/md5-cache/www-apps/gitea-1.10.6
deleted file mode 100644
index 40b20454aed4..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.10.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/go >=dev-lang/go-1.10 virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=pam? ( sys-libs/pam )
-DESCRIPTION=A painless self-hosted Git service
-EAPI=7
-HOMEPAGE=https://gitea.io
-IUSE=+acct pam sqlite
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RDEPEND=pam? ( sys-libs/pam ) acct? ( acct-group/git acct-user/git[gitea] ) dev-vcs/git virtual/tmpfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/archive/v1.10.6.tar.gz -> gitea-1.10.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=6180c63b0561aff55fcafd346b7bf1aa
diff --git a/metadata/md5-cache/www-apps/gitea-1.11.5 b/metadata/md5-cache/www-apps/gitea-1.11.6
similarity index 97%
rename from metadata/md5-cache/www-apps/gitea-1.11.5
rename to metadata/md5-cache/www-apps/gitea-1.11.6
index e0ac6db0e253..166556947a71 100644
--- a/metadata/md5-cache/www-apps/gitea-1.11.5
+++ b/metadata/md5-cache/www-apps/gitea-1.11.6
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RDEPEND=pam? ( sys-libs/pam ) acct? ( acct-group/git acct-user/git[gitea] ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.11.5/gitea-src-1.11.5.tar.gz
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.11.6/gitea-src-1.11.6.tar.gz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=28b467d5d61958b6a16a628fbe0cb45b
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.7.3 b/metadata/md5-cache/www-apps/grafana-bin-6.7.4
similarity index 83%
rename from metadata/md5-cache/www-apps/grafana-bin-6.7.3
rename to metadata/md5-cache/www-apps/grafana-bin-6.7.4
index dc388e6bb404..ad1b5d9b67a4 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-6.7.3
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.7.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig
 SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.7.3.linux-amd64.tar.gz -> grafana-bin-6.7.3.tar.gz
+SRC_URI=https://dl.grafana.com/oss/release/grafana-6.7.4.linux-amd64.tar.gz -> grafana-bin-6.7.4.tar.gz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d92cd37affc4977689c7fff2eefdc7a0
diff --git a/metadata/md5-cache/www-apps/webmcp-1.2.6 b/metadata/md5-cache/www-apps/webmcp-1.2.6
index a7270a1187f1..bddc9ae665ff 100644
--- a/metadata/md5-cache/www-apps/webmcp-1.2.6
+++ b/metadata/md5-cache/www-apps/webmcp-1.2.6
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/lua dev-db/postgresql
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/lua:= dev-db/postgresql:=
 DESCRIPTION=Web application framework written in Lua and C
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.public-software-group.org/webmcp
 KEYWORDS=~amd64
 LICENSE=HPND
-RDEPEND=dev-lang/lua dev-db/postgresql
+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
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4317af8cc2686f32597835ba5cda6274
+_eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=4c7a0f80ec112f8cf79fd127fa9e4645
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index bec2dff93929..2b5743d03d57 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-84.0.4136.5 b/metadata/md5-cache/www-client/chromium-84.0.4147.30
similarity index 92%
rename from metadata/md5-cache/www-client/chromium-84.0.4136.5
rename to metadata/md5-cache/www-client/chromium-84.0.4147.30
index c723e7466df4..4fece0d36191 100644
--- a/metadata/md5-cache/www-client/chromium-84.0.4136.5
+++ b/metadata/md5-cache/www-client/chromium-84.0.4147.30
@@ -1,4 +1,4 @@
-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 ) )
+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
@@ -11,6 +11,6 @@ RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-pr
 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.4136.5.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
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-84.0.4147.30.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	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a5a32250121975d45da2c24a9a3a283
+_md5_=1a670cf80c5aa118626e95200d77af42
diff --git a/metadata/md5-cache/www-client/epiphany-3.32.6 b/metadata/md5-cache/www-client/epiphany-3.32.6
index d9c7ba4df1ab..cc3f3f82325d 100644
--- a/metadata/md5-cache/www-client/epiphany-3.32.6
+++ b/metadata/md5-cache/www-client/epiphany-3.32.6
@@ -5,11 +5,11 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.24.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.32/epiphany-3.32.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e654358621e6ed5838a609a5956fda12
+_md5_=0e361e4b9c21a56af3411ac1be832cb6
diff --git a/metadata/md5-cache/www-client/epiphany-3.34.4 b/metadata/md5-cache/www-client/epiphany-3.34.4
index 07d8f8636a23..5a5caae318a8 100644
--- a/metadata/md5-cache/www-client/epiphany-3.34.4
+++ b/metadata/md5-cache/www-client/epiphany-3.34.4
@@ -5,11 +5,11 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.61.2:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.26.0:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.10:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.34/epiphany-3.34.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f77a2a8e23d030b374ff2a6b8842475
+_md5_=6c56e7334b5784349a821b0f33f84a5e
diff --git a/metadata/md5-cache/www-client/firefox-68.9.0 b/metadata/md5-cache/www-client/firefox-68.9.0
new file mode 100644
index 000000000000..0ee02e01882a
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-68.9.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.44.3 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/rust-1.34.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.44.3 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=pgo? ( lto ) wifi? ( dbus )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ach.xpi -> firefox-68.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/af.xpi -> firefox-68.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/an.xpi -> firefox-68.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ar.xpi -> firefox-68.9.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ast.xpi -> firefox-68.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/az.xpi -> firefox-68.9.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/be.xpi -> firefox-68.9.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/bg.xpi -> firefox-68.9.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/bn.xpi -> firefox-68.9.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/br.xpi -> firefox-68.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/bs.xpi -> firefox-68.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ca.xpi -> firefox-68.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/cak.xpi -> firefox-68.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/cs.xpi -> firefox-68.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/cy.xpi -> firefox-68.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/da.xpi -> firefox-68.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/de.xpi -> firefox-68.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/el.xpi -> firefox-68.9.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.9.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.9.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/eo.xpi -> firefox-68.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/et.xpi -> firefox-68.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/eu.xpi -> firefox-68.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/fa.xpi -> firefox-68.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ff.xpi -> firefox-68.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/fi.xpi -> firefox-68.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/fr.xpi -> firefox-68.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/gd.xpi -> firefox-68.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/gl.xpi -> firefox-68.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/gn.xpi -> firefox-68.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/he.xpi -> firefox-68.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/hr.xpi -> firefox-68.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/hu.xpi -> firefox-68.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.9.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ia.xpi -> firefox-68.9.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/id.xpi -> firefox-68.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/is.xpi -> firefox-68.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/it.xpi -> firefox-68.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ja.xpi -> firefox-68.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ka.xpi -> firefox-68.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/kab.xpi -> firefox-68.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/kk.xpi -> firefox-68.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/km.xpi -> firefox-68.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/kn.xpi -> firefox-68.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ko.xpi -> firefox-68.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/lij.xpi -> firefox-68.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/lt.xpi -> firefox-68.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/lv.xpi -> firefox-68.9.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/mk.xpi -> firefox-68.9.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/mr.xpi -> firefox-68.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ms.xpi -> firefox-68.9.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/my.xpi -> firefox-68.9.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/nl.xpi -> firefox-68.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.9.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/oc.xpi -> firefox-68.9.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/pl.xpi -> firefox-68.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/rm.xpi -> firefox-68.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ro.xpi -> firefox-68.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ru.xpi -> firefox-68.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/si.xpi -> firefox-68.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/sk.xpi -> firefox-68.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/sl.xpi -> firefox-68.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/son.xpi -> firefox-68.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/sq.xpi -> firefox-68.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/sr.xpi -> firefox-68.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ta.xpi -> firefox-68.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/te.xpi -> firefox-68.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/th.xpi -> firefox-68.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/tr.xpi -> firefox-68.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/uk.xpi -> firefox-68.9.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/ur.xpi -> firefox-68.9.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/uz.xpi -> firefox-68.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/vi.xpi -> firefox-68.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/xh.xpi -> firefox-68.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.9.0esr/source/firefox-68.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-14.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-14.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	f1b91b3f6aa604de36f590cff723ad6b	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=80834dc4438e7b9663e04d0407e8d1bf
diff --git a/metadata/md5-cache/www-client/firefox-77.0.1 b/metadata/md5-cache/www-client/firefox-77.0.1
new file mode 100644
index 000000000000..a33b646d814b
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-77.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.52.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme sys-apps/dbus dev-libs/dbus-glib startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.4:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.14.1 >=net-libs/nodejs-10.19.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:10 !clang? ( sys-devel/llvm:10 ) clang? ( =sys-devel/lld-10* sys-devel/llvm:10[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) >=virtual/rust-1.41.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) !!sys-devel/llvm:0 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist +clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.52.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme sys-apps/dbus dev-libs/dbus-glib startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.4:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=pgo? ( lto )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ach.xpi -> firefox-77.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/af.xpi -> firefox-77.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/an.xpi -> firefox-77.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ar.xpi -> firefox-77.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ast.xpi -> firefox-77.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/az.xpi -> firefox-77.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/be.xpi -> firefox-77.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/bg.xpi -> firefox-77.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/bn.xpi -> firefox-77.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/br.xpi -> firefox-77.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/bs.xpi -> firefox-77.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ca.xpi -> firefox-77.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/cak.xpi -> firefox-77.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/cs.xpi -> firefox-77.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/cy.xpi -> firefox-77.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/da.xpi -> firefox-77.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/de.xpi -> firefox-77.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/dsb.xpi -> firefox-77.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/el.xpi -> firefox-77.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/en-CA.xpi -> firefox-77.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/en-GB.xpi -> firefox-77.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/eo.xpi -> firefox-77.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/es-AR.xpi -> firefox-77.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/es-CL.xpi -> firefox-77.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/es-ES.xpi -> firefox-77.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/es-MX.xpi -> firefox-77.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/et.xpi -> firefox-77.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/eu.xpi -> firefox-77.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/fa.xpi -> firefox-77.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ff.xpi -> firefox-77.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/fi.xpi -> firefox-77.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/fr.xpi -> firefox-77.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-77.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-77.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/gd.xpi -> firefox-77.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/gl.xpi -> firefox-77.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/gn.xpi -> firefox-77.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-77.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/he.xpi -> firefox-77.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-77.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/hr.xpi -> firefox-77.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/hsb.xpi -> firefox-77.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/hu.xpi -> firefox-77.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-77.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ia.xpi -> firefox-77.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/id.xpi -> firefox-77.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/is.xpi -> firefox-77.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/it.xpi -> firefox-77.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ja.xpi -> firefox-77.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ka.xpi -> firefox-77.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/kab.xpi -> firefox-77.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/kk.xpi -> firefox-77.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/km.xpi -> firefox-77.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/kn.xpi -> firefox-77.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ko.xpi -> firefox-77.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/lij.xpi -> firefox-77.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/lt.xpi -> firefox-77.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/lv.xpi -> firefox-77.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/mk.xpi -> firefox-77.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/mr.xpi -> firefox-77.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ms.xpi -> firefox-77.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/my.xpi -> firefox-77.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-77.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/nl.xpi -> firefox-77.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-77.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/oc.xpi -> firefox-77.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-77.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/pl.xpi -> firefox-77.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-77.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-77.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/rm.xpi -> firefox-77.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ro.xpi -> firefox-77.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ru.xpi -> firefox-77.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/si.xpi -> firefox-77.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/sk.xpi -> firefox-77.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/sl.xpi -> firefox-77.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/son.xpi -> firefox-77.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/sq.xpi -> firefox-77.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/sr.xpi -> firefox-77.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-77.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ta.xpi -> firefox-77.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/te.xpi -> firefox-77.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/th.xpi -> firefox-77.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/tr.xpi -> firefox-77.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/uk.xpi -> firefox-77.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/ur.xpi -> firefox-77.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/uz.xpi -> firefox-77.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/vi.xpi -> firefox-77.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/xh.xpi -> firefox-77.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-77.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-77.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/77.0.1/source/firefox-77.0.1.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-77.0-patches-01_pre7.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-77.0-patches-01_pre7.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-77.0-patches-01_pre7.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	78f8b6f29bd3b0263a4c9a3785e5af71	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	f1b91b3f6aa604de36f590cff723ad6b	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=631cbb4704aad5eb390fcc38672e5e2e
diff --git a/metadata/md5-cache/www-client/firefox-bin-68.9.0 b/metadata/md5-cache/www-client/firefox-bin-68.9.0
new file mode 100644
index 000000000000..090597933047
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-68.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf media-sound/apulse ) ) app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+alsa +ffmpeg +pulseaudio selinux startup-notification wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme alsa? ( !pulseaudio? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ach.xpi -> firefox-68.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/af.xpi -> firefox-68.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/an.xpi -> firefox-68.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ar.xpi -> firefox-68.9.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ast.xpi -> firefox-68.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/az.xpi -> firefox-68.9.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/be.xpi -> firefox-68.9.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/bg.xpi -> firefox-68.9.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/bn.xpi -> firefox-68.9.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/br.xpi -> firefox-68.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/bs.xpi -> firefox-68.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ca.xpi -> firefox-68.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/cak.xpi -> firefox-68.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/cs.xpi -> firefox-68.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/cy.xpi -> firefox-68.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/da.xpi -> firefox-68.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/de.xpi -> firefox-68.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/el.xpi -> firefox-68.9.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.9.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.9.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/eo.xpi -> firefox-68.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/et.xpi -> firefox-68.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/eu.xpi -> firefox-68.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/fa.xpi -> firefox-68.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ff.xpi -> firefox-68.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/fi.xpi -> firefox-68.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/fr.xpi -> firefox-68.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/gd.xpi -> firefox-68.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/gl.xpi -> firefox-68.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/gn.xpi -> firefox-68.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/he.xpi -> firefox-68.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/hr.xpi -> firefox-68.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/hu.xpi -> firefox-68.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.9.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ia.xpi -> firefox-68.9.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/id.xpi -> firefox-68.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/is.xpi -> firefox-68.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/it.xpi -> firefox-68.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ja.xpi -> firefox-68.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ka.xpi -> firefox-68.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/kab.xpi -> firefox-68.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/kk.xpi -> firefox-68.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/km.xpi -> firefox-68.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/kn.xpi -> firefox-68.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ko.xpi -> firefox-68.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/lij.xpi -> firefox-68.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/lt.xpi -> firefox-68.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/lv.xpi -> firefox-68.9.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/mk.xpi -> firefox-68.9.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/mr.xpi -> firefox-68.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ms.xpi -> firefox-68.9.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/my.xpi -> firefox-68.9.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/nl.xpi -> firefox-68.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.9.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/oc.xpi -> firefox-68.9.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/pl.xpi -> firefox-68.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/rm.xpi -> firefox-68.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ro.xpi -> firefox-68.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ru.xpi -> firefox-68.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/si.xpi -> firefox-68.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/sk.xpi -> firefox-68.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/sl.xpi -> firefox-68.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/son.xpi -> firefox-68.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/sq.xpi -> firefox-68.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/sr.xpi -> firefox-68.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ta.xpi -> firefox-68.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/te.xpi -> firefox-68.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/th.xpi -> firefox-68.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/tr.xpi -> firefox-68.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/uk.xpi -> firefox-68.9.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/ur.xpi -> firefox-68.9.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/uz.xpi -> firefox-68.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/vi.xpi -> firefox-68.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/xh.xpi -> firefox-68.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.9.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.9.0esr/linux-x86_64/en-US/firefox-68.9.0esr.tar.bz2 -> firefox-bin_x86_64-68.9.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.9.0esr/linux-i686/en-US/firefox-68.9.0esr.tar.bz2 -> firefox-bin_i686-68.9.0.tar.bz2 )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	0914eab919f4f11dd9e0407b92af4726	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=27f4992d32d2f920edb0972d9a4a84f3
diff --git a/metadata/md5-cache/www-client/firefox-bin-77.0.1 b/metadata/md5-cache/www-client/firefox-bin-77.0.1
new file mode 100644
index 000000000000..89eeff044322
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-77.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf media-sound/apulse ) ) app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+alsa +ffmpeg +pulseaudio selinux startup-notification wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme alsa? ( !pulseaudio? ( media-sound/apulse ) ) pulseaudio? ( media-sound/pulseaudio ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ach.xpi -> firefox-77.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/af.xpi -> firefox-77.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/an.xpi -> firefox-77.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ar.xpi -> firefox-77.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ast.xpi -> firefox-77.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/az.xpi -> firefox-77.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/be.xpi -> firefox-77.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/bg.xpi -> firefox-77.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/bn.xpi -> firefox-77.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/br.xpi -> firefox-77.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/bs.xpi -> firefox-77.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ca.xpi -> firefox-77.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/cak.xpi -> firefox-77.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/cs.xpi -> firefox-77.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/cy.xpi -> firefox-77.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/da.xpi -> firefox-77.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/de.xpi -> firefox-77.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/dsb.xpi -> firefox-77.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/el.xpi -> firefox-77.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/en-CA.xpi -> firefox-77.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/en-GB.xpi -> firefox-77.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/eo.xpi -> firefox-77.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/es-AR.xpi -> firefox-77.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/es-CL.xpi -> firefox-77.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/es-ES.xpi -> firefox-77.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/es-MX.xpi -> firefox-77.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/et.xpi -> firefox-77.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/eu.xpi -> firefox-77.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/fa.xpi -> firefox-77.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ff.xpi -> firefox-77.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/fi.xpi -> firefox-77.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/fr.xpi -> firefox-77.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-77.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-77.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/gd.xpi -> firefox-77.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/gl.xpi -> firefox-77.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/gn.xpi -> firefox-77.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-77.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/he.xpi -> firefox-77.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-77.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/hr.xpi -> firefox-77.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/hsb.xpi -> firefox-77.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/hu.xpi -> firefox-77.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-77.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ia.xpi -> firefox-77.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/id.xpi -> firefox-77.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/is.xpi -> firefox-77.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/it.xpi -> firefox-77.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ja.xpi -> firefox-77.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ka.xpi -> firefox-77.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/kab.xpi -> firefox-77.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/kk.xpi -> firefox-77.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/km.xpi -> firefox-77.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/kn.xpi -> firefox-77.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ko.xpi -> firefox-77.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/lij.xpi -> firefox-77.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/lt.xpi -> firefox-77.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/lv.xpi -> firefox-77.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/mk.xpi -> firefox-77.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/mr.xpi -> firefox-77.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ms.xpi -> firefox-77.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/my.xpi -> firefox-77.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-77.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/nl.xpi -> firefox-77.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-77.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/oc.xpi -> firefox-77.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-77.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/pl.xpi -> firefox-77.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-77.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-77.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/rm.xpi -> firefox-77.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ro.xpi -> firefox-77.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ru.xpi -> firefox-77.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/si.xpi -> firefox-77.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/sk.xpi -> firefox-77.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/sl.xpi -> firefox-77.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/son.xpi -> firefox-77.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/sq.xpi -> firefox-77.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/sr.xpi -> firefox-77.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-77.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ta.xpi -> firefox-77.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/te.xpi -> firefox-77.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/th.xpi -> firefox-77.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/tr.xpi -> firefox-77.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/uk.xpi -> firefox-77.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/ur.xpi -> firefox-77.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/uz.xpi -> firefox-77.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/vi.xpi -> firefox-77.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/xh.xpi -> firefox-77.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-77.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//77.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-77.0.1-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/77.0.1/linux-x86_64/en-US/firefox-77.0.1.tar.bz2 -> firefox-bin_x86_64-77.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/77.0.1/linux-i686/en-US/firefox-77.0.1.tar.bz2 -> firefox-bin_i686-77.0.1.tar.bz2 )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	0914eab919f4f11dd9e0407b92af4726	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18d9676ff00776c7db994a537407128d
diff --git a/metadata/md5-cache/www-client/google-chrome-83.0.4103.61 b/metadata/md5-cache/www-client/google-chrome-83.0.4103.97
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-83.0.4103.61
rename to metadata/md5-cache/www-client/google-chrome-83.0.4103.97
index 65484ca93136..704c510a767d 100644
--- a/metadata/md5-cache/www-client/google-chrome-83.0.4103.61
+++ b/metadata/md5-cache/www-client/google-chrome-83.0.4103.97
@@ -8,6 +8,6 @@ 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.61-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_83.0.4103.97-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	0914eab919f4f11dd9e0407b92af4726	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/links-2.20.2-r1 b/metadata/md5-cache/www-client/links-2.20.2-r1
index 39094d1792eb..01dd10e393be 100644
--- a/metadata/md5-cache/www-client/links-2.20.2-r1
+++ b/metadata/md5-cache/www-client/links-2.20.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.20.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78e76060b2ee28fbaa39b67d234e8144
+_md5_=89f2e2a94afdd994a0040be391c5ed23
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1921.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1929.13_p1
similarity index 79%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1921.3_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1929.13_p1
index 3a0fd76afd86..be9d4a89e702 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1921.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1929.13_p1
@@ -9,6 +9,6 @@ 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.1.1921.3-1_amd64.deb -> vivaldi-snapshot-3.1.1921.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1921.3-1_arm64.deb -> vivaldi-snapshot-3.1.1921.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1921.3-1_armhf.deb -> vivaldi-snapshot-3.1.1921.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1921.3-1_i386.deb -> vivaldi-snapshot-3.1.1921.3_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1929.13-1_amd64.deb -> vivaldi-snapshot-3.1.1929.13_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1929.13-1_arm64.deb -> vivaldi-snapshot-3.1.1929.13_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1929.13-1_armhf.deb -> vivaldi-snapshot-3.1.1929.13_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.1.1929.13-1_i386.deb -> vivaldi-snapshot-3.1.1929.13_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index e2aef1723f8f..61a593a5f8e2 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.61 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.97
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.61
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.97
index 220686cce0dc..a303fab16469 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.61
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.97
@@ -7,6 +7,6 @@ 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.61-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_83.0.4103.97-1_amd64.deb
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	unpacker	b5891c9326ad2e7905c011d44c927c34
 _md5_=7f234fc06525712a546b072b4c50509f
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index e6e199ff61e8..30d7298812f8 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/nginx-1.19.0 b/metadata/md5-cache/www-servers/nginx-1.19.0-r1
similarity index 81%
rename from metadata/md5-cache/www-servers/nginx-1.19.0
rename to metadata/md5-cache/www-servers/nginx-1.19.0-r1
index 3b1056666027..7dca8cbb330b 100644
--- a/metadata/md5-cache/www-servers/nginx-1.19.0
+++ b/metadata/md5-cache/www-servers/nginx-1.19.0-r1
@@ -11,6 +11,6 @@ RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl?
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 RESTRICT=test
 SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.19.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz -> ngx_brotli-25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62rc1.tar.gz -> ngx_http_echo-0.62rc1.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.4.1.tar.gz -> njs-0.4.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.16rc5.tar.gz -> ngx_http_lua-0.10.16rc5.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.4.1.tar.gz -> njs-0.4.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+SRC_URI=https://nginx.org/download/nginx-1.19.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz -> ngx_brotli-25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62rc1.tar.gz -> ngx_http_echo-0.62rc1.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.4.1.tar.gz -> njs-0.4.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.4.1.tar.gz -> njs-0.4.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7e469bfe4105c4f7c28ff38cc62e07b9
+_md5_=62d1d45fc740f7e4560c1816cc8726a0
diff --git a/metadata/md5-cache/www-servers/puma-4.3.3 b/metadata/md5-cache/www-servers/puma-4.3.3
index 011c8531f441..b70b5b791ed4 100644
--- a/metadata/md5-cache/www-servers/puma-4.3.3
+++ b/metadata/md5-cache/www-servers/puma-4.3.3
@@ -5,7 +5,7 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=7
 HOMEPAGE=https://puma.io/
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0 ruby_targets_ruby24? ( dev-ruby/nio4r:2[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 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=3
 SRC_URI=https://github.com/puma/puma/archive/v4.3.3.tar.gz -> puma-4.3.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	0914eab919f4f11dd9e0407b92af4726	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=9649b0cdb968be4edfa4173053a2ce96
+_md5_=63c5531d82c1513a52cdb5a816a96778
diff --git a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1 b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
index fe576af4dc6c..37fc31b7614a 100644
--- a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
+++ b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=A FCGI spawner for lighttpd and cherokee and other webservers
 EAPI=7
-HOMEPAGE=http://redmine.lighttpd.net/projects/spawn-fcgi
+HOMEPAGE=https://redmine.lighttpd.net/projects/spawn-fcgi
 IUSE=ipv6
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!<=www-servers/lighttpd-1.4.20 !<=www-servers/cherokee-0.98.1
 SLOT=0
-SRC_URI=http://www.lighttpd.net/download/spawn-fcgi-1.6.4.tar.xz
-_md5_=504bf62c130cf0310e6bceca29d946ac
+SRC_URI=https://www.lighttpd.net/download/spawn-fcgi-1.6.4.tar.xz
+_md5_=fbeae455016996e4290003e582163797
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index df5676cef2e0..f037820e875d 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
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 1ff7fb3c53c7..0108f0aca64c 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
@@ -4,13 +4,13 @@ DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sy
 DESCRIPTION=Intel GPU userland tools
 EAPI=7
 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
+IUSE=chamelium doc man overlay runner tests 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 ) )
+REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) doc? ( tests )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.25.tar.xz
 _eclasses_=meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=edb8e38729483cd47f1fd30941f38c36
+_md5_=13b7b10309b3e8477c73da3ef7e7a779
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999 b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
index b1896cf0611d..9ff15006a48e 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
@@ -4,12 +4,12 @@ DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sy
 DESCRIPTION=Intel GPU userland tools
 EAPI=7
 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
+IUSE=chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
 LICENSE=MIT
 PROPERTIES=live
 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 ) )
+REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) doc? ( tests )
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=edb8e38729483cd47f1fd30941f38c36
+_md5_=13b7b10309b3e8477c73da3ef7e7a779
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 31a67b9f1dd1..c998a4a0a5ea 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.30.0 b/metadata/md5-cache/x11-misc/lightdm-1.30.0
index d8e393944937..b50bf34bbd77 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.30.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.30.0
@@ -5,7 +5,7 @@ DESCRIPTION=A lightweight display manager
 EAPI=7
 HOMEPAGE=https://github.com/CanonicalLtd/lightdm
 IUSE=audit +gnome +gtk +introspection non_root qt5 vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=~alpha 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
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	pam	a1771fc1e5831c201eaf18451747d94b	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=639abb4ee930735a9917de41093ec4ea
+_md5_=4261fc2e7f97eb601a05b6f361b93072
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
index 1bf0f6d70d99..e15216b15645 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=LightDM GTK+ Greeter
 EAPI=7
 HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
 IUSE=appindicator branding
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
+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.7/+download/lightdm-gtk-greeter-2.0.7.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f018d6edc4ac34fb39a5df335eb63fe
+_md5_=a7be7fb00aa2c3936e9d0c960814bcff
diff --git a/metadata/md5-cache/x11-misc/qlipper-5.1.2 b/metadata/md5-cache/x11-misc/qlipper-5.1.2
index e09f903807e8..61caef6fe6b5 100644
--- a/metadata/md5-cache/x11-misc/qlipper-5.1.2
+++ b/metadata/md5-cache/x11-misc/qlipper-5.1.2
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11 dev-qt/
 DESCRIPTION=Lightweight and cross-platform clipboard history applet
 EAPI=7
 HOMEPAGE=https://github.com/pvanek/qlipper
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/pvanek/qlipper/archive/5.1.2.tar.gz -> qlipper-5.1.2.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebe83051b270d4a3ac36ed945c373103
+_md5_=150de0ea2caf8a9bbee1ad90f509c14f
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 7ae210c0d6c2..bce45cfb4a4e 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 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_=c240692219f18d45dd613e0540615704
+_md5_=a275dbe868ce3aabff34ded1d09b84bb
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 3820cecd3a1c..0829318e6494 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.4.2-r1 b/metadata/md5-cache/x11-terms/alacritty-0.4.2-r1
index d648db8c925b..f2ef60f9968e 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.4.2-r1
+++ b/metadata/md5-cache/x11-terms/alacritty-0.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://github.com/alacritty/alacritty/archive/v0.4.2.tar.gz -> alacritty-0.4.2.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.9/download -> aho-corasick-0.7.9.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.4/download -> arc-swap-0.4.4.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.12/download -> arrayvec-0.4.12.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bindgen/0.53.1/download -> bindgen-0.53.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.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/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cexpr/0.3.6/download -> cexpr-0.3.6.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/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.28.1/download -> clang-sys-0.28.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/cocoa/0.19.1/download -> cocoa-0.19.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.6.3/download -> copypasta-0.6.3.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-text/13.3.2/download -> core-text-13.3.2.crate https://crates.io/api/v1/crates/core-video-sys/0.1.3/download -> core-video-sys-0.1.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/deflate/0.7.20/download -> deflate-0.7.20.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.1.1/download -> downcast-rs-1.1.1.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/dwrote/0.9.0/download -> dwrote-0.9.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.1/download -> embed-resource-1.3.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.7/download -> euclid-0.20.7.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.13/download -> flate2-1.0.13.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/font/0.1.0/download -> font-0.1.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.23.0/download -> freetype-rs-0.23.0.crate https://crates.io/api/v1/crates/freetype-sys/0.9.0/download -> freetype-sys-0.9.0.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.0/download -> glutin-0.24.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/image/0.22.5/download -> image-0.22.5.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inotify/0.7.0/download -> inotify-0.7.0.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.2/download -> instant-0.1.2.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lexical-core/0.6.2/download -> lexical-core-0.6.2.crate https://crates.io/api/v1/crates/libc/0.2.67/download -> libc-0.2.67.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/lock_api/0.3.3/download -> lock_api-0.3.3.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.16.1/download -> nix-0.16.1.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.3/download -> num-rational-0.2.3.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.10.28/download -> openssl-0.10.28.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.54/download -> openssl-sys-0.9.54.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.0/download -> parking_lot-0.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.0/download -> parking_lot_core-0.7.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.15.3/download -> png-0.15.3.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.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/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.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/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.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/redox_users/0.3.4/download -> redox_users-0.3.4.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.15/download -> regex-syntax-0.6.15.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/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.2/download -> rusttype-0.8.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.17/download -> schannel-0.1.17.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.3.4/download -> security-framework-0.3.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.3/download -> security-framework-sys-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.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/serde_yaml/0.8.11/download -> serde_yaml-0.8.11.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.9/download -> servo-fontconfig-sys-4.0.9.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.3/download -> servo-freetype-sys-4.0.3.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.13/download -> signal-hook-0.1.13.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.1/download -> siphasher-0.3.1.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smallvec/1.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.4.0/download -> smithay-clipboard-0.4.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.3.4/download -> static_assertions-0.3.4.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.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.16/download -> syn-1.0.16.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.1/download -> terminfo-0.7.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/urlocator/0.1.3/download -> urlocator-0.1.3.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.7.1/download -> vte-0.7.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/which/3.1.0/download -> which-3.1.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.0/download -> winit-0.22.0.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate https://crates.io/api/v1/crates/zip/0.5.5/download -> zip-0.5.5.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=3fb3e3ad414b529f0fc424020100e857
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.4.3 b/metadata/md5-cache/x11-terms/alacritty-0.4.3
new file mode 100644
index 000000000000..587d15e89269
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-0.4.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 )
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/alacritty/alacritty
+IUSE=wayland +X debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://github.com/alacritty/alacritty/archive/v0.4.3.tar.gz -> alacritty-0.4.3.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/android_log-sys/0.1.2/download -> android_log-sys-0.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.12/download -> arrayvec-0.4.12.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bindgen/0.53.2/download -> bindgen-0.53.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.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/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.43/download -> cmake-0.1.43.crate https://crates.io/api/v1/crates/cocoa/0.19.1/download -> cocoa-0.19.1.crate https://crates.io/api/v1/crates/cocoa/0.20.0/download -> cocoa-0.20.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.6.3/download -> copypasta-0.6.3.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.0/download -> core-graphics-0.19.0.crate https://crates.io/api/v1/crates/core-text/15.0.0/download -> core-text-15.0.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/deflate/0.8.4/download -> deflate-0.8.4.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.1.1/download -> downcast-rs-1.1.1.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/dwrote/0.9.0/download -> dwrote-0.9.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.11/download -> euclid-0.20.11.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/font/0.1.0/download -> font-0.1.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.23.0/download -> freetype-rs-0.23.0.crate https://crates.io/api/v1/crates/freetype-sys/0.9.0/download -> freetype-sys-0.9.0.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.0/download -> glutin-0.24.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/image/0.23.4/download -> image-0.23.4.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inotify/0.7.0/download -> inotify-0.7.0.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.3/download -> instant-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lexical-core/0.6.2/download -> lexical-core-0.6.2.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.1.0/download -> ndk-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.1.0/download -> ndk-glue-0.1.0.crate https://crates.io/api/v1/crates/ndk-sys/0.1.0/download -> ndk-sys-0.1.0.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.10.29/download -> openssl-0.10.29.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.56/download -> openssl-sys-0.9.56.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.16.3/download -> png-0.16.3.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.7/download -> ppv-lite86-0.2.7.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.4/download -> proc-macro-crate-0.1.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.13/download -> proc-macro2-1.0.13.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.3/download -> rusttype-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/serde_yaml/0.8.12/download -> serde_yaml-0.8.12.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.9/download -> servo-fontconfig-sys-4.0.9.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.3/download -> servo-freetype-sys-4.0.3.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.15/download -> signal-hook-0.1.15.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.4.0/download -> smithay-clipboard-0.4.0.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.3.4/download -> static_assertions-0.3.4.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.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.22/download -> syn-1.0.22.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.2/download -> terminfo-0.7.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/urlocator/0.1.3/download -> urlocator-0.1.3.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.8.0/download -> vte-0.8.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.2/download -> winit-0.22.2.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate https://crates.io/api/v1/crates/zip/0.5.5/download -> zip-0.5.5.crate
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=329958b42968e3b31bdc1a8b610ba55b
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.4.3_rc1 b/metadata/md5-cache/x11-terms/alacritty-0.4.3_rc1
deleted file mode 100644
index 88ea48d20c5e..000000000000
--- a/metadata/md5-cache/x11-terms/alacritty-0.4.3_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 )
-DESCRIPTION=GPU-accelerated terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/alacritty/alacritty
-IUSE=wayland +X debug
-KEYWORDS=~amd64 ~ppc64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
-RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
-REQUIRED_USE=|| ( wayland X )
-SLOT=0
-SRC_URI=https://github.com/alacritty/alacritty/archive/v0.4.3-rc1.tar.gz -> alacritty-0.4.3_rc1.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/android_log-sys/0.1.2/download -> android_log-sys-0.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.12/download -> arrayvec-0.4.12.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bindgen/0.53.2/download -> bindgen-0.53.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.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/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.43/download -> cmake-0.1.43.crate https://crates.io/api/v1/crates/cocoa/0.19.1/download -> cocoa-0.19.1.crate https://crates.io/api/v1/crates/cocoa/0.20.0/download -> cocoa-0.20.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.6.3/download -> copypasta-0.6.3.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.0/download -> core-graphics-0.19.0.crate https://crates.io/api/v1/crates/core-text/15.0.0/download -> core-text-15.0.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/deflate/0.8.4/download -> deflate-0.8.4.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.1.1/download -> downcast-rs-1.1.1.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/dwrote/0.9.0/download -> dwrote-0.9.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.11/download -> euclid-0.20.11.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/font/0.1.0/download -> font-0.1.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.23.0/download -> freetype-rs-0.23.0.crate https://crates.io/api/v1/crates/freetype-sys/0.9.0/download -> freetype-sys-0.9.0.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.0/download -> glutin-0.24.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/image/0.23.4/download -> image-0.23.4.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inotify/0.7.0/download -> inotify-0.7.0.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.3/download -> instant-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.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/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lexical-core/0.6.2/download -> lexical-core-0.6.2.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.1.0/download -> ndk-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.1.0/download -> ndk-glue-0.1.0.crate https://crates.io/api/v1/crates/ndk-sys/0.1.0/download -> ndk-sys-0.1.0.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.10.29/download -> openssl-0.10.29.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.56/download -> openssl-sys-0.9.56.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.16.3/download -> png-0.16.3.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.7/download -> ppv-lite86-0.2.7.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.4/download -> proc-macro-crate-0.1.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.13/download -> proc-macro2-1.0.13.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.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/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.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/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.3/download -> rusttype-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/serde_yaml/0.8.12/download -> serde_yaml-0.8.12.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.9/download -> servo-fontconfig-sys-4.0.9.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.3/download -> servo-freetype-sys-4.0.3.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.15/download -> signal-hook-0.1.15.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.4.0/download -> smithay-clipboard-0.4.0.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.3.4/download -> static_assertions-0.3.4.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.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.22/download -> syn-1.0.22.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.2/download -> terminfo-0.7.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.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.1.0/download -> unicode-xid-0.1.0.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/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/urlocator/0.1.3/download -> urlocator-0.1.3.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.8.0/download -> vte-0.8.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.2/download -> winit-0.22.2.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate https://crates.io/api/v1/crates/zip/0.5.5/download -> zip-0.5.5.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=329958b42968e3b31bdc1a8b610ba55b
diff --git a/metadata/md5-cache/x11-terms/alacritty-9999 b/metadata/md5-cache/x11-terms/alacritty-9999
index 1a3e334c54e0..efca64a7eae2 100644
--- a/metadata/md5-cache/x11-terms/alacritty-9999
+++ b/metadata/md5-cache/x11-terms/alacritty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	4cfad681317daaca938cc223bc0166a3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	d8e0b70112b94f60618f3def70bfb16e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
 _md5_=9a8fc2c8e7282e2836f3e9672b129221
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index bbc787b647dd..c769efaa614a 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/claws-mail-themes-20140629 b/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
index 8bad162fd73e..5f8e2f0d0e2e 100644
--- a/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
+++ b/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=Iconsets for Claws Mail
 EAPI=5
-HOMEPAGE=http://www.claws-mail.org/
+HOMEPAGE=https://www.claws-mail.org/
 KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 GPL-3 CC-BY-3.0 CC-BY-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-3.0 MPL-1.1 freedist public-domain all-rights-reserved
 RDEPEND=mail-client/claws-mail
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.claws-mail.org/themes/claws-mail-themes-20140629.tar.gz
-_md5_=d22b1fe3d4c8b7387b8719e1048a6e6c
+SRC_URI=https://www.claws-mail.org/themes/claws-mail-themes-20140629.tar.gz
+_md5_=652be1cb45c9083085b02656bcb414c9
diff --git a/metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200427 b/metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200602
similarity index 95%
rename from metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200427
rename to metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200602
index e11ee80bc03f..9a7bb0b8219f 100644
--- a/metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200427
+++ b/metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200602
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-wm/enlightenment
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~juippis/distfiles/e-flat-theme-0_pre20200427.edj
+SRC_URI=https://dev.gentoo.org/~juippis/distfiles/e-flat-theme-0_pre20200602.edj
 _md5_=3eb9163523abdbbf759a8b54388595f1
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 0145df7c60a2..82f76b194337 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/i3-4.18 b/metadata/md5-cache/x11-wm/i3-4.18
index 7c4221855c55..71329c91ba19 100644
--- a/metadata/md5-cache/x11-wm/i3-4.18
+++ b/metadata/md5-cache/x11-wm/i3-4.18
@@ -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 ~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.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	0914eab919f4f11dd9e0407b92af4726	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f91e91f3d79ed41fe8aa7bffbad6db80
+_md5_=880786c53857a981f734de760db27f7c
diff --git a/metadata/md5-cache/x11-wm/sithwm-1.2.3 b/metadata/md5-cache/x11-wm/sithwm-1.2.3
index 788742229e84..557d050fabf6 100644
--- a/metadata/md5-cache/x11-wm/sithwm-1.2.3
+++ b/metadata/md5-cache/x11-wm/sithwm-1.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile
 DEPEND=x11-libs/libX11
 DESCRIPTION=Minimalist Window Manager for X
 EAPI=7
-HOMEPAGE=http://sithwm.darkside.no/
+HOMEPAGE=https://sithwm.darkside.no/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ MIT 9wm
 RDEPEND=x11-libs/libX11
 SLOT=0
-SRC_URI=http://sithwm.darkside.no/sn/sithwm-1.2.3.tgz
+SRC_URI=https://sithwm.darkside.no/sn/sithwm-1.2.3.tgz
 _eclasses_=multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=b98add5e6996fb4ff917b7bc9a4ceab3
+_md5_=b7be099acf47c156321dbd75730248f3
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index eb4ca1137bf2..4f7729fedf77 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/exo-4.15.1 b/metadata/md5-cache/xfce-base/exo-4.15.1
index 2b98422ce8f8..8f8dffaae4a0 100644
--- a/metadata/md5-cache/xfce-base/exo-4.15.1
+++ b/metadata/md5-cache/xfce-base/exo-4.15.1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42 dev-perl/URI >=x11-libs/gtk+-3.
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/4.15/exo-4.15.1.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72ead684170bd1efa56ca9cbc841eb65
+_md5_=d61973c8c260d39824a4da81b37fb79a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b7ec5ade7ac1..23f872915694 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 11671 BLAKE2B 1690ee8d13e213a22166c131af13ff1a0dfed95b26626717da1dd0e69d4ef665a541c29fb093b3448e8ead5892ef808f1ff49a831e1b340a550acc001b504b9b SHA512 f9c4594162a5063caf99f69d3ea6a9bd4aa9ba259aef4cbb27a28dc923f75da8b758a02237fa977fb867ea8cb8b599d4a1b25c6f88cf07541aa64d7ae03f5127
-TIMESTAMP 2020-06-01T16:38:14Z
+TIMESTAMP 2020-06-04T09:38:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7VLvZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7YwQ9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBQeA/6A9YIP9X39EmI2SKIYgALWS7VdaqH3JmNgU/HtOiPi+CiTVr0YEsRCCjf
-4drj7+8LxTvxSdntEwJK7LdMno01kjKPcXPeFdUwtYN85IdK0YyKGXmcWVHCUtO9
-NsITHGfuNaEpNmQR1aS0/aLcdfY9spHSPbBTLmAb6r1zpc9l8lENik/oC/RiqPsG
-g/H7mZSpAm5deHZ5ceIysiCiesR1xMibi6igUvGNvLBG3c+VeHevX+oBK2cutlHL
-jma1v1koIoM25FmSCfjYcttYFk8P08HDrYBsDZEp6QTvI10dddDOKL5B8jiqTaX0
-jcmxnITgt16AzEgT5ZbFYHXpo+Y3PoWbGv0exuzzyL8anHJGjnfVgOWRTvbngic0
-AgGQmKy2FHvEruHiqWddEwuwr8+u7FHSsPq99abi4XvcUEWICaWXJYtH8+SSjy+h
-edfHtDgRcDD/FP9PTNSyz3KLfsTKdFYze+xW0pxCsNT3shThr/5rw69V6L0O+pKU
-3IHSP1byasVATWzEerf41qcGm1y7nEedRbHlwMEb1/9s8d39ESHFuFA9Yop5HXxg
-/slKZOiQvLSMZKrAt5Xn06yGERVEEO2HuMSczBDA84RPBgGhirPTpH2ZHa7arPqV
-2XOBt9hL6Kh1yLlB+fIiKyzeiia2qtG63uj81dhFPz5ibCcpGIs=
-=sd0F
+klCVJQ/+IbDBZO8ORCQ8xt7cOTYyGkpIXPgZgy8BFG3IURqvotM9y/jobPbdS3WI
+Z8MpUk+n8zyzWOQAHaFKKD6FDWvow/q3j51IiWVozzmhgmlH1Ar8NMIYC2epjWAk
+dJpRg5YHp6lTKv+0E6D9uCQqR2X7JJenFbUyRJZ1FHBx6JH05pU8Gcij4mdU203c
+n8Pk71JXPm0Rf8lurfNINg9wah97GehDCnTvYWBUSRwR9pyhTv6M0kTZXNVL1QVr
+t192QwsdOvuUStIx82dFxAsuHNzDk1017kxyqYr/uVdBQAbx1YDkyQQeb/2iNoSN
+b8L6enHUis5BSPTwa5IUNdSuHqvKzTl3ZR1dS1AXVWgcwzDgxcXIGEDgjF5GZM0g
+mpvLBQg8rPDOIyX061TqFpqlHLpVD/sCsl44lUUORhbLWMvqqR3Xj1Az3QH5OLpo
+gB9DuvZsyzIAeR30sH4MBSd42o8pUX4OrDTNQB/J4ILsFstvFdqN0SgqPdVQW0VX
+Dq/G/5a/HMgeGqC/ash9nhh40angIdek6ToeWoMpgUm24UTav3YcT231X8SW1uLu
+UH+Tz8psZYv6dxbG7A0zNVQ20wx416KcMtITDP4vrDW2oAucHQc+tN9ByJF1hdng
+/aRNzZUKZU2bm7vBPTJlfkaW1nG7UZFZRf3VZ57xJD2Y3w5vbJc=
+=AKZe
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 47caad3feb70..43337e71d4f0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jun 2020 16:38:11 +0000
+Thu, 04 Jun 2020 09:38:20 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index c9c2900fd6c4..209d081738b7 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1414,6 +1414,11 @@
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>
     </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Python keywordreqs (on hake)</role>
+    </member>
     <member>
       <email>slyfox@gentoo.org</email>
       <name>Sergei Trofimovich</name>
@@ -1550,6 +1555,11 @@
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>
     </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Python keywordreqs (on guppy)</role>
+    </member>
     <member>
       <email>slyfox@gentoo.org</email>
       <name>Sergei Trofimovich</name>
@@ -2575,6 +2585,11 @@
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>
     </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Python keywordreqs (on bogsucker/timberdoodle)</role>
+    </member>
     <member>
       <email>slyfox@gentoo.org</email>
       <name>Sergei Trofimovich</name>
@@ -3233,6 +3248,11 @@
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>
     </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Python keywordreqs (on catbus)</role>
+    </member>
     <member>
       <email>slyfox@gentoo.org</email>
       <name>Sergei Trofimovich</name>
@@ -3397,15 +3417,15 @@
       <name>Chris Reffett</name>
       <role>GLSA Coordinator</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>k_f@gentoo.org</email>
       <name>Kristian Fiskerstrand</name>
-      <role>Co-Lead</role>
+      <role>Member</role>
     </member>
     <member is-lead="1">
       <email>whissi@gentoo.org</email>
       <name>Thomas Deutschmann</name>
-      <role>Co-Lead</role>
+      <role>Lead</role>
     </member>
     <member>
       <email>zlogene@gentoo.org</email>
@@ -3952,6 +3972,11 @@
       <name>Agostino Sarubbo</name>
       <role>Developer (Security bugs primarily)</role>
     </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Python keywordreqs</role>
+    </member>
     <member>
       <email>nativemad@gentoo.org</email>
       <name>Andreas Schuerch</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index f8faa1809f70..34b6a0b77386 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon 01 Jun 2020 04:38:11 PM UTC
+Thu 04 Jun 2020 09:38:19 AM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index b7c74e823025..f393704e25b8 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -200,6 +200,7 @@
 2005190138 ./acct-group/svnusers/svnusers-0.ebuild
 2005200438 ./acct-group/exabgp/exabgp-0.ebuild
 2005302339 ./acct-group/clair/clair-0.ebuild
+2006041038 ./acct-group/motion/motion-0.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -383,13 +384,14 @@
 2005190138 ./acct-user/svn/svn-0.ebuild
 2005200438 ./acct-user/exabgp/exabgp-0.ebuild
 2005302339 ./acct-user/clair/clair-0.ebuild
+2006041038 ./acct-user/motion/motion-0.ebuild
 1704191101 ./app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
 2001051415 ./app-accessibility/accerciser/accerciser-3.22.0.ebuild
 2004032241 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
-2004221739 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
+2006031838 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
 2003250539 ./app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
 2004032241 ./app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
-2004221739 ./app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
+2006031838 ./app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
 2004032241 ./app-accessibility/brltty/brltty-5.2-r1.ebuild
 2005112009 ./app-accessibility/brltty/brltty-6.0-r1.ebuild
 2002052239 ./app-accessibility/caribou/caribou-0.4.21.ebuild
@@ -474,8 +476,8 @@
 1912111539 ./app-admin/chrpath/chrpath-0.13-r2.ebuild
 1910111840 ./app-admin/clog/clog-1.3.0.ebuild
 2002231739 ./app-admin/clsync/clsync-0.4.2.ebuild
-2005311139 ./app-admin/clsync/clsync-0.4.4.ebuild
 2005311139 ./app-admin/clsync/clsync-9999.ebuild
+2006040938 ./app-admin/clsync/clsync-0.4.4.ebuild
 1902152139 ./app-admin/clustershell/clustershell-1.7.3.ebuild
 1908181739 ./app-admin/conky/conky-1.11.5.ebuild
 2002112050 ./app-admin/conky/conky-1.10.8-r4.ebuild
@@ -497,6 +499,7 @@
 1702282250 ./app-admin/denyhosts/denyhosts-3.0.ebuild
 2002112050 ./app-admin/denyhosts/denyhosts-2.9.ebuild
 2005071639 ./app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+2006012008 ./app-admin/denyhosts/denyhosts-3.0-r2.ebuild
 2004252109 ./app-admin/diamond/diamond-4.0.515.20170311.ebuild
 1906041809 ./app-admin/dio/dio-1.5.2-r1.ebuild
 1912110241 ./app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -687,17 +690,14 @@
 2002092009 ./app-admin/ps_mem/ps_mem-3.13-r1.ebuild
 2005271909 ./app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
 1910042139 ./app-admin/psmon/psmon-1.39-r1.ebuild
-2004112109 ./app-admin/puppet-agent/puppet-agent-6.14.0.ebuild
-2005022139 ./app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
+2006020338 ./app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
+2006032108 ./app-admin/puppet-agent/puppet-agent-6.16.0.ebuild
 1911010909 ./app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
-2004112109 ./app-admin/puppet/puppet-6.14.0.ebuild
 2004141539 ./app-admin/puppet/puppet-5.5.19-r1.ebuild
 2005010809 ./app-admin/puppet/puppet-5.5.20.ebuild
-2005022139 ./app-admin/puppet/puppet-6.15.0.ebuild
-2003120439 ./app-admin/puppetdb/puppetdb-6.9.1.ebuild
-2005022139 ./app-admin/puppetdb/puppetdb-6.10.0.ebuild
-2003251909 ./app-admin/puppetserver/puppetserver-6.9.1-r1.ebuild
-2005022139 ./app-admin/puppetserver/puppetserver-6.11.0.ebuild
+2006020338 ./app-admin/puppet/puppet-6.15.0.ebuild
+2006020338 ./app-admin/puppetdb/puppetdb-6.10.0.ebuild
+2006020338 ./app-admin/puppetserver/puppetserver-6.11.0.ebuild
 2005121809 ./app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
 2004032241 ./app-admin/pwgen/pwgen-2.08.ebuild
 2004231009 ./app-admin/pwman3/pwman3-0.10.0-r1.ebuild
@@ -811,7 +811,7 @@
 2005021539 ./app-antivirus/clamav/clamav-0.102.2-r3.ebuild
 2005190038 ./app-antivirus/clamav/clamav-0.102.3.ebuild
 2002071439 ./app-antivirus/clamtk/clamtk-6.02-r1.ebuild
-2005021939 ./app-antivirus/clamtk/clamtk-6.03.ebuild
+2006040938 ./app-antivirus/clamtk/clamtk-6.03.ebuild
 2005190038 ./app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild
 1912261409 ./app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
 2002112050 ./app-arch/afio/afio-2.5.1-r2.ebuild
@@ -852,7 +852,7 @@
 2004202139 ./app-arch/file-roller/file-roller-3.32.4.ebuild
 1712291639 ./app-arch/funzix/funzix-1.0.ebuild
 2004032241 ./app-arch/gcab/gcab-1.3.ebuild
-2005132039 ./app-arch/gcab/gcab-1.4.ebuild
+2006031838 ./app-arch/gcab/gcab-1.4.ebuild
 2004142009 ./app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
 1702282250 ./app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
 2003261841 ./app-arch/gzip/gzip-1.10.ebuild
@@ -976,6 +976,8 @@
 1710271648 ./app-backup/backuppc/backuppc-3.3.1-r5.ebuild
 2002231739 ./app-backup/bacula/bacula-9.4.4-r2.ebuild
 2003252009 ./app-backup/bacula/bacula-9.6.3.ebuild
+2006021708 ./app-backup/bacula/bacula-9.4.4-r3.ebuild
+2006021708 ./app-backup/bacula/bacula-9.6.3-r1.ebuild
 2005140739 ./app-backup/bareos/bareos-17.2.9.ebuild
 2005140739 ./app-backup/bareos/bareos-18.2.8.ebuild
 2005140739 ./app-backup/bareos/bareos-19.2.7.ebuild
@@ -1011,12 +1013,10 @@
 1907081009 ./app-backup/dar/dar-2.6.5.ebuild
 2002151310 ./app-backup/dar/dar-2.5.11.ebuild
 2004111909 ./app-backup/dar/dar-2.6.9.ebuild
+2006022138 ./app-backup/dar/dar-2.6.10.ebuild
 1712281839 ./app-backup/dirvish/dirvish-1.2.1.ebuild
-2003281939 ./app-backup/duplicity/duplicity-0.8.09-r1.ebuild
-2003281939 ./app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild
-2003281939 ./app-backup/duplicity/duplicity-0.8.11.1596.ebuild
-2003291909 ./app-backup/duplicity/duplicity-0.8.12.1612.ebuild
 2005121009 ./app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild
+2006022338 ./app-backup/duplicity/duplicity-0.8.13.ebuild
 1702282250 ./app-backup/duply/duply-1.11.2.ebuild
 1702282250 ./app-backup/duply/duply-1.11.3.ebuild
 1702282250 ./app-backup/duply/duply-1.9.2.ebuild
@@ -1064,7 +1064,7 @@
 2002231739 ./app-backup/snapper/snapper-0.5.6-r1.ebuild
 2002231739 ./app-backup/snapper/snapper-0.8.6.ebuild
 2004171839 ./app-backup/snapper/snapper-0.8.7.ebuild
-2006011008 ./app-backup/snapper/snapper-0.8.9.ebuild
+2006040608 ./app-backup/snapper/snapper-0.8.9-r1.ebuild
 1911081009 ./app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
 1702282250 ./app-backup/tarsnap/tarsnap-1.0.35.ebuild
 1702282250 ./app-backup/tarsnap/tarsnap-1.0.37.ebuild
@@ -1077,6 +1077,7 @@
 2004020109 ./app-backup/zbackup/zbackup-9999.ebuild
 2005311609 ./app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild
 2004290139 ./app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
+2006021808 ./app-backup/kup/kup-0.8.0.ebuild
 1702282250 ./app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
 1805180038 ./app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
 1702282250 ./app-benchmarks/bashmark/bashmark-0.6.2.ebuild
@@ -1191,6 +1192,7 @@
 2004180639 ./app-crypt/acme/acme-1.3.0-r1.ebuild
 2005062339 ./app-crypt/acme/acme-1.4.0.ebuild
 2005062339 ./app-crypt/acme/acme-9999.ebuild
+2006032138 ./app-crypt/acme/acme-1.5.0.ebuild
 2001051415 ./app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
 2001051415 ./app-crypt/acmebot/acmebot-9999.ebuild
 1809280333 ./app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@@ -1212,13 +1214,16 @@
 2004192139 ./app-crypt/certbot-apache/certbot-apache-1.3.0-r1.ebuild
 2005062339 ./app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild
 2005062339 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
+2006032138 ./app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
 2002180109 ./app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
 2004050009 ./app-crypt/certbot-nginx/certbot-nginx-1.3.0.ebuild
 2005062339 ./app-crypt/certbot-nginx/certbot-nginx-1.4.0.ebuild
 2005062339 ./app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+2006032138 ./app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
 2004182109 ./app-crypt/certbot/certbot-1.3.0.ebuild
 2005062339 ./app-crypt/certbot/certbot-1.4.0.ebuild
-2005062339 ./app-crypt/certbot/certbot-9999.ebuild
+2006032138 ./app-crypt/certbot/certbot-1.5.0.ebuild
+2006032138 ./app-crypt/certbot/certbot-9999.ebuild
 2005060209 ./app-crypt/cfssl/cfssl-1.4.1.ebuild
 2003182039 ./app-crypt/chntpw/chntpw-140201.ebuild
 1702282250 ./app-crypt/ckpass/ckpass-0.2-r1.ebuild
@@ -1364,7 +1369,7 @@
 2003261841 ./app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
 2004032241 ./app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
 2004032241 ./app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
-2005270939 ./app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+2006040938 ./app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
 1809280333 ./app-crypt/pius/pius-2.2.4.ebuild
 2004161009 ./app-crypt/pius/pius-3.0.0.ebuild
 1912110241 ./app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -1518,18 +1523,18 @@
 2004032241 ./app-dicts/myspell-es/myspell-es-2.3.ebuild
 2004032241 ./app-dicts/myspell-et/myspell-et-20030606.ebuild
 2004032241 ./app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
-2004032241 ./app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
+2006041239 ./app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
 2004032241 ./app-dicts/myspell-ga/myspell-ga-20160213.ebuild
 2004032241 ./app-dicts/myspell-gl/myspell-gl-20131013.ebuild
 2004032241 ./app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
 2004032241 ./app-dicts/myspell-hr/myspell-hr-20080813.ebuild
 2004032241 ./app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
 2004032241 ./app-dicts/myspell-ia/myspell-ia-20140518.ebuild
-2004032241 ./app-dicts/myspell-id/myspell-id-2.0.ebuild
-2004032241 ./app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
+2006041239 ./app-dicts/myspell-id/myspell-id-2.0.ebuild
+2006041239 ./app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
 2004032241 ./app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
 2004032241 ./app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
-2004032241 ./app-dicts/myspell-km/myspell-km-1.6.ebuild
+2006041239 ./app-dicts/myspell-km/myspell-km-1.6.ebuild
 2004032241 ./app-dicts/myspell-ku/myspell-ku-0.21.ebuild
 2004032241 ./app-dicts/myspell-lt/myspell-lt-1.3.ebuild
 2004032241 ./app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
@@ -1547,12 +1552,12 @@
 2003261841 ./app-dicts/myspell-ru/myspell-ru-20180627.ebuild
 2004032241 ./app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
 2004032241 ./app-dicts/myspell-sk/myspell-sk-20110224.ebuild
-2004032241 ./app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
+2006041239 ./app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
 2004032241 ./app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
-2004032241 ./app-dicts/myspell-sv/myspell-sv-2.14.ebuild
+2006041239 ./app-dicts/myspell-sv/myspell-sv-2.14.ebuild
 2004032241 ./app-dicts/myspell-sw/myspell-sw-20110106.ebuild
 2004032241 ./app-dicts/myspell-tn/myspell-tn-20060316.ebuild
-2004032241 ./app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
+2006041239 ./app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
 2004032241 ./app-dicts/myspell-zu/myspell-zu-20100126.ebuild
 2002091942 ./app-dicts/opendict/opendict-0.6.7-r1.ebuild
 2002112051 ./app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
@@ -1734,7 +1739,7 @@
 1811281409 ./app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
 1912210209 ./app-doc/casting-spels-emacs/casting-spels-emacs-19-r2.ebuild
 1807210109 ./app-doc/clsync-docs/clsync-docs-0.4.2.ebuild
-2005061939 ./app-doc/clsync-docs/clsync-docs-0.4.4-r1.ebuild
+2006040938 ./app-doc/clsync-docs/clsync-docs-0.4.4-r1.ebuild
 2004051039 ./app-doc/cppman/cppman-0.4.8-r2.ebuild
 2004051039 ./app-doc/cppman/cppman-0.4.9.ebuild
 1702282250 ./app-doc/csound-manual/csound-manual-6.06.ebuild
@@ -2027,7 +2032,7 @@
 1711200020 ./app-emacs/atomic-chrome/atomic-chrome-2.0.0.ebuild
 2002231739 ./app-emacs/auctex/auctex-11.92.ebuild
 2002231739 ./app-emacs/auctex/auctex-12.1-r1.ebuild
-2005291109 ./app-emacs/auctex/auctex-12.2.ebuild
+2006040938 ./app-emacs/auctex/auctex-12.2.ebuild
 1910011939 ./app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
 2004051339 ./app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
 1910171639 ./app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild
@@ -2339,6 +2344,7 @@
 1702282250 ./app-emulation/dinero/dinero-4.7-r1.ebuild
 2005282009 ./app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild
 2005282009 ./app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+2006022108 ./app-emulation/diskimage-builder/diskimage-builder-3.0.0.ebuild
 1910051539 ./app-emulation/dlx/dlx-1.0.0.ebuild
 1908151309 ./app-emulation/dlx/dlx-1.5.20.ebuild
 1709080240 ./app-emulation/docker-bench-security/docker-bench-security-1.3.2.ebuild
@@ -2346,6 +2352,7 @@
 2003201209 ./app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild
 2004012339 ./app-emulation/docker-compose/docker-compose-1.25.4-r2.ebuild
 2004101739 ./app-emulation/docker-compose/docker-compose-1.25.5.ebuild
+2006032008 ./app-emulation/docker-compose/docker-compose-1.26.0.ebuild
 1908100839 ./app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
 1702282250 ./app-emulation/docker-gc/docker-gc-9999.ebuild
 1912111539 ./app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
@@ -2432,10 +2439,8 @@
 2005201639 ./app-emulation/lxc/lxc-4.0.2-r2.ebuild
 1912110241 ./app-emulation/lxd/lxd-3.14.ebuild
 2005151209 ./app-emulation/lxd/lxd-4.0.1.ebuild
-1901181209 ./app-emulation/nemu/nemu-2.1.0.ebuild
-1903040109 ./app-emulation/nemu/nemu-2.2.0.ebuild
-1802120109 ./app-emulation/nemu/nemu-9999.ebuild
-1911290109 ./app-emulation/nemu/nemu-2.2.1.ebuild
+2006041038 ./app-emulation/nemu/nemu-2.2.1.ebuild
+2006041038 ./app-emulation/nemu/nemu-9999.ebuild
 1912202139 ./app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
 2005100128 ./app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
 1901232109 ./app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild
@@ -2510,9 +2515,9 @@
 2004181909 ./app-emulation/virtualbox-modules/virtualbox-modules-6.0.20.ebuild
 2004181909 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.6.ebuild
 2004270309 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
-2004181909 ./app-emulation/virtualbox/virtualbox-6.1.6.ebuild
 2005071639 ./app-emulation/virtualbox/virtualbox-5.2.40.ebuild
-2005071639 ./app-emulation/virtualbox/virtualbox-6.0.20.ebuild
+2006030338 ./app-emulation/virtualbox/virtualbox-6.0.20.ebuild
+2006030338 ./app-emulation/virtualbox/virtualbox-6.1.6.ebuild
 1812111839 ./app-emulation/vkd3d/vkd3d-1.0.ebuild
 1906041809 ./app-emulation/vkd3d/vkd3d-1.1.ebuild
 1912090309 ./app-emulation/vkd3d/vkd3d-9999.ebuild
@@ -2544,6 +2549,7 @@
 2005100339 ./app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
 2005240209 ./app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild
 2005240209 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+2006040139 ./app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
 1912110241 ./app-emulation/winetricks/winetricks-20190912.ebuild
 1912110241 ./app-emulation/winetricks/winetricks-99999999.ebuild
 1912250339 ./app-emulation/winetricks/winetricks-20191224.ebuild
@@ -2563,7 +2569,7 @@
 2005251739 ./app-emulation/xen/xen-4.12.3.ebuild
 2005251739 ./app-emulation/xen/xen-4.13.1.ebuild
 1911281409 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
-2001051415 ./app-emulation/crun/crun-0.10.6.ebuild
+2006021438 ./app-emulation/crun/crun-0.13.ebuild
 2005200038 ./app-emulation/pcem/pcem-16.ebuild
 1912120239 ./app-emulation/aranym/aranym-1.1.0.ebuild
 2004221309 ./app-emulation/protontricks/protontricks-1.4.1.ebuild
@@ -2572,7 +2578,7 @@
 2004211009 ./app-eselect/eselect-awk/eselect-awk-0.2.ebuild
 2005170009 ./app-eselect/eselect-awk/eselect-awk-0.3.ebuild
 2004032241 ./app-eselect/eselect-blas/eselect-blas-0.1.ebuild
-2005200938 ./app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+2006012308 ./app-eselect/eselect-blas/eselect-blas-0.2.ebuild
 2004032241 ./app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
 2004032241 ./app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
 2002112051 ./app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
@@ -2733,6 +2739,7 @@
 2005181739 ./app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
 2005181739 ./app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
 2002091942 ./app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
+2006031308 ./app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
 1809041609 ./app-i18n/ibus-rime/ibus-rime-1.2.ebuild
 1809041609 ./app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
 1908180639 ./app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
@@ -2747,8 +2754,8 @@
 2005161709 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.3.ebuild
 2005271609 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.0.ebuild
 1708121738 ./app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
-2003160009 ./app-i18n/ibus/ibus-1.5.22.ebuild
 2004032241 ./app-i18n/ibus/ibus-1.5.21-r1.ebuild
+2006031838 ./app-i18n/ibus/ibus-1.5.22.ebuild
 1707231537 ./app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
 1707231535 ./app-i18n/im-canna/im-canna-0.3.2.2.ebuild
 1906051009 ./app-i18n/im-chooser/im-chooser-1.7.0.ebuild
@@ -3001,10 +3008,10 @@
 1912111539 ./app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
 2001280209 ./app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
 2005271439 ./app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
-1702282250 ./app-misc/abduco/abduco-0.5.ebuild
-1705191351 ./app-misc/abduco/abduco-0.6.ebuild
+2006041239 ./app-misc/abduco/abduco-0.5.ebuild
+2006041239 ./app-misc/abduco/abduco-0.6.ebuild
 2002112051 ./app-misc/abook/abook-0.6.1.ebuild
-2005281909 ./app-misc/abook/abook-0.6.1-r2.ebuild
+2006040938 ./app-misc/abook/abook-0.6.1-r2.ebuild
 1806092239 ./app-misc/acdctl/acdctl-1.1-r1.ebuild
 1702282250 ./app-misc/actkbd/actkbd-0.2.8-r2.ebuild
 1805212238 ./app-misc/aldo/aldo-0.7.7.ebuild
@@ -3046,6 +3053,8 @@
 2003261841 ./app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
 2004211009 ./app-misc/c_rehash/c_rehash-1.7-r1.ebuild
 2004211009 ./app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+2006020208 ./app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
+2006022038 ./app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
 1805222138 ./app-misc/cadubi/cadubi-1.3.ebuild
 2004032241 ./app-misc/calendar/calendar-0.9.1-r1.ebuild
 1810181939 ./app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
@@ -3099,10 +3108,10 @@
 2002112051 ./app-misc/dtach/dtach-0.9.ebuild
 1702282250 ./app-misc/dvorak7min/dvorak7min-1.6.1.ebuild
 1702282250 ./app-misc/dvorakng/dvorakng-0.6.0.ebuild
-1912111539 ./app-misc/dvtm/dvtm-0.14-r1.ebuild
-1912111539 ./app-misc/dvtm/dvtm-0.15-r2.ebuild
-1912111539 ./app-misc/dvtm/dvtm-0.15-r3.ebuild
-1912111539 ./app-misc/dvtm/dvtm-9999.ebuild
+2006041239 ./app-misc/dvtm/dvtm-0.14-r1.ebuild
+2006041239 ./app-misc/dvtm/dvtm-0.15-r2.ebuild
+2006041239 ./app-misc/dvtm/dvtm-0.15-r3.ebuild
+2006041239 ./app-misc/dvtm/dvtm-9999.ebuild
 2004211009 ./app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
 1910071209 ./app-misc/egads/egads-0.9.5-r1.ebuild
 1904251509 ./app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
@@ -3158,6 +3167,7 @@
 1908281939 ./app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
 2004032241 ./app-misc/glimpse/glimpse-4.18.6-r1.ebuild
 1905102109 ./app-misc/gnote/gnote-3.30.0.ebuild
+2006030139 ./app-misc/gnote/gnote-3.36.1.ebuild
 1702282250 ./app-misc/gnuit/gnuit-4.9.5-r2.ebuild
 1810202209 ./app-misc/gnutu/gnutu-2.5-r1.ebuild
 2005120239 ./app-misc/go-jira/go-jira-1.0.23.ebuild
@@ -3177,7 +3187,7 @@
 2004032241 ./app-misc/hilite/hilite-1.5-r1.ebuild
 2002101509 ./app-misc/hivex/hivex-1.3.14.ebuild
 2005311309 ./app-misc/hivex/hivex-1.3.18.ebuild
-1906020109 ./app-misc/i2bits/i2bits-0.1.0.ebuild
+2006040009 ./app-misc/i2bits/i2bits-0.1.0.ebuild
 2002111509 ./app-misc/icdiff/icdiff-1.9.1.ebuild
 2005312308 ./app-misc/icdiff/icdiff-1.9.5.ebuild
 1912111539 ./app-misc/ifp-line/ifp-line-0.3.ebuild
@@ -3215,8 +3225,8 @@
 2004240109 ./app-misc/linux-logo/linux-logo-5.11-r5.ebuild
 2005112039 ./app-misc/linux-logo/linux-logo-6.0.ebuild
 1802252138 ./app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
-2002091942 ./app-misc/lirc/lirc-0.10.1-r3.ebuild
-2002091942 ./app-misc/lirc/lirc-0.10.1-r4.ebuild
+2006041239 ./app-misc/lirc/lirc-0.10.1-r3.ebuild
+2006041239 ./app-misc/lirc/lirc-0.10.1-r4.ebuild
 2002112051 ./app-misc/livecd-tools/livecd-tools-9999.ebuild
 2004032241 ./app-misc/livecd-tools/livecd-tools-2.5.ebuild
 2004032241 ./app-misc/livecd-tools/livecd-tools-2.6.ebuild
@@ -3341,7 +3351,7 @@
 2002162339 ./app-misc/skim/skim-0.6.9.ebuild
 2002162339 ./app-misc/skim/skim-0.7.0.ebuild
 2004042239 ./app-misc/skim/skim-0.8.1.ebuild
-2002112051 ./app-misc/sl/sl-5.02.ebuild
+2006040009 ./app-misc/sl/sl-5.02.ebuild
 2002222009 ./app-misc/slmon/slmon-0.5.13.ebuild
 1702282250 ./app-misc/smtm/smtm-1.6.10-r1.ebuild
 2005212139 ./app-misc/socnetv/socnetv-2.2.ebuild
@@ -3396,7 +3406,7 @@
 2004202139 ./app-misc/tracker/tracker-2.3.4.ebuild
 2005071639 ./app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
 2005121009 ./app-misc/trash-cli/trash-cli-0.17.1.14_p20170816-r1.ebuild
-1904200439 ./app-misc/ttyload/ttyload-0.5.3.ebuild
+2006040009 ./app-misc/ttyload/ttyload-0.5.3.ebuild
 2003092339 ./app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
 2002230040 ./app-misc/ttysnoop/ttysnoop-0.12d.ebuild
 2002060309 ./app-misc/unfoo/unfoo-1.0.8.ebuild
@@ -3534,6 +3544,7 @@
 2002240939 ./app-office/texstudio/texstudio-2.12.16.ebuild
 2004190439 ./app-office/texstudio/texstudio-9999.ebuild
 2005241808 ./app-office/texstudio/texstudio-2.12.22.ebuild
+2006032038 ./app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
 2001062039 ./app-office/unoconv/unoconv-0.9.ebuild
 2002101509 ./app-office/unoconv/unoconv-0.8.2.ebuild
 2005141639 ./app-office/unoconv/unoconv-0.9.0.ebuild
@@ -3543,9 +3554,9 @@
 2005311609 ./app-office/wps-office/wps-office-11.1.0.9505.ebuild
 1912211239 ./app-office/ktimetracker/ktimetracker-5.0.1.ebuild
 2003221939 ./app-office/gnome-todo/gnome-todo-3.28.1-r1.ebuild
-1702282250 ./app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
+2006041239 ./app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
 1905201439 ./app-officeext/ct2n/ct2n-1.5.0.ebuild
-1702282250 ./app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
+2006041239 ./app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
 1702282250 ./app-officeext/languagetool/languagetool-3.4.ebuild
 1702282250 ./app-officeext/languagetool/languagetool-3.5.ebuild
 1702282250 ./app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild
@@ -3721,8 +3732,8 @@
 2004032241 ./app-shells/bashish/bashish-2.2.4.ebuild
 1707171556 ./app-shells/ccsh/ccsh-0.0.4-r4.ebuild
 1702282250 ./app-shells/ctypes-sh/ctypes-sh-1.1.ebuild
-2004032241 ./app-shells/dash/dash-0.5.9.1-r3.ebuild
 2005081846 ./app-shells/dash/dash-0.5.10.2-r1.ebuild
+2006021208 ./app-shells/dash/dash-0.5.11.ebuild
 1712261510 ./app-shells/dsh/dsh-0.25.10-r1.ebuild
 1702282250 ./app-shells/esh/esh-0.8.5-r2.ebuild
 1912110241 ./app-shells/fish/fish-2.7.1.ebuild
@@ -3760,8 +3771,8 @@
 1903190509 ./app-shells/posh/posh-0.13.2.ebuild
 2005181039 ./app-shells/posh/posh-0.14.ebuild
 2005191038 ./app-shells/posh/posh-0.14.1.ebuild
-2002111509 ./app-shells/powerline/powerline-2.7.ebuild
 2002142009 ./app-shells/powerline/powerline-9999.ebuild
+2006012308 ./app-shells/powerline/powerline-2.7-r1.ebuild
 1702282250 ./app-shells/psh/psh-1.8.1-r3.ebuild
 2004032241 ./app-shells/push/push-2.0-r1.ebuild
 2004032241 ./app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -3827,12 +3838,8 @@
 1912111539 ./app-text/bogosort/bogosort-0.4.2-r1.ebuild
 2004211009 ./app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
 1912260009 ./app-text/c2ps/c2ps-4.0.ebuild
-2003270209 ./app-text/calibre/calibre-4.11.2.ebuild
-2003270209 ./app-text/calibre/calibre-4.12.0.ebuild
-2003270209 ./app-text/calibre/calibre-4.9.1-r2.ebuild
-2005050809 ./app-text/calibre/calibre-4.15.0.ebuild
-2005151139 ./app-text/calibre/calibre-4.16.0.ebuild
 2005270639 ./app-text/calibre/calibre-4.17.0-r1.ebuild
+2006040208 ./app-text/calibre/calibre-4.9.1-r2.ebuild
 2001081609 ./app-text/capyt/capyt-1.1.1.ebuild
 2002171539 ./app-text/catdoc/catdoc-0.95-r1.ebuild
 1809091139 ./app-text/cb2bib/cb2bib-1.9.8.ebuild
@@ -3944,7 +3951,7 @@
 2002151310 ./app-text/groonga/groonga-5.0.9.ebuild
 2002231739 ./app-text/groonga/groonga-6.1.2.ebuild
 2002231739 ./app-text/groonga/groonga-8.0.2.ebuild
-2004032241 ./app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+2006041239 ./app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
 1912291809 ./app-text/gspell/gspell-1.6.1.ebuild
 2004131939 ./app-text/gspell/gspell-1.8.3.ebuild
 2004032241 ./app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -3991,10 +3998,9 @@
 1702282250 ./app-text/jabref/jabref-2.10-r4.ebuild
 2004291939 ./app-text/jadetex/jadetex-3.13-r9.ebuild
 1908291509 ./app-text/jo/jo-1.1.ebuild
-2001280039 ./app-text/jo/jo-1.3.ebuild
-2004151509 ./app-text/jo/jo-99999.ebuild
-2001101909 ./app-text/kbibtex/kbibtex-0.9.1.ebuild
-2005291109 ./app-text/kbibtex/kbibtex-0.9.2.ebuild
+2006040938 ./app-text/jo/jo-1.3.ebuild
+2006040938 ./app-text/jo/jo-99999.ebuild
+2006040938 ./app-text/kbibtex/kbibtex-0.9.2.ebuild
 1904290309 ./app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
 2004240139 ./app-text/kjots/kjots-5.0.2-r1.ebuild
 2004251639 ./app-text/krop/krop-0.5.1-r1.ebuild
@@ -4024,13 +4030,14 @@
 1904221939 ./app-text/libmwaw/libmwaw-9999.ebuild
 2005311909 ./app-text/libmwaw/libmwaw-0.3.16.ebuild
 2005282039 ./app-text/libnumbertext/libnumbertext-1.0.5-r1.ebuild
+2006032209 ./app-text/libnumbertext/libnumbertext-1.0.6.ebuild
 1907310109 ./app-text/libodfgen/libodfgen-0.1.7.ebuild
 1811160239 ./app-text/libodfgen/libodfgen-9999.ebuild
 2003261841 ./app-text/libpaper/libpaper-1.1.28.ebuild
 2004211009 ./app-text/libpaper/libpaper-1.1.24_p5.ebuild
 2005282039 ./app-text/libqxp/libqxp-0.0.2.ebuild
 2004032241 ./app-text/libspectre/libspectre-0.2.8.ebuild
-2005071109 ./app-text/libspectre/libspectre-0.2.9.ebuild
+2006032309 ./app-text/libspectre/libspectre-0.2.9.ebuild
 2004101709 ./app-text/libstaroffice/libstaroffice-9999.ebuild
 2005311909 ./app-text/libstaroffice/libstaroffice-0.0.7.ebuild
 1910111840 ./app-text/libwpd/libwpd-0.10.3.ebuild
@@ -4119,8 +4126,8 @@
 2001271439 ./app-text/pinfo/pinfo-99999.ebuild
 2004032241 ./app-text/pinfo/pinfo-0.6.10-r5.ebuild
 2004211009 ./app-text/po4a/po4a-0.47-r1.ebuild
-2005260039 ./app-text/po4a/po4a-0.57.ebuild
 2005271609 ./app-text/po4a/po4a-0.59.1.ebuild
+2006040938 ./app-text/po4a/po4a-0.57.ebuild
 1912110241 ./app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
 1912110241 ./app-text/podofo/podofo-0.9.6_pre20171027.ebuild
 2002182339 ./app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -4267,7 +4274,7 @@
 2004301909 ./app-text/xpdf/xpdf-4.02-r4.ebuild
 2004032241 ./app-text/yelp-tools/yelp-tools-3.32.2.ebuild
 1806302039 ./app-text/yodl/yodl-4.02.01.ebuild
-1912272339 ./app-text/yodl/yodl-4.02.02.ebuild
+2006031238 ./app-text/yodl/yodl-4.02.02-r1.ebuild
 1812111309 ./app-text/zathura-cb/zathura-cb-0.1.8.ebuild
 1811110309 ./app-text/zathura-cb/zathura-cb-9999.ebuild
 1812111309 ./app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
@@ -4347,6 +4354,7 @@
 2004032241 ./app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
 2001140439 ./app-vim/editorconfig-vim/editorconfig-vim-1.0.0_beta.ebuild
 2002091942 ./app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+2006022108 ./app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
 1812311909 ./app-vim/emmet/emmet-0.85-r1.ebuild
 1811120209 ./app-vim/emmet/emmet-9999.ebuild
 2004032241 ./app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
@@ -4895,10 +4903,9 @@
 1810072009 ./dev-cpp/aixlog/aixlog-9999.ebuild
 1911131109 ./dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
 2005312238 ./dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
-1912110241 ./dev-cpp/asio/asio-1.12.2.ebuild
-1912110241 ./dev-cpp/asio/asio-1.13.0.ebuild
 2004032241 ./dev-cpp/asio/asio-1.10.8.ebuild
 2004032241 ./dev-cpp/asio/asio-1.14.0.ebuild
+2006020409 ./dev-cpp/asio/asio-1.16.1.ebuild
 2004032241 ./dev-cpp/atkmm/atkmm-2.28.0.ebuild
 2004032241 ./dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
 2002071139 ./dev-cpp/catch/catch-1.12.2.ebuild
@@ -4992,7 +4999,7 @@
 2005282139 ./dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
 1912312139 ./dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild
 2001080109 ./dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild
-2005251309 ./dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
+2006012008 ./dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
 2004211209 ./dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
 2003151709 ./dev-cpp/kokkos/kokkos-3.0.00.ebuild
 2004180739 ./dev-cpp/kokkos/kokkos-3.1.00.ebuild
@@ -5127,12 +5134,12 @@
 1902082039 ./dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
 2003311039 ./dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
 2004291409 ./dev-db/mysql-workbench/mysql-workbench-8.0.20.ebuild
-2004032241 ./dev-db/mysql/mysql-5.6.45-r2.ebuild
 2004032241 ./dev-db/mysql/mysql-5.7.27-r1.ebuild
 2005031839 ./dev-db/mysql/mysql-5.7.29.ebuild
-2005150039 ./dev-db/mysql/mysql-5.7.30.ebuild
 2005242339 ./dev-db/mysql/mysql-8.0.19-r1.ebuild
 2005242339 ./dev-db/mysql/mysql-8.0.20.ebuild
+2006020239 ./dev-db/mysql/mysql-5.6.45-r2.ebuild
+2006020239 ./dev-db/mysql/mysql-5.7.30.ebuild
 1804060238 ./dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
 1904100139 ./dev-db/mysqltuner/mysqltuner-1.7.13.ebuild
 1907312209 ./dev-db/mysqltuner/mysqltuner-1.7.15.ebuild
@@ -5196,8 +5203,6 @@
 1905231709 ./dev-db/pgpool2/pgpool2-9999.ebuild
 1910022209 ./dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
 1906151409 ./dev-db/pgtap/pgtap-0.99.0.ebuild
-2003261841 ./dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
-2005071639 ./dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
 2006011538 ./dev-db/pgxnclient/pgxnclient-1.3.ebuild
 2003241839 ./dev-db/phpmyadmin/phpmyadmin-5.0.2.ebuild
 2004031839 ./dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild
@@ -5255,7 +5260,7 @@
 2004032241 ./dev-db/tinycdb/tinycdb-0.77-r2.ebuild
 1709221234 ./dev-db/tokumx/tokumx-1.5.0-r2.ebuild
 1807171839 ./dev-db/tokumx/tokumx-2.0.2-r2.ebuild
-2002112051 ./dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+2006041239 ./dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
 1807021909 ./dev-db/tora/tora-3.2-r1.ebuild
 1807021909 ./dev-db/tora/tora-9999.ebuild
 2004032241 ./dev-db/unixODBC/unixODBC-2.3.7.ebuild
@@ -5503,6 +5508,7 @@
 2002060509 ./dev-games/simgear/simgear-9999.ebuild
 2002151310 ./dev-games/t4k-common/t4k-common-0.1.1.ebuild
 2005291109 ./dev-games/tiled/tiled-1.3.4.ebuild
+2006021508 ./dev-games/tiled/tiled-1.3.5.ebuild
 2002151310 ./dev-games/wfmath/wfmath-1.0.2.ebuild
 2004141609 ./dev-games/irrlicht-headers/irrlicht-headers-1.8.4.ebuild
 1702282250 ./dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild
@@ -7705,10 +7711,10 @@
 1702282250 ./dev-java/ognl/ognl-3.0.8.ebuild
 2002230040 ./dev-java/okio/okio-1.11.0.ebuild
 1702282250 ./dev-java/opencsv/opencsv-2.3.ebuild
-2004220109 ./dev-java/openjdk-bin/openjdk-bin-11.0.7_p10.ebuild
 2005101109 ./dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
-2004212339 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10.ebuild
+2006020108 ./dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
 2005081846 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
+2006020138 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
 2005110809 ./dev-java/openjdk/openjdk-11.0.7_p10.ebuild
 2005240709 ./dev-java/openjdk/openjdk-8.252_p09.ebuild
 2004300009 ./dev-java/openjfx/openjfx-11.0.7_p1.ebuild
@@ -7809,10 +7815,10 @@
 1702282250 ./dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
 1702282250 ./dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
 1702282250 ./dev-java/swingx/swingx-1.6.4.ebuild
-1804270438 ./dev-java/swt/swt-3.8.2-r2.ebuild
-1804270438 ./dev-java/swt/swt-4.2-r3.ebuild
-1912111539 ./dev-java/swt/swt-3.7.2-r2.ebuild
 2004251239 ./dev-java/swt/swt-4.10.ebuild
+2006041209 ./dev-java/swt/swt-3.7.2-r3.ebuild
+2006041209 ./dev-java/swt/swt-3.8.2-r3.ebuild
+2006041209 ./dev-java/swt/swt-4.2-r4.ebuild
 1908241309 ./dev-java/tablelayout/tablelayout-1.0.ebuild
 1912111539 ./dev-java/tagsoup/tagsoup-1.2.1.ebuild
 1804252238 ./dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -7824,8 +7830,7 @@
 1912110241 ./dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
 1912110241 ./dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
 1912110241 ./dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
-2002111439 ./dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
-2005010809 ./dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
+2006031839 ./dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
 1910171509 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
 1910181339 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
 1911232009 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
@@ -7998,8 +8003,8 @@
 1706031528 ./dev-lang/lfe/lfe-1.0.ebuild
 1706031528 ./dev-lang/lfe/lfe-1.1.1.ebuild
 2003211439 ./dev-lang/lisaac/lisaac-0.13.1-r2.ebuild
-1912111539 ./dev-lang/logtalk/logtalk-3.18.0.ebuild
-2003211239 ./dev-lang/logtalk/logtalk-3.36.0.ebuild
+2006041239 ./dev-lang/logtalk/logtalk-3.18.0.ebuild
+2006041239 ./dev-lang/logtalk/logtalk-3.36.0.ebuild
 2003261841 ./dev-lang/lua/lua-5.1.5-r100.ebuild
 2003261841 ./dev-lang/lua/lua-5.1.5-r101.ebuild
 2003261841 ./dev-lang/lua/lua-5.1.5-r102.ebuild
@@ -8028,7 +8033,7 @@
 2003221639 ./dev-lang/mercury/mercury-14.01.1-r1.ebuild
 2003291409 ./dev-lang/mercury/mercury-20.01.ebuild
 2004011339 ./dev-lang/mercury/mercury-20.01.1.ebuild
-1911280239 ./dev-lang/micropython/micropython-1.11.ebuild
+2006041008 ./dev-lang/micropython/micropython-1.11.ebuild
 1912111539 ./dev-lang/mlton/mlton-20130715.ebuild
 2002112051 ./dev-lang/mlton/mlton-20180207.ebuild
 2004131809 ./dev-lang/mmix/mmix-20160804-r1.ebuild
@@ -8070,6 +8075,7 @@
 2004211009 ./dev-lang/perl/perl-5.30.1.ebuild
 2005180909 ./dev-lang/perl/perl-5.30.2-r1.ebuild
 2005181639 ./dev-lang/perl/perl-5.30.2-r2.ebuild
+2006012338 ./dev-lang/perl/perl-5.30.3.ebuild
 2004201639 ./dev-lang/php/php-7.2.30.ebuild
 2004201639 ./dev-lang/php/php-7.3.17.ebuild
 2004202009 ./dev-lang/php/php-7.4.5.ebuild
@@ -8145,12 +8151,12 @@
 2005041909 ./dev-lang/spidermonkey/spidermonkey-68.8.0.ebuild
 1807050039 ./dev-lang/squirrel/squirrel-3.1.ebuild
 2002122139 ./dev-lang/srf/srf-1.0-r2.ebuild
-1911181239 ./dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild
-2005131009 ./dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
-2005141239 ./dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
-2005151139 ./dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
 2005262139 ./dev-lang/swi-prolog/swi-prolog-8.1.32.ebuild
 2005272009 ./dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
+2006041239 ./dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild
+2006041239 ./dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
+2006041239 ./dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
+2006041239 ./dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
 2004032241 ./dev-lang/swig/swig-3.0.12.ebuild
 2005220308 ./dev-lang/swig/swig-4.0.0.ebuild
 1912110241 ./dev-lang/tcc/tcc-9999.ebuild
@@ -8169,12 +8175,12 @@
 1912110241 ./dev-lang/tuprolog/tuprolog-3.1.0.ebuild
 2004032241 ./dev-lang/vala/vala-0.36.20.ebuild
 2004032241 ./dev-lang/vala/vala-0.40.18.ebuild
-2004242339 ./dev-lang/vala/vala-0.40.22.ebuild
-2004242339 ./dev-lang/vala/vala-0.46.9.ebuild
-2004242339 ./dev-lang/vala/vala-0.48.5.ebuild
 2004301039 ./dev-lang/vala/vala-0.44.11.ebuild
-2005132039 ./dev-lang/vala/vala-0.40.20.ebuild
-2005132039 ./dev-lang/vala/vala-0.46.7.ebuild
+2006031839 ./dev-lang/vala/vala-0.40.20.ebuild
+2006030108 ./dev-lang/vala/vala-0.40.23.ebuild
+2006030108 ./dev-lang/vala/vala-0.46.10.ebuild
+2006031839 ./dev-lang/vala/vala-0.46.7.ebuild
+2006030108 ./dev-lang/vala/vala-0.48.6.ebuild
 1911101840 ./dev-lang/whitespace/whitespace-0.4.ebuild
 1912111539 ./dev-lang/whitespace/whitespace-0.3.ebuild
 1902082309 ./dev-lang/xsb/xsb-3.6.0-r1.ebuild
@@ -8203,8 +8209,8 @@
 2004081809 ./dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
 2004081809 ./dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
 2002112051 ./dev-libs/angelscript/angelscript-2.34.0.ebuild
-1910220939 ./dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
-2002151310 ./dev-libs/antlr-c/antlr-c-3.5.2.ebuild
+2006041239 ./dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
+2006041239 ./dev-libs/antlr-c/antlr-c-3.5.2.ebuild
 2003250539 ./dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
 2004142009 ./dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
 1912110241 ./dev-libs/appstream/appstream-0.12.7.ebuild
@@ -8220,7 +8226,7 @@
 2003261841 ./dev-libs/atk/atk-2.35.1.ebuild
 2004032241 ./dev-libs/atk/atk-2.32.0.ebuild
 2004260509 ./dev-libs/atk/atk-2.36.0.ebuild
-2005132039 ./dev-libs/atk/atk-2.34.1.ebuild
+2006031839 ./dev-libs/atk/atk-2.34.1.ebuild
 2001061639 ./dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
 2001061639 ./dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
 2001061639 ./dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
@@ -8255,7 +8261,7 @@
 2004032241 ./dev-libs/cdk/cdk-5.0.20160131.ebuild
 1912110241 ./dev-libs/cereal/cereal-1.2.1.ebuild
 1912110241 ./dev-libs/cereal/cereal-1.2.2.ebuild
-2004032241 ./dev-libs/cgilib/cgilib-0.7-r1.ebuild
+2006041239 ./dev-libs/cgilib/cgilib-0.7-r1.ebuild
 2005270939 ./dev-libs/check/check-0.14.0-r2.ebuild
 2002112051 ./dev-libs/chmlib/chmlib-0.40-r1.ebuild
 1702282327 ./dev-libs/cl/cl-9999.ebuild
@@ -8317,7 +8323,7 @@
 2005300339 ./dev-libs/distorm64/distorm64-3.4.2.ebuild
 2005172009 ./dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
 2004032241 ./dev-libs/dotconf/dotconf-1.3-r1.ebuild
-2003171609 ./dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+2006021639 ./dev-libs/double-conversion/double-conversion-3.1.5.ebuild
 2004032241 ./dev-libs/eb/eb-4.4.1-r1.ebuild
 2002261639 ./dev-libs/editline/editline-1.17.1.ebuild
 1912110241 ./dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
@@ -8336,15 +8342,15 @@
 1704011901 ./dev-libs/fddl/fddl-20111124-r1.ebuild
 1704052014 ./dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild
 2004032241 ./dev-libs/ffcall/ffcall-2.1.ebuild
-2004171009 ./dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
+2006030139 ./dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
 2004202139 ./dev-libs/folks/folks-0.13.1.ebuild
 2005041939 ./dev-libs/foma/foma-0.9.18.ebuild
 2002151310 ./dev-libs/freexl/freexl-1.0.1.ebuild
 2002151310 ./dev-libs/freexl/freexl-1.0.2.ebuild
 2004032241 ./dev-libs/fribidi/fribidi-1.0.8.ebuild
-2005132039 ./dev-libs/fribidi/fribidi-1.0.9.ebuild
+2006031839 ./dev-libs/fribidi/fribidi-1.0.9.ebuild
 2002112051 ./dev-libs/fstrm/fstrm-0.3.0.ebuild
-2002090109 ./dev-libs/gdl/gdl-3.28.0.ebuild
+2006030139 ./dev-libs/gdl/gdl-3.28.0.ebuild
 2003261841 ./dev-libs/geoip/geoip-1.6.11.ebuild
 2003261841 ./dev-libs/geoip/geoip-1.6.12.ebuild
 2004032241 ./dev-libs/geoip/geoip-1.6.10.ebuild
@@ -8361,9 +8367,10 @@
 2004281639 ./dev-libs/gjs/gjs-1.58.6.ebuild
 2004281639 ./dev-libs/gjs/gjs-1.58.7.ebuild
 2005312238 ./dev-libs/gjs/gjs-1.64.3.ebuild
+2006030139 ./dev-libs/gjs/gjs-1.58.8.ebuild
 2004162109 ./dev-libs/glib/glib-2.60.7-r2.ebuild
-2005132039 ./dev-libs/glib/glib-2.62.6.ebuild
 2005250027 ./dev-libs/glib/glib-2.64.3.ebuild
+2006031839 ./dev-libs/glib/glib-2.62.6.ebuild
 2001281109 ./dev-libs/gmime/gmime-3.2.5.ebuild
 2004032241 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
 2005132039 ./dev-libs/gmime/gmime-3.2.7.ebuild
@@ -8377,11 +8384,11 @@
 2003261841 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.0.ebuild
 2004032241 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
 2004260509 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
-2005132039 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
+2006031839 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
 2003261841 ./dev-libs/gobject-introspection/gobject-introspection-1.64.0.ebuild
 2004032241 ./dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
 2004260509 ./dev-libs/gobject-introspection/gobject-introspection-1.64.1.ebuild
-2005132039 ./dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
+2006031839 ./dev-libs/gobject-introspection/gobject-introspection-1.62.0.ebuild
 2004202139 ./dev-libs/gom/gom-0.4.ebuild
 1901020039 ./dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
 1901020039 ./dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -8441,7 +8448,7 @@
 2005031339 ./dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
 2005301039 ./dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
 1912081509 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
-1803302139 ./dev-libs/jthread/jthread-1.3.3.ebuild
+2006041239 ./dev-libs/jthread/jthread-1.3.3.ebuild
 2005090009 ./dev-libs/judy/judy-1.0.5-r2.ebuild
 2001121639 ./dev-libs/kasync/kasync-0.3.0.ebuild
 2004211439 ./dev-libs/kdiagram/kdiagram-2.7.0.ebuild
@@ -8601,10 +8608,11 @@
 2005132039 ./dev-libs/libgee/libgee-0.20.3.ebuild
 2001051415 ./dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
 2001262109 ./dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild
-2004262009 ./dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
+2006040939 ./dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
 2004021009 ./dev-libs/libgit2/libgit2-0.28.5.ebuild
-2004031039 ./dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
 2004131809 ./dev-libs/libgit2/libgit2-0.28.4.ebuild
+2006040939 ./dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
+2006041239 ./dev-libs/libgit2/libgit2-1.0.1.ebuild
 2003151539 ./dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
 2003261841 ./dev-libs/libgpg-error/libgpg-error-1.37.ebuild
 2004032241 ./dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -8666,7 +8674,7 @@
 2002112051 ./dev-libs/libmba/libmba-0.9.1-r3.ebuild
 2004032241 ./dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
 1712280009 ./dev-libs/libmelf/libmelf-0.4.0-r1.ebuild
-2004041439 ./dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+2006041239 ./dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
 2002211909 ./dev-libs/libmirage/libmirage-3.2.4.ebuild
 1912111539 ./dev-libs/libmissing/libmissing-1.1.0.ebuild
 2004032241 ./dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -8748,6 +8756,7 @@
 2004111639 ./dev-libs/libressl/libressl-2.6.5.ebuild
 2005082339 ./dev-libs/libressl/libressl-3.1.1.ebuild
 2005250709 ./dev-libs/libressl/libressl-3.1.2.ebuild
+2006040239 ./dev-libs/libressl/libressl-3.2.0.ebuild
 1912110241 ./dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
 1912110241 ./dev-libs/librevenge/librevenge-9999.ebuild
 2001070739 ./dev-libs/libsass/libsass-9999.ebuild
@@ -8773,6 +8782,7 @@
 1905220209 ./dev-libs/libslz/libslz-1.1.0.ebuild
 2004032241 ./dev-libs/libsodium/libsodium-1.0.18.ebuild
 1911201439 ./dev-libs/libspnav/libspnav-0.2.3.ebuild
+2006032238 ./dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
 1910271239 ./dev-libs/libspt/libspt-1.1-r4.ebuild
 2002112051 ./dev-libs/libspt/libspt-1.1-r2.ebuild
 1912110241 ./dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
@@ -8787,7 +8797,7 @@
 1801051439 ./dev-libs/libtermkey/libtermkey-0.20.ebuild
 2002111509 ./dev-libs/libtermkey/libtermkey-0.22.ebuild
 1911300139 ./dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
-2004211009 ./dev-libs/libtommath/libtommath-1.1.0.ebuild
+2006041239 ./dev-libs/libtommath/libtommath-1.1.0.ebuild
 1911300139 ./dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
 2005150139 ./dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
 1911180239 ./dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
@@ -8850,6 +8860,7 @@
 2003061609 ./dev-libs/libxmlb/libxmlb-0.1.15.ebuild
 2004211009 ./dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
 2004211009 ./dev-libs/libyaml/libyaml-0.2.2.ebuild
+2006020338 ./dev-libs/libyaml/libyaml-0.2.5.ebuild
 2004131339 ./dev-libs/libzia/libzia-4.20.ebuild
 2004251939 ./dev-libs/libzia/libzia-4.21.ebuild
 2004100109 ./dev-libs/libzip/libzip-1.6.1-r1.ebuild
@@ -8859,7 +8870,7 @@
 1805270804 ./dev-libs/log4cplus/log4cplus-1.2.0.ebuild
 1912110241 ./dev-libs/log4cpp/log4cpp-1.1.3.ebuild
 1912110241 ./dev-libs/log4cpp/log4cpp-1.1.ebuild
-1805291308 ./dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
+2006041239 ./dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild
 1702282250 ./dev-libs/log4sh/log4sh-1.4.2.ebuild
 1912050309 ./dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild
 2004032241 ./dev-libs/lzo/lzo-2.10.ebuild
@@ -8960,6 +8971,7 @@
 2002112051 ./dev-libs/pegtl/pegtl-2.0.0.ebuild
 2002112051 ./dev-libs/pegtl/pegtl-2.0_pre1.ebuild
 2002112051 ./dev-libs/pegtl/pegtl-2.1.4.ebuild
+2006020009 ./dev-libs/pegtl/pegtl-2.8.3.ebuild
 2005042039 ./dev-libs/pigpio/pigpio-76.ebuild
 2004032241 ./dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
 2002112051 ./dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -8981,8 +8993,7 @@
 2001161909 ./dev-libs/pugixml/pugixml-1.10.ebuild
 2004032241 ./dev-libs/pugixml/pugixml-1.9-r1.ebuild
 2004032241 ./dev-libs/pugixml/pugixml-1.9.ebuild
-1811171209 ./dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
-2005291109 ./dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
+2006040939 ./dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
 2005212208 ./dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
 1805050439 ./dev-libs/qqwing/qqwing-1.3.3.ebuild
 2002151310 ./dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -9001,7 +9012,7 @@
 2004032241 ./dev-libs/rasqal/rasqal-0.9.33.ebuild
 2003211239 ./dev-libs/re2/re2-0.2019.12.01.ebuild
 2004022239 ./dev-libs/re2/re2-0.2020.04.01.ebuild
-2005241139 ./dev-libs/re2/re2-0.2020.05.01.ebuild
+2006031338 ./dev-libs/re2/re2-0.2020.05.01.ebuild
 2004131639 ./dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
 2005071739 ./dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
 2005071739 ./dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
@@ -9051,8 +9062,9 @@
 1912110241 ./dev-libs/softhsm/softhsm-2.5.0.ebuild
 2004101309 ./dev-libs/sord/sord-0.16.0-r1.ebuild
 2004101309 ./dev-libs/sord/sord-0.16.4.ebuild
-2001210539 ./dev-libs/spdlog/spdlog-9999.ebuild
-2005201639 ./dev-libs/spdlog/spdlog-1.5.0.ebuild
+2006040108 ./dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
+2006040108 ./dev-libs/spdlog/spdlog-1.6.0.ebuild
+2006040108 ./dev-libs/spdlog/spdlog-9999.ebuild
 1906051109 ./dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
 2002151310 ./dev-libs/squareball/squareball-0.2.0.ebuild
 2002151310 ./dev-libs/squareball/squareball-9999.ebuild
@@ -9116,12 +9128,12 @@
 1912110241 ./dev-libs/uthash/uthash-2.0.2.ebuild
 2004032241 ./dev-libs/uulib/uulib-0.5.20-r1.ebuild
 2004142009 ./dev-libs/vala-common/vala-common-0.44.11.ebuild
-2004242339 ./dev-libs/vala-common/vala-common-0.46.9.ebuild
-2004242339 ./dev-libs/vala-common/vala-common-0.48.5.ebuild
-2005132039 ./dev-libs/vala-common/vala-common-0.46.7.ebuild
-1905081209 ./dev-libs/vc/vc-1.4.1.ebuild
-1912110241 ./dev-libs/vc/vc-1.3.0.ebuild
-1912110241 ./dev-libs/vc/vc-1.3.3.ebuild
+2006030108 ./dev-libs/vala-common/vala-common-0.46.10.ebuild
+2006031839 ./dev-libs/vala-common/vala-common-0.46.7.ebuild
+2006030108 ./dev-libs/vala-common/vala-common-0.48.6.ebuild
+2006021208 ./dev-libs/vc/vc-1.3.0.ebuild
+2006021208 ./dev-libs/vc/vc-1.3.3.ebuild
+2006021208 ./dev-libs/vc/vc-1.4.1.ebuild
 2002201039 ./dev-libs/voikko-fi/voikko-fi-2.3.ebuild
 2001051415 ./dev-libs/volume_key/volume_key-0.3.12.ebuild
 2004032241 ./dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -9143,9 +9155,9 @@
 2004032241 ./dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
 2004032241 ./dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
 2003191509 ./dev-libs/xmlsec/xmlsec-1.2.29.ebuild
-2004151239 ./dev-libs/xxhash/xxhash-0.6.5.ebuild
-2004151239 ./dev-libs/xxhash/xxhash-0.7.1.ebuild
-2004151309 ./dev-libs/xxhash/xxhash-0.7.3.ebuild
+2006031109 ./dev-libs/xxhash/xxhash-0.6.5.ebuild
+2006031109 ./dev-libs/xxhash/xxhash-0.7.1.ebuild
+2006031109 ./dev-libs/xxhash/xxhash-0.7.3.ebuild
 2004032241 ./dev-libs/yajl/yajl-2.1.0-r1.ebuild
 2004032241 ./dev-libs/yajl/yajl-2.1.0-r2.ebuild
 2003261841 ./dev-libs/yaz/yaz-3.0.53.ebuild
@@ -9177,8 +9189,8 @@
 2004230309 ./dev-libs/libjcat/libjcat-0.1.1.ebuild
 2004271909 ./dev-libs/libjcat/libjcat-0.1.2.ebuild
 2005150039 ./dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
-2004112309 ./dev-libs/libudfread/libudfread-9999.ebuild
-2005060409 ./dev-libs/libudfread/libudfread-1.0.0.ebuild
+2006032238 ./dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
+2006032238 ./dev-libs/libudfread/libudfread-9999.ebuild
 2004240039 ./dev-libs/level-zero/level-zero-0.91.10.ebuild
 2005230239 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
 2006010738 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
@@ -9303,7 +9315,7 @@
 2003160239 ./dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
 1912110241 ./dev-ml/alcotest/alcotest-0.8.1.ebuild
 1912110241 ./dev-ml/alcotest/alcotest-0.8.2.ebuild
-1709221131 ./dev-ml/astring/astring-0.8.3.ebuild
+2006041239 ./dev-ml/astring/astring-0.8.3.ebuild
 1709231543 ./dev-ml/async/async-0.9.0.ebuild
 1704021137 ./dev-ml/async_extra/async_extra-0.9.0.ebuild
 1704021137 ./dev-ml/async_kernel/async_kernel-0.9.0.ebuild
@@ -9323,7 +9335,7 @@
 1705081318 ./dev-ml/biniou/biniou-1.0.13.ebuild
 1707151745 ./dev-ml/biniou/biniou-1.1.0.ebuild
 1707200030 ./dev-ml/biniou/biniou-1.2.0.ebuild
-1912110241 ./dev-ml/bos/bos-0.1.6.ebuild
+2006041239 ./dev-ml/bos/bos-0.1.6.ebuild
 1808261309 ./dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
 1702282250 ./dev-ml/calendar/calendar-2.04.ebuild
 1708021422 ./dev-ml/camlbz2/camlbz2-0.6.0.ebuild
@@ -9339,9 +9351,9 @@
 2003271609 ./dev-ml/camlzip/camlzip-1.07.ebuild
 2003271609 ./dev-ml/camlzip/camlzip-1.10.ebuild
 1703271659 ./dev-ml/camomile/camomile-0.8.5-r1.ebuild
-1912110241 ./dev-ml/cmdliner/cmdliner-1.0.0.ebuild
-1912110241 ./dev-ml/cmdliner/cmdliner-1.0.1.ebuild
-1912110241 ./dev-ml/cmdliner/cmdliner-1.0.2.ebuild
+2006041239 ./dev-ml/cmdliner/cmdliner-1.0.0.ebuild
+2006041239 ./dev-ml/cmdliner/cmdliner-1.0.1.ebuild
+2006041239 ./dev-ml/cmdliner/cmdliner-1.0.2.ebuild
 1802141738 ./dev-ml/configurator/configurator-0.9.1.ebuild
 1708151249 ./dev-ml/core/core-0.9.1-r1.ebuild
 1711102042 ./dev-ml/core/core-0.9.2.ebuild
@@ -9374,8 +9386,8 @@
 2002100009 ./dev-ml/findlib/findlib-1.7.3.ebuild
 2004032241 ./dev-ml/findlib/findlib-1.7.1.ebuild
 2004032241 ./dev-ml/findlib/findlib-1.8.1.ebuild
-1912110241 ./dev-ml/fmt/fmt-0.8.4.ebuild
-1709231543 ./dev-ml/fpath/fpath-0.7.2.ebuild
+2006041239 ./dev-ml/fmt/fmt-0.8.4.ebuild
+2006041239 ./dev-ml/fpath/fpath-0.7.2.ebuild
 1702282250 ./dev-ml/gen/gen-0.4.0.1.ebuild
 1912110241 ./dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
 1802120109 ./dev-ml/iTeML/iTeML-2.5.ebuild
@@ -9387,7 +9399,7 @@
 1912110241 ./dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
 1912110241 ./dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
 1912271709 ./dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
-1708021422 ./dev-ml/jsonm/jsonm-1.0.1.ebuild
+2006041239 ./dev-ml/jsonm/jsonm-1.0.1.ebuild
 2004032241 ./dev-ml/lablgl/lablgl-1.05-r1.ebuild
 2003202339 ./dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
 2004032241 ./dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -9400,7 +9412,7 @@
 2004290939 ./dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
 2005201438 ./dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
 2005201438 ./dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
-1912110241 ./dev-ml/logs/logs-0.6.2.ebuild
+2006041239 ./dev-ml/logs/logs-0.6.2.ebuild
 1910111840 ./dev-ml/lwt/lwt-3.0.0.ebuild
 1910111840 ./dev-ml/lwt/lwt-3.1.0.ebuild
 1910111840 ./dev-ml/lwt_react/lwt_react-1.0.1.ebuild
@@ -9413,7 +9425,7 @@
 1910212139 ./dev-ml/menhir/menhir-20181006.ebuild
 1912031309 ./dev-ml/menhir/menhir-20190924.ebuild
 1702282250 ./dev-ml/merlin-extend/merlin-extend-0.3.ebuild
-1912110241 ./dev-ml/mtime/mtime-1.1.0.ebuild
+2006041239 ./dev-ml/mtime/mtime-1.1.0.ebuild
 1912122009 ./dev-ml/oasis/oasis-0.4.10.ebuild
 1912122009 ./dev-ml/oasis/oasis-0.4.8.ebuild
 1912170839 ./dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
@@ -9468,7 +9480,7 @@
 1910111840 ./dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
 1910111840 ./dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild
 1702282250 ./dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
-1912132309 ./dev-ml/ocamlweb/ocamlweb-1.39.ebuild
+2006041239 ./dev-ml/ocamlweb/ocamlweb-1.39.ebuild
 1708050005 ./dev-ml/ocplib-endian/ocplib-endian-1.0.ebuild
 1807271009 ./dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
 1910211039 ./dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
@@ -9481,8 +9493,8 @@
 1708052232 ./dev-ml/ounit/ounit-2.0.0.ebuild
 1710121521 ./dev-ml/ounit/ounit-2.0.5.ebuild
 1711041237 ./dev-ml/ounit/ounit-2.0.6.ebuild
-1708050005 ./dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
-1708050005 ./dev-ml/parmap/parmap-1.0_rc8.ebuild
+2006041239 ./dev-ml/parmap/parmap-1.0_rc7-r1.ebuild
+2006041239 ./dev-ml/parmap/parmap-1.0_rc8.ebuild
 2002112051 ./dev-ml/patience_diff/patience_diff-0.9.0.ebuild
 1910111840 ./dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
 1910111840 ./dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
@@ -9530,11 +9542,11 @@
 1708221001 ./dev-ml/qcheck/qcheck-0.7.ebuild
 1708061530 ./dev-ml/re2/re2-0.9.0.ebuild
 1711102042 ./dev-ml/re2/re2-0.9.1.ebuild
-1912110241 ./dev-ml/react/react-1.2.1.ebuild
+2006041239 ./dev-ml/react/react-1.2.1.ebuild
 1708061530 ./dev-ml/reactiveData/reactiveData-0.2.1.ebuild
 1708061530 ./dev-ml/reactiveData/reactiveData-9999.ebuild
 1708021422 ./dev-ml/result/result-1.2.ebuild
-1708061530 ./dev-ml/rresult/rresult-0.5.0.ebuild
+2006041239 ./dev-ml/rresult/rresult-0.5.0.ebuild
 1912191709 ./dev-ml/seq/seq-0.1.ebuild
 1802120109 ./dev-ml/sexplib/sexplib-0.9.2.ebuild
 1802120109 ./dev-ml/sexplib/sexplib-0.9.3.ebuild
@@ -9544,13 +9556,13 @@
 1702282250 ./dev-ml/stringext/stringext-1.4.3.ebuild
 1912110241 ./dev-ml/stringext/stringext-1.5.0.ebuild
 1708021422 ./dev-ml/textutils/textutils-0.9.0.ebuild
-1708021422 ./dev-ml/topkg/topkg-0.9.0.ebuild
-1710170855 ./dev-ml/topkg/topkg-0.9.1.ebuild
+2006041239 ./dev-ml/topkg/topkg-0.9.0.ebuild
+2006041239 ./dev-ml/topkg/topkg-0.9.1.ebuild
 1704051251 ./dev-ml/type-conv/type-conv-113.00.02.ebuild
 1708061530 ./dev-ml/typerep/typerep-0.9.0.ebuild
 1703071629 ./dev-ml/tyxml/tyxml-4.1.0.ebuild
 1708021422 ./dev-ml/uchar/uchar-0.0.2.ebuild
-1912110241 ./dev-ml/uutf/uutf-1.0.1.ebuild
+2006041239 ./dev-ml/uutf/uutf-1.0.1.ebuild
 1708021422 ./dev-ml/variantslib/variantslib-0.9.0.ebuild
 1706221447 ./dev-ml/xml-light/xml-light-2.2-r3.ebuild
 1810140109 ./dev-ml/yojson/yojson-1.4.0.ebuild
@@ -10148,9 +10160,9 @@
 1912110241 ./dev-perl/Email-Simple/Email-Simple-2.214.0.ebuild
 1912110241 ./dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
 2004032241 ./dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild
-2005311939 ./dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
+2006031839 ./dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
 1706202328 ./dev-perl/Encode-HanConvert/Encode-HanConvert-0.350.0-r1.ebuild
-2005311939 ./dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
+2006031839 ./dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
 1912110241 ./dev-perl/Encode-IMAPUTF7/Encode-IMAPUTF7-1.50.0-r1.ebuild
 1804022138 ./dev-perl/Encode-JIS2K/Encode-JIS2K-0.30.0.ebuild
 2004211009 ./dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
@@ -10509,7 +10521,7 @@
 1912110241 ./dev-perl/MCE/MCE-1.831.0.ebuild
 2004032241 ./dev-perl/MD5/MD5-2.30.0-r1.ebuild
 1912110241 ./dev-perl/MIME-Base32/MIME-Base32-1.303.0.ebuild
-2005311939 ./dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
+2006031839 ./dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
 1912110241 ./dev-perl/MIME-EncWords/MIME-EncWords-1.14.3.ebuild
 1912110241 ./dev-perl/MIME-Lite-HTML/MIME-Lite-HTML-1.240.0.ebuild
 1711191521 ./dev-perl/MIME-Lite/MIME-Lite-3.30.0.ebuild
@@ -11225,7 +11237,7 @@
 1803190338 ./dev-perl/UltraDNS/UltraDNS-0.60.0-r2.ebuild
 2004211009 ./dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
 2005041739 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
-2005311939 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
+2006031839 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
 2004032241 ./dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
 2003261841 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild
 2004032241 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
@@ -11345,7 +11357,7 @@
 2004032241 ./dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
 2004141909 ./dev-perl/YAML-Syck/YAML-Syck-1.310.0.ebuild
 2004032241 ./dev-perl/YAML-Tiny/YAML-Tiny-1.690.0.ebuild
-2005201639 ./dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
+2006031839 ./dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
 2003261841 ./dev-perl/YAML/YAML-1.240.0.ebuild
 2004032241 ./dev-perl/YAML/YAML-1.150.0.ebuild
 2004121239 ./dev-perl/YAML/YAML-1.260.0-r1.ebuild
@@ -11487,6 +11499,7 @@
 1912110241 ./dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
 2003261841 ./dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
 2004032241 ./dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
+2006021708 ./dev-php/PEAR-DB/PEAR-DB-1.10.0.ebuild
 1707312250 ./dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild
 2004032241 ./dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
 2004032241 ./dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11563,6 +11576,7 @@
 2003261841 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
 2003261841 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
 2004101309 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+2006021708 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild
 1802152238 ./dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
 1802152238 ./dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild
 1703191747 ./dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild
@@ -11597,6 +11611,7 @@
 2003261841 ./dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
 2003261841 ./dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
 2004032241 ./dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
+2006021708 ./dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild
 2002230040 ./dev-php/PHPMailer/PHPMailer-5.2.27.ebuild
 2002230040 ./dev-php/PHPMailer/PHPMailer-6.0.7.ebuild
 2002230040 ./dev-php/PHPMailer/PHPMailer-6.1.2.ebuild
@@ -11604,17 +11619,17 @@
 2002230040 ./dev-php/PHPMailer/PHPMailer-6.1.4.ebuild
 2003200109 ./dev-php/PHPMailer/PHPMailer-5.2.28.ebuild
 2003200109 ./dev-php/PHPMailer/PHPMailer-6.1.5.ebuild
-2003261841 ./dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
-2004110209 ./dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+2006041239 ./dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+2006041239 ./dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
 2001312209 ./dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.5.4.ebuild
 1705280335 ./dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
 2003261841 ./dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
 2004032241 ./dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
-2003261841 ./dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
-2004032241 ./dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+2006041239 ./dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+2006041239 ./dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
 1912121839 ./dev-php/SabreAMF/SabreAMF-1.5.0.ebuild
 1705280411 ./dev-php/Text_Template/Text_Template-1.1.1.ebuild
-2004032241 ./dev-php/Text_Template/Text_Template-1.2.1.ebuild
+2006041239 ./dev-php/Text_Template/Text_Template-1.2.1.ebuild
 1705280411 ./dev-php/YAML/YAML-1.0.6-r3.ebuild
 1912261339 ./dev-php/adodb/adodb-5.20.15.ebuild
 2004032241 ./dev-php/adodb/adodb-5.20.14.ebuild
@@ -11647,7 +11662,7 @@
 1911180009 ./dev-php/json-schema/json-schema-5.2.9.ebuild
 1908161739 ./dev-php/jsonlint/jsonlint-1.7.1.ebuild
 1911180009 ./dev-php/jsonlint/jsonlint-1.7.2.ebuild
-1702282250 ./dev-php/libchart/libchart-1.3.ebuild
+2006041239 ./dev-php/libchart/libchart-1.3.ebuild
 1906071739 ./dev-php/libvirt-php/libvirt-php-0.5.4.ebuild
 2004262339 ./dev-php/libvirt-php/libvirt-php-9999.ebuild
 2002230040 ./dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
@@ -11738,36 +11753,36 @@
 2003261841 ./dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
 2004032241 ./dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
 1912110241 ./dev-php/phptal/phptal-1.3.1.ebuild
-2003261841 ./dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
-2004032241 ./dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
-2003261841 ./dev-php/phpunit/phpunit-8.5.0.ebuild
-2003261841 ./dev-php/phpunit/phpunit-8.5.1.ebuild
-2003261841 ./dev-php/phpunit/phpunit-8.5.2.ebuild
-2004032241 ./dev-php/phpunit/phpunit-5.7.15-r3.ebuild
-2004300039 ./dev-php/phpunit/phpunit-8.5.4.ebuild
+2006041239 ./dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
+2006041239 ./dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
+2006041239 ./dev-php/phpunit/phpunit-5.7.15-r3.ebuild
+2006041239 ./dev-php/phpunit/phpunit-8.5.0.ebuild
+2006041239 ./dev-php/phpunit/phpunit-8.5.1.ebuild
+2006041239 ./dev-php/phpunit/phpunit-8.5.2.ebuild
+2006041239 ./dev-php/phpunit/phpunit-8.5.4.ebuild
 1702282250 ./dev-php/psr-log/psr-log-1.0.2.ebuild
 1812230239 ./dev-php/psr-log/psr-log-1.1.0.ebuild
 1911180009 ./dev-php/psr-log/psr-log-1.1.2.ebuild
 2004300039 ./dev-php/psr-log/psr-log-1.1.3.ebuild
 2002230040 ./dev-php/recaptcha/recaptcha-1.2.1.ebuild
-2004032241 ./dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
-2003261841 ./dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
-2004032241 ./dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
-2003261841 ./dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
-2004032241 ./dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
-2003261841 ./dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
-2004032241 ./dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
-2003261841 ./dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
-2004032241 ./dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
-2003261841 ./dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
-2004032241 ./dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
-2003261841 ./dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
-2004032241 ./dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
-2003261841 ./dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
-2004032241 ./dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
-2003261841 ./dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
-2004032241 ./dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
-2004032241 ./dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
+2006041239 ./dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
+2006041239 ./dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
+2006041239 ./dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+2006041239 ./dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
+2006041239 ./dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
+2006041239 ./dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
+2006041239 ./dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
+2006041239 ./dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
+2006041239 ./dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+2006041239 ./dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
+2006041239 ./dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+2006041239 ./dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
+2006041239 ./dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+2006041239 ./dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
+2006041239 ./dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+2006041239 ./dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
+2006041239 ./dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
+2006041239 ./dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
 1805212238 ./dev-php/securimage/securimage-3.6.5.ebuild
 1908161739 ./dev-php/semver/semver-1.4.2.ebuild
 2003200109 ./dev-php/semver/semver-1.5.1.ebuild
@@ -11822,8 +11837,8 @@
 2002112051 ./dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
 1911292239 ./dev-php/swoole-async/swoole-async-4.4.12.ebuild
 2003091839 ./dev-php/swoole-async/swoole-async-4.4.16.ebuild
-2003261841 ./dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
-2003261841 ./dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
+2006041239 ./dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+2006041239 ./dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
 2001051415 ./dev-python/3to2/3to2-1.1.1-r1.ebuild
 2005151009 ./dev-python/APScheduler/APScheduler-3.6.3.ebuild
 2005311939 ./dev-python/Babel/Babel-2.8.0-r1.ebuild
@@ -11855,6 +11870,7 @@
 2002261509 ./dev-python/PythonQt/PythonQt-9999.ebuild
 2005111509 ./dev-python/QtPy/QtPy-1.9.0-r2.ebuild
 2002060909 ./dev-python/Rx/Rx-1.6.1.ebuild
+2006021039 ./dev-python/Rx/Rx-3.1.0.ebuild
 2002060909 ./dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild
 2005131809 ./dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
 1702282250 ./dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild
@@ -11900,8 +11916,8 @@
 2003192109 ./dev-python/apsw/apsw-3.25.2_p1.ebuild
 2003261439 ./dev-python/argcomplete/argcomplete-1.11.0.ebuild
 2004272039 ./dev-python/argcomplete/argcomplete-1.11.1.ebuild
-2005301609 ./dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
-2003081409 ./dev-python/argh/argh-0.26.2-r2.ebuild
+2006012009 ./dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+2006031008 ./dev-python/argh/argh-0.26.2-r2.ebuild
 2003162209 ./dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
 2005051509 ./dev-python/args/args-0.1.0-r1.ebuild
 2004270439 ./dev-python/arpeggio/arpeggio-1.9.0.ebuild
@@ -11913,7 +11929,7 @@
 1912110241 ./dev-python/assets/assets-0.1.1-r1.ebuild
 2002112309 ./dev-python/astor/astor-0.8.1.ebuild
 2004032241 ./dev-python/astroid/astroid-2.3.3-r2.ebuild
-2005301939 ./dev-python/async_generator/async_generator-1.10.ebuild
+2006012238 ./dev-python/async_generator/async_generator-1.10.ebuild
 2001051415 ./dev-python/async_timeout/async_timeout-3.0.1.ebuild
 2005251939 ./dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
 2005260939 ./dev-python/atomicwrites/atomicwrites-1.4.0.ebuild
@@ -11925,7 +11941,7 @@
 2005141639 ./dev-python/authres/authres-1.2.0.ebuild
 2003171039 ./dev-python/autobahn/autobahn-17.5.1-r2.ebuild
 2004170939 ./dev-python/autobahn/autobahn-18.3.1.ebuild
-2005101139 ./dev-python/autobahn/autobahn-20.4.3.ebuild
+2006030139 ./dev-python/autobahn/autobahn-20.4.3.ebuild
 2005271209 ./dev-python/automat/automat-0.8.0-r1.ebuild
 2005271609 ./dev-python/automat/automat-20.2.0.ebuild
 2002041639 ./dev-python/automaton/automaton-1.12.1.ebuild
@@ -11935,7 +11951,7 @@
 2004300009 ./dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
 2004291009 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
 2005191309 ./dev-python/awscli/awscli-1.18.62.ebuild
-2005312309 ./dev-python/awscli/awscli-1.18.69.ebuild
+2006012238 ./dev-python/awscli/awscli-1.18.70.ebuild
 2002041639 ./dev-python/babelfish/babelfish-9999.ebuild
 2004221909 ./dev-python/babelfish/babelfish-0.5.5-r1.ebuild
 2004150609 ./dev-python/backcall/backcall-0.1.0-r1.ebuild
@@ -11967,7 +11983,7 @@
 2005111309 ./dev-python/bitstring/bitstring-3.1.6.ebuild
 2004042009 ./dev-python/bleach/bleach-3.1.4-r1.ebuild
 2005280009 ./dev-python/bleach/bleach-3.1.5.ebuild
-2005111309 ./dev-python/blessings/blessings-1.7-r1.ebuild
+2006021508 ./dev-python/blessings/blessings-1.7-r1.ebuild
 2005261339 ./dev-python/blinker/blinker-1.4-r1.ebuild
 2003171039 ./dev-python/blockdiag/blockdiag-1.5.4.ebuild
 2002041639 ./dev-python/blosc/blosc-1.5.1.ebuild
@@ -11975,7 +11991,7 @@
 1811060509 ./dev-python/blurb/blurb-1.0.7.ebuild
 2003162209 ./dev-python/bokeh/bokeh-0.12.6.ebuild
 2003192209 ./dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
-2005291939 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
+2006012238 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
 2003281939 ./dev-python/boto/boto-2.49.0.ebuild
 2005130609 ./dev-python/boto/boto-2.49.0-r2.ebuild
 2002041639 ./dev-python/boto3/boto3-1.10.2.ebuild
@@ -11990,14 +12006,15 @@
 2005120639 ./dev-python/botocore/botocore-1.16.7.ebuild
 2005120639 ./dev-python/botocore/botocore-9999.ebuild
 2005191309 ./dev-python/botocore/botocore-1.16.12.ebuild
+2006012238 ./dev-python/botocore/botocore-1.16.20.ebuild
 2005252309 ./dev-python/bottle/bottle-0.12.18.ebuild
 2003071839 ./dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
-2005121009 ./dev-python/bpython/bpython-0.19.ebuild
+2006032038 ./dev-python/bpython/bpython-0.19.ebuild
 2006010738 ./dev-python/breathe/breathe-4.14.1.ebuild
 2005252309 ./dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
 2001051415 ./dev-python/brython/brython-3.7.2.ebuild
 2004150839 ./dev-python/bsddb3/bsddb3-6.2.4.ebuild
-2004210239 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
+2006040939 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
 2001051415 ./dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
 2004032241 ./dev-python/bz2file/bz2file-0.98.ebuild
 2003020909 ./dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -12007,7 +12024,7 @@
 2001150209 ./dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
 2004170009 ./dev-python/cairocffi/cairocffi-1.1.0.ebuild
 2001051415 ./dev-python/cangjie/cangjie-1.2-r1.ebuild
-2004222209 ./dev-python/cangjie/cangjie-1.3.ebuild
+2006040939 ./dev-python/cangjie/cangjie-1.3.ebuild
 2001231309 ./dev-python/capturer/capturer-2.4.ebuild
 2005091339 ./dev-python/carbon/carbon-1.1.5.ebuild
 2002041709 ./dev-python/case/case-1.5.3.ebuild
@@ -12026,7 +12043,7 @@
 2004300239 ./dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
 2003271809 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
 2002041909 ./dev-python/chai/chai-1.1.1.ebuild
-2004101739 ./dev-python/chai/chai-1.1.2.ebuild
+2006040939 ./dev-python/chai/chai-1.1.2.ebuild
 2005111309 ./dev-python/chameleon/chameleon-3.7.0.ebuild
 2005131039 ./dev-python/chameleon/chameleon-3.7.1.ebuild
 2006010910 ./dev-python/chameleon/chameleon-3.7.2.ebuild
@@ -12057,7 +12074,7 @@
 2004032241 ./dev-python/cliapp/cliapp-1.20180812.1.ebuild
 2002041909 ./dev-python/click-log/click-log-0.2.1.ebuild
 2004261809 ./dev-python/click-log/click-log-0.3.2.ebuild
-2002041909 ./dev-python/click-plugins/click-plugins-1.0.3.ebuild
+2006020009 ./dev-python/click-plugins/click-plugins-1.0.3.ebuild
 2004261809 ./dev-python/click-threading/click-threading-0.4.4.ebuild
 2004032241 ./dev-python/click/click-6.7-r1.ebuild
 2005261339 ./dev-python/click/click-7.0-r1.ebuild
@@ -12101,10 +12118,10 @@
 2004211009 ./dev-python/cov-core/cov-core-1.15.0.ebuild
 2005161439 ./dev-python/cov-core/cov-core-1.15.0-r1.ebuild
 2001051415 ./dev-python/coverage-test-runner/coverage-test-runner-1.15.ebuild
-2003251809 ./dev-python/coverage/coverage-5.0.3.ebuild
 2004211009 ./dev-python/coverage/coverage-4.5.2.ebuild
-2005291939 ./dev-python/coverage/coverage-4.5.4.ebuild
-2005291939 ./dev-python/coverage/coverage-5.1.ebuild
+2006040939 ./dev-python/coverage/coverage-4.5.4.ebuild
+2006031038 ./dev-python/coverage/coverage-5.0.3.ebuild
+2006031038 ./dev-python/coverage/coverage-5.1.ebuild
 2005072109 ./dev-python/crcmod/crcmod-1.7-r3.ebuild
 2002050839 ./dev-python/croniter/croniter-0.3.29.ebuild
 2002050839 ./dev-python/croniter/croniter-0.3.30.ebuild
@@ -12116,7 +12133,7 @@
 2003071909 ./dev-python/cssutils/cssutils-1.0.2-r2.ebuild
 2004032241 ./dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
 2001131309 ./dev-python/cursive/cursive-0.2.2.ebuild
-2005111309 ./dev-python/curtsies/curtsies-0.3.0-r2.ebuild
+2006021508 ./dev-python/curtsies/curtsies-0.3.0-r2.ebuild
 2004200239 ./dev-python/cvxopt/cvxopt-1.2.5.ebuild
 2005140009 ./dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
 2005111309 ./dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
@@ -12137,7 +12154,7 @@
 2005261339 ./dev-python/decorator/decorator-4.4.2.ebuild
 2001051415 ./dev-python/decoratortools/decoratortools-1.8-r1.ebuild
 2003271339 ./dev-python/defcon/defcon-0.6.0.ebuild
-2005292009 ./dev-python/defcon/defcon-0.6.0-r1.ebuild
+2006032309 ./dev-python/defcon/defcon-0.6.0-r1.ebuild
 2004032241 ./dev-python/defusedxml/defusedxml-0.6.0.ebuild
 2003240109 ./dev-python/denonavr/denonavr-0.8.1.ebuild
 2005262309 ./dev-python/denonavr/denonavr-0.9.2.ebuild
@@ -12156,6 +12173,7 @@
 2003162209 ./dev-python/distributed/distributed-1.18.0-r1.ebuild
 2005181609 ./dev-python/distro/distro-1.0.4-r1.ebuild
 2005301939 ./dev-python/distro/distro-1.3.0.ebuild
+2006031839 ./dev-python/distro/distro-1.5.0.ebuild
 2004211439 ./dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
 2004211439 ./dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
 2002120109 ./dev-python/django-auth-ldap/django-auth-ldap-2.1.0.ebuild
@@ -12179,6 +12197,8 @@
 2004281639 ./dev-python/django/django-2.2.11.ebuild
 2005141509 ./dev-python/django/django-2.2.12.ebuild
 2005301939 ./dev-python/django/django-3.0.6.ebuild
+2006040939 ./dev-python/django/django-2.2.13.ebuild
+2006040939 ./dev-python/django/django-3.0.7.ebuild
 2005191538 ./dev-python/django_polymorphic/django_polymorphic-2.1.2.ebuild
 2003120139 ./dev-python/djangorestframework/djangorestframework-3.11.0.ebuild
 2003192209 ./dev-python/dkimpy/dkimpy-0.9.2.ebuild
@@ -12244,7 +12264,7 @@
 2005051509 ./dev-python/expects/expects-0.8.0-r1.ebuild
 2005311909 ./dev-python/extras/extras-1.0.0.ebuild
 2001051415 ./dev-python/extremes/extremes-1.1.1.ebuild
-2004070010 ./dev-python/eyeD3/eyeD3-0.8.11.ebuild
+2006041239 ./dev-python/eyeD3/eyeD3-0.8.11.ebuild
 2005311639 ./dev-python/falcon/falcon-1.3.0.ebuild
 2005311639 ./dev-python/falcon/falcon-2.0.0.ebuild
 2004231039 ./dev-python/fasteners/fasteners-0.14.1-r1.ebuild
@@ -12308,7 +12328,7 @@
 2005261239 ./dev-python/freezegun/freezegun-0.3.15.ebuild
 2004222209 ./dev-python/frozen-flask/frozen-flask-0.15.ebuild
 2004122139 ./dev-python/fs/fs-2.4.9.ebuild
-2004190539 ./dev-python/fs/fs-2.4.9-r1.ebuild
+2006040939 ./dev-python/fs/fs-2.4.9-r1.ebuild
 2005032209 ./dev-python/fudge/fudge-1.1.1.ebuild
 2003251609 ./dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
 2004032241 ./dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -12370,7 +12390,7 @@
 2002051709 ./dev-python/graphql-core/graphql-core-2.0.0.ebuild
 2003251909 ./dev-python/graphviz/graphviz-0.13.ebuild
 2001051415 ./dev-python/greenlet/greenlet-0.4.15.ebuild
-2005262139 ./dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+2006040939 ./dev-python/greenlet/greenlet-0.4.15-r1.ebuild
 2001051415 ./dev-python/greenstalk/greenstalk-1.0.1.ebuild
 2001051415 ./dev-python/grpcio-testing/grpcio-testing-1.26.0.ebuild
 2004201039 ./dev-python/grpcio-testing/grpcio-testing-1.28.1.ebuild
@@ -12407,7 +12427,7 @@
 2005261339 ./dev-python/httpbin/httpbin-0.7.0.ebuild
 2004032241 ./dev-python/httplib2/httplib2-0.13.0.ebuild
 2004081709 ./dev-python/httplib2/httplib2-0.17.0.ebuild
-2005271109 ./dev-python/httplib2/httplib2-0.18.1.ebuild
+2006032338 ./dev-python/httplib2/httplib2-0.18.1.ebuild
 2003271509 ./dev-python/httpretty/httpretty-0.9.6.ebuild
 2004021509 ./dev-python/httpretty/httpretty-1.0.2.ebuild
 2005301139 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@@ -12452,7 +12472,7 @@
 2003201209 ./dev-python/iniparse/iniparse-0.4-r2.ebuild
 2003172039 ./dev-python/intelhex/intelhex-2.2.1-r1.ebuild
 1912230209 ./dev-python/intervaltree/intervaltree-3.0.2.ebuild
-2003081409 ./dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+2006031008 ./dev-python/iocapture/iocapture-0.1.2-r2.ebuild
 2002112309 ./dev-python/ioflo/ioflo-1.7.5.ebuild
 2005182338 ./dev-python/ioflo/ioflo-2.0.0.ebuild
 2005150709 ./dev-python/ipaddr/ipaddr-2.2.0.ebuild
@@ -12472,7 +12492,7 @@
 2005252239 ./dev-python/iso8601/iso8601-0.1.12.ebuild
 2005090009 ./dev-python/isodate/isodate-0.6.0-r1.ebuild
 2004032241 ./dev-python/isort/isort-4.3.15.ebuild
-2005301509 ./dev-python/isort/isort-4.3.21_p2-r1.ebuild
+2006031008 ./dev-python/isort/isort-4.3.21_p2-r1.ebuild
 2005261339 ./dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
 2002051809 ./dev-python/itypes/itypes-1.1.0.ebuild
 2005161439 ./dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
@@ -12499,7 +12519,7 @@
 2002051839 ./dev-python/jdcal/jdcal-1.4.ebuild
 2003271939 ./dev-python/jedi/jedi-0.14.1.ebuild
 2003271939 ./dev-python/jedi/jedi-0.15.2.ebuild
-2004151209 ./dev-python/jedi/jedi-0.17.0.ebuild
+2006032038 ./dev-python/jedi/jedi-0.17.0.ebuild
 2005311309 ./dev-python/jeepney/jeepney-0.4.3.ebuild
 2001051415 ./dev-python/jellyfish/jellyfish-0.7.2.ebuild
 2005220809 ./dev-python/jellyfish/jellyfish-0.8.2.ebuild
@@ -12522,16 +12542,16 @@
 2001051415 ./dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
 2005032209 ./dev-python/jsonpatch/jsonpatch-1.25.ebuild
 2005032209 ./dev-python/jsonpickle/jsonpickle-1.3.ebuild
-2005191609 ./dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
+2006040939 ./dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
 2001051415 ./dev-python/jsonpointer/jsonpointer-2.0.ebuild
-2004301039 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+2006040939 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
 2004261339 ./dev-python/jsonref/jsonref-0.1.ebuild
 2002051839 ./dev-python/jsonrpclib/jsonrpclib-9999.ebuild
 2003251609 ./dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
 2004131339 ./dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
 2003261841 ./dev-python/jsonschema/jsonschema-2.6.0.ebuild
-2004301039 ./dev-python/jsonschema/jsonschema-3.2.0.ebuild
 2005171109 ./dev-python/jsonschema/jsonschema-3.0.1.ebuild
+2006040939 ./dev-python/jsonschema/jsonschema-3.2.0.ebuild
 2004191509 ./dev-python/jsonxs/jsonxs-0.6.ebuild
 2005032009 ./dev-python/jupyter/jupyter-1.0.0-r2.ebuild
 2003272345 ./dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
@@ -12540,20 +12560,20 @@
 2004150909 ./dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild
 2004060309 ./dev-python/jwcrypto/jwcrypto-0.7.0.ebuild
 2002250009 ./dev-python/kafka-python/kafka-python-1.4.7.ebuild
-2002051909 ./dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+2006041108 ./dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
 2004281909 ./dev-python/kaptan/kaptan-0.5.12-r1.ebuild
 2004261109 ./dev-python/kazoo/kazoo-2.6.1.ebuild
 2004261109 ./dev-python/kazoo/kazoo-2.7.0.ebuild
 2001311209 ./dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
 2005270939 ./dev-python/keyring/keyring-19.3.0.ebuild
-2005311309 ./dev-python/keyring/keyring-21.2.1.ebuild
+2006012009 ./dev-python/keyring/keyring-21.2.1.ebuild
 2003251939 ./dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
 2005302109 ./dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
 2001131309 ./dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
 2004032241 ./dev-python/kid/kid-0.9.6-r1.ebuild
 2001051415 ./dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
 2003010709 ./dev-python/kiwisolver/kiwisolver-1.1.0.ebuild
-2005302309 ./dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
+2006012338 ./dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
 2002021839 ./dev-python/kombu/kombu-4.6.3.ebuild
 2005302109 ./dev-python/kombu/kombu-4.6.8.ebuild
 2002071339 ./dev-python/lazr-config/lazr-config-2.2.2.ebuild
@@ -12601,7 +12621,7 @@
 2004281909 ./dev-python/logfury/logfury-0.1.2-r1.ebuild
 2003010239 ./dev-python/loguru/loguru-0.4.1.ebuild
 2003251639 ./dev-python/logutils/logutils-0.3.3-r1.ebuild
-2004030109 ./dev-python/logutils/logutils-0.3.5.ebuild
+2006040939 ./dev-python/logutils/logutils-0.3.5.ebuild
 2004141039 ./dev-python/lxml/lxml-4.5.0.ebuild
 2005261339 ./dev-python/lxml/lxml-4.5.1.ebuild
 2002051939 ./dev-python/lz4/lz4-0.8.2.ebuild
@@ -12613,8 +12633,8 @@
 2002051939 ./dev-python/maintboot/maintboot-0.1.0.ebuild
 2005252309 ./dev-python/mako/mako-1.1.2.ebuild
 2005301039 ./dev-python/mako/mako-1.1.3.ebuild
-2005051509 ./dev-python/mamba/mamba-0.11.0.ebuild
 2005042039 ./dev-python/mamba/mamba-0.8.6-r1.ebuild
+2006040939 ./dev-python/mamba/mamba-0.11.0.ebuild
 2003240909 ./dev-python/mando/mando-0.6.4.ebuild
 2003251909 ./dev-python/manuel/manuel-1.9.0.ebuild
 2002112139 ./dev-python/markdown/markdown-2.6.11.ebuild
@@ -12632,7 +12652,7 @@
 2001260439 ./dev-python/matplotlib/matplotlib-3.1.2.ebuild
 2001280009 ./dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
 2005302109 ./dev-python/matplotlib/matplotlib-2.2.4.ebuild
-2005302309 ./dev-python/matplotlib/matplotlib-3.2.1.ebuild
+2006012338 ./dev-python/matplotlib/matplotlib-3.2.1.ebuild
 2001051415 ./dev-python/matterhook/matterhook-0.1.ebuild
 2005110009 ./dev-python/matterhook/matterhook-0.1-r1.ebuild
 2004032241 ./dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -12649,12 +12669,12 @@
 2001131309 ./dev-python/microversion-parse/microversion-parse-0.2.1.ebuild
 2005311639 ./dev-python/mimerender/mimerender-0.6.0.ebuild
 2005181709 ./dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild
-2003240109 ./dev-python/minidb/minidb-2.0.3.ebuild
 2003251639 ./dev-python/minidb/minidb-2.0.2-r1.ebuild
 2005040039 ./dev-python/minidb/minidb-2.0.4.ebuild
+2006031839 ./dev-python/minidb/minidb-2.0.3.ebuild
 2004232109 ./dev-python/minimock/minimock-1.2.8-r1.ebuild
 2002241439 ./dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
-1702282250 ./dev-python/misaka/misaka-1.0.2.ebuild
+2006041239 ./dev-python/misaka/misaka-1.0.2.ebuild
 2005271209 ./dev-python/mistune/mistune-0.8.4.ebuild
 2002052009 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
 2003191639 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
@@ -12683,9 +12703,9 @@
 2003192109 ./dev-python/msgpack/msgpack-0.5.6.ebuild
 2003211939 ./dev-python/msgpack/msgpack-0.6.2.ebuild
 2004081709 ./dev-python/multidict/multidict-4.5.2.ebuild
-2006011008 ./dev-python/multidict/multidict-4.7.6.ebuild
+2006040038 ./dev-python/multidict/multidict-4.7.6.ebuild
 2002052009 ./dev-python/munch/munch-2.3.2.ebuild
-2005311309 ./dev-python/munch/munch-2.5.0-r1.ebuild
+2006032309 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2001051415 ./dev-python/munkres/munkres-1.1.2.ebuild
 2002052009 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
 2003252109 ./dev-python/mypy/mypy-0.760.ebuild
@@ -12704,6 +12724,7 @@
 2001051415 ./dev-python/natgrid/natgrid-0.2.1-r3.ebuild
 2005032209 ./dev-python/natsort/natsort-7.0.1.ebuild
 2002091942 ./dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
+2006040638 ./dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
 2001051415 ./dev-python/nbconvert/nbconvert-5.2.1.ebuild
 2001051415 ./dev-python/nbconvert/nbconvert-5.5.0.ebuild
 2001051415 ./dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -12723,7 +12744,7 @@
 2004292309 ./dev-python/networkx/networkx-2.4-r1.ebuild
 2003182039 ./dev-python/neutron-lib/neutron-lib-1.29.2.ebuild
 2005302109 ./dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
-2005091439 ./dev-python/nltk/nltk-3.5.ebuild
+2006021438 ./dev-python/nltk/nltk-3.5.ebuild
 2001051415 ./dev-python/nnpy/nnpy-1.4.2.ebuild
 2003261841 ./dev-python/node-semver/node-semver-0.7.0.ebuild
 2001051415 ./dev-python/nodeenv/nodeenv-1.1.3-r1.ebuild
@@ -12738,12 +12759,12 @@
 2004242339 ./dev-python/nose_fixes/nose_fixes-1.3.ebuild
 2005032209 ./dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
 2002112309 ./dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
-2002081939 ./dev-python/notebook/notebook-5.7.8.ebuild
-2003171139 ./dev-python/notebook/notebook-5.0.0.ebuild
-2003171139 ./dev-python/notebook/notebook-5.2.1.ebuild
+2006041239 ./dev-python/notebook/notebook-5.0.0.ebuild
+2006041239 ./dev-python/notebook/notebook-5.2.1.ebuild
+2006041239 ./dev-python/notebook/notebook-5.7.8.ebuild
 2004032241 ./dev-python/notify-python/notify-python-0.1.1-r3.ebuild
 2004191740 ./dev-python/notify2/notify2-0.3.1-r1.ebuild
-2005291939 ./dev-python/nototools/nototools-0_pre20200207.ebuild
+2006012238 ./dev-python/nototools/nototools-0_pre20200207.ebuild
 2004200209 ./dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
 2004242339 ./dev-python/ntplib/ntplib-0.3.3.ebuild
 2001281809 ./dev-python/nuitka/nuitka-0.6.6.ebuild
@@ -12752,10 +12773,11 @@
 2003162209 ./dev-python/numba/numba-0.39.0.ebuild
 2001302039 ./dev-python/numexpr/numexpr-2.6.9.ebuild
 2004190539 ./dev-python/numpy/numpy-1.16.5-r1.ebuild
-2004271339 ./dev-python/numpy/numpy-1.18.3.ebuild
-2005200938 ./dev-python/numpy/numpy-1.17.4-r3.ebuild
+2006031839 ./dev-python/numpy/numpy-1.17.4-r3.ebuild
+2006040939 ./dev-python/numpy/numpy-1.18.3.ebuild
+2006040939 ./dev-python/numpy/numpy-1.18.5.ebuild
 2003251639 ./dev-python/numpydoc/numpydoc-0.9.1.ebuild
-2005302309 ./dev-python/numpydoc/numpydoc-0.9.2.ebuild
+2006012338 ./dev-python/numpydoc/numpydoc-0.9.2.ebuild
 2001051415 ./dev-python/oauth/oauth-1.0.1-r1.ebuild
 2004211139 ./dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
 2003171139 ./dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -12790,27 +12812,37 @@
 2001131309 ./dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
 2001131309 ./dev-python/osc-lib/osc-lib-1.12.1.ebuild
 2001131309 ./dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
+2006022209 ./dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
 2003162209 ./dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
+2006022209 ./dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
 2003162209 ./dev-python/oslo-config/oslo-config-6.11.2.ebuild
+2006022209 ./dev-python/oslo-config/oslo-config-8.0.2.ebuild
 2001131309 ./dev-python/oslo-context/oslo-context-2.22.1.ebuild
 2001131309 ./dev-python/oslo-db/oslo-db-4.45.0.ebuild
+2006022209 ./dev-python/oslo-db/oslo-db-8.1.0.ebuild
 2001131309 ./dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
 2001131309 ./dev-python/oslo-log/oslo-log-3.44.1.ebuild
+2006022209 ./dev-python/oslo-log/oslo-log-4.1.2.ebuild
 2001131309 ./dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild
 2005302109 ./dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild
 2001131309 ./dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
+2006022209 ./dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
 2002092139 ./dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
 2005302109 ./dev-python/oslo-policy/oslo-policy-3.1.0.ebuild
 2003162209 ./dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
 2001131309 ./dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
 2001131309 ./dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
 2003162209 ./dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+2006022209 ./dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
 2001131309 ./dev-python/oslo-service/oslo-service-1.40.2.ebuild
+2006022209 ./dev-python/oslo-service/oslo-service-2.1.1.ebuild
 2003261841 ./dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
 2003162209 ./dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
+2006022209 ./dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
 2004050009 ./dev-python/oslo-utils/oslo-utils-3.41.5.ebuild
 2005302109 ./dev-python/oslo-utils/oslo-utils-4.1.1.ebuild
 2001131309 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
+2006022209 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
 2001131309 ./dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
 2005302109 ./dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
 2001131309 ./dev-python/oslotest/oslotest-3.7.1.ebuild
@@ -12841,8 +12873,8 @@
 2004182109 ./dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
 2003191509 ./dev-python/parso/parso-0.6.1.ebuild
 2003271939 ./dev-python/parso/parso-0.5.2.ebuild
-2004140845 ./dev-python/parso/parso-0.7.0.ebuild
 2005061039 ./dev-python/parso/parso-0.6.2.ebuild
+2006031839 ./dev-python/parso/parso-0.7.0.ebuild
 2001171109 ./dev-python/partd/partd-0.3.8.ebuild
 2004271039 ./dev-python/parver/parver-0.3.ebuild
 2005311309 ./dev-python/passlib/passlib-1.7.2.ebuild
@@ -12856,7 +12888,7 @@
 2005261039 ./dev-python/path-py/path-py-14.0.1.ebuild
 2004090009 ./dev-python/pathlib/pathlib-1.0.1-r1.ebuild
 2005270939 ./dev-python/pathlib2/pathlib2-2.3.5.ebuild
-2003081409 ./dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+2006031008 ./dev-python/pathtools/pathtools-0.1.2-r3.ebuild
 2004290739 ./dev-python/patsy/patsy-0.5.1.ebuild
 2004032241 ./dev-python/paver/paver-1.3.4-r1.ebuild
 2002052109 ./dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -12865,8 +12897,8 @@
 2004100109 ./dev-python/pbr/pbr-3.1.1.ebuild
 2004092209 ./dev-python/pbr/pbr-4.2.0-r1.ebuild
 2004161839 ./dev-python/pbr/pbr-4.2.0-r3.ebuild
-2005311009 ./dev-python/pbr/pbr-5.1.1.ebuild
 2005312038 ./dev-python/pbr/pbr-5.4.5.ebuild
+2006040939 ./dev-python/pbr/pbr-5.1.1.ebuild
 2001051415 ./dev-python/pcapy/pcapy-0.11.2.ebuild
 2004210009 ./dev-python/pdfrw/pdfrw-0.4.ebuild
 2001051415 ./dev-python/peak-rules/peak-rules-0.5.ebuild
@@ -12880,10 +12912,10 @@
 2005251939 ./dev-python/pexpect/pexpect-4.8.0.ebuild
 2003081139 ./dev-python/pgspecial/pgspecial-1.11.9.ebuild
 2001051415 ./dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
-2005051509 ./dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
 2005301109 ./dev-python/phonenumbers/phonenumbers-8.12.4.ebuild
+2006040939 ./dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
 2003171139 ./dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
-2003171139 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
+2006040939 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
 2002112309 ./dev-python/pid/pid-2.2.5.ebuild
 2002052239 ./dev-python/piexif/piexif-1.0.12.ebuild
 2005210409 ./dev-python/piexif/piexif-1.1.3.ebuild
@@ -12896,7 +12928,7 @@
 2004211009 ./dev-python/pip/pip-9.0.1-r2.ebuild
 2004301809 ./dev-python/pip/pip-20.1.ebuild
 2005302309 ./dev-python/pip/pip-20.0.2.ebuild
-2006010238 ./dev-python/pip/pip-20.1.1.ebuild
+2006012338 ./dev-python/pip/pip-20.1.1.ebuild
 2004161209 ./dev-python/pipenv/pipenv-2018.11.26.ebuild
 2005082039 ./dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild
 2005071939 ./dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
@@ -12905,14 +12937,15 @@
 2004032241 ./dev-python/pluggy/pluggy-0.11.0.ebuild
 2005251939 ./dev-python/pluggy/pluggy-0.13.1.ebuild
 2002052239 ./dev-python/pluginbase/pluginbase-0.5.ebuild
+2006020009 ./dev-python/pluginbase/pluginbase-1.0.0.ebuild
 2003251909 ./dev-python/plumbum/plumbum-1.6.8.ebuild
 2005252239 ./dev-python/ply/ply-3.11.ebuild
 2004251239 ./dev-python/plyr/plyr-1.0.6.ebuild
 2001230139 ./dev-python/plyvel/plyvel-1.2.0.ebuild
 2004032241 ./dev-python/pmw/pmw-1.3.3-r3.ebuild
 2004032241 ./dev-python/pmw/pmw-2.0.1-r2.ebuild
-2001051415 ./dev-python/pocketlint/pocketlint-0.20.ebuild
 2004032241 ./dev-python/pocketlint/pocketlint-0.17.ebuild
+2006040939 ./dev-python/pocketlint/pocketlint-0.20.ebuild
 2002052239 ./dev-python/pockets/pockets-0.5.1.ebuild
 2005140039 ./dev-python/pockets/pockets-0.9.1.ebuild
 2001051415 ./dev-python/podcastparser/podcastparser-0.6.4.ebuild
@@ -12990,7 +13023,7 @@
 1912100809 ./dev-python/pychroot/pychroot-0.10.1.ebuild
 1912100809 ./dev-python/pychroot/pychroot-9999.ebuild
 2004190539 ./dev-python/pyclipper/pyclipper-1.1.0.ebuild
-2005292009 ./dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
+2006012238 ./dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
 2004150609 ./dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild
 2005270009 ./dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
 2004211139 ./dev-python/pycollada/pycollada-0.7.1.ebuild
@@ -13037,26 +13070,26 @@
 2004240039 ./dev-python/pygame/pygame-1.9.6.ebuild
 2001051415 ./dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
 2005021839 ./dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r3.ebuild
-2005091639 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
+2006040939 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5.ebuild
 2001270109 ./dev-python/pyghmi/pyghmi-1.5.5.ebuild
 2002171539 ./dev-python/pygit2/pygit2-1.0.3.ebuild
-2005021009 ./dev-python/pygit2/pygit2-1.2.1.ebuild
+2006040939 ./dev-python/pygit2/pygit2-1.2.1.ebuild
 2003201309 ./dev-python/pyglet/pyglet-1.2.4.ebuild
 2004201209 ./dev-python/pyglet/pyglet-1.5.3.ebuild
 2005261609 ./dev-python/pygments/pygments-2.5.2.ebuild
 2005261609 ./dev-python/pygments/pygments-2.6.1.ebuild
 2004032241 ./dev-python/pygobject/pygobject-2.28.6-r55.ebuild
 2004032241 ./dev-python/pygobject/pygobject-3.32.1.ebuild
-2005132039 ./dev-python/pygobject/pygobject-3.34.0.ebuild
+2006031839 ./dev-python/pygobject/pygobject-3.34.0.ebuild
 2001051415 ./dev-python/pygpgme/pygpgme-0.3-r1.ebuild
-2004230909 ./dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+2006032309 ./dev-python/pygpgme/pygpgme-0.3-r2.ebuild
 2001051415 ./dev-python/pygpu/pygpu-0.6.7.ebuild
 2003201309 ./dev-python/pygraphviz/pygraphviz-1.5.ebuild
 2004032241 ./dev-python/pygresql/pygresql-5.0.6.ebuild
 2005112009 ./dev-python/pygresql/pygresql-5.1.ebuild
 2001051415 ./dev-python/pygsl/pygsl-2.1.1.ebuild
 2004032241 ./dev-python/pygtk/pygtk-2.24.0-r4.ebuild
-2004090139 ./dev-python/pygtk/pygtk-2.24.0-r5.ebuild
+2006040939 ./dev-python/pygtk/pygtk-2.24.0-r5.ebuild
 2004032241 ./dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
 2004251739 ./dev-python/pyh2o/pyh2o-9999.ebuild
 2005271539 ./dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
@@ -13135,7 +13168,7 @@
 2003091339 ./dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
 2001051415 ./dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
 2001290139 ./dev-python/pyqtgraph/pyqtgraph-0.10.0-r2.ebuild
-2004250239 ./dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+2006040939 ./dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
 2005301809 ./dev-python/pyquery/pyquery-1.4.1-r1.ebuild
 2004032241 ./dev-python/pyrex/pyrex-0.9.9-r1.ebuild
 2002052309 ./dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
@@ -13168,12 +13201,12 @@
 2003201309 ./dev-python/pysvn/pysvn-1.8.0.ebuild
 2005131339 ./dev-python/pysvn/pysvn-1.9.11.ebuild
 2001302039 ./dev-python/pytables/pytables-3.4.4.ebuild
-2003251909 ./dev-python/pyte/pyte-0.8.0-r1.ebuild
+2006021508 ./dev-python/pyte/pyte-0.8.0-r1.ebuild
 2003172039 ./dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
 2005040509 ./dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
 2004201909 ./dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
 2004211139 ./dev-python/pytest-asyncio/pytest-asyncio-0.11.0.ebuild
-2005301939 ./dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
+2006012238 ./dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
 2003261841 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
 2001051415 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
 2004032241 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -13181,7 +13214,7 @@
 2004042009 ./dev-python/pytest-django/pytest-django-3.9.0.ebuild
 2004281639 ./dev-python/pytest-django/pytest-django-3.8.0.ebuild
 2004032241 ./dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
-2005261939 ./dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+2006040939 ./dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
 2005252339 ./dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
 2005252339 ./dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
 2002052339 ./dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
@@ -13195,7 +13228,7 @@
 2002052339 ./dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
 2004262209 ./dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
 2005261239 ./dev-python/pytest-mock/pytest-mock-2.0.0.ebuild
-2005311109 ./dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+2006031008 ./dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
 2003252109 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
 2002052339 ./dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
 2004291409 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
@@ -13204,14 +13237,14 @@
 2005131809 ./dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild
 2004032241 ./dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
 2005252339 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
-2005252339 ./dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+2006032309 ./dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
 2004252209 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
 2001051415 ./dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
 2005261339 ./dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
 2005282139 ./dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
 2004032241 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
 2005281109 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
-2005281109 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+2006032309 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
 2004032241 ./dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
 2005162309 ./dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
 2005211109 ./dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
@@ -13223,6 +13256,7 @@
 2005131209 ./dev-python/pytest/pytest-4.6.9.ebuild
 2005270939 ./dev-python/pytest/pytest-4.6.10.ebuild
 2005302309 ./dev-python/pytest/pytest-5.4.2.ebuild
+2006031008 ./dev-python/pytest/pytest-5.4.3.ebuild
 2002060009 ./dev-python/python-augeas/python-augeas-0.5.0.ebuild
 2002060009 ./dev-python/python-augeas/python-augeas-1.0.3.ebuild
 2004192139 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
@@ -13278,7 +13312,7 @@
 2004201209 ./dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
 2002060009 ./dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
 2003091609 ./dev-python/python-ly/python-ly-0.9.6.ebuild
-2002060009 ./dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+2006040939 ./dev-python/python-lzo/python-lzo-1.12-r1.ebuild
 2005282309 ./dev-python/python-magic/python-magic-0.4.15-r1.ebuild
 2005291039 ./dev-python/python-magic/python-magic-0.4.18.ebuild
 2001131309 ./dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
@@ -13308,7 +13342,7 @@
 2001051415 ./dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
 2001051415 ./dev-python/python-slip/python-slip-0.6.5.ebuild
 2001201609 ./dev-python/python-stdnum/python-stdnum-1.12.ebuild
-2004251209 ./dev-python/python-stdnum/python-stdnum-1.13.ebuild
+2006040939 ./dev-python/python-stdnum/python-stdnum-1.13.ebuild
 2003162209 ./dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
 2002060009 ./dev-python/python-systemd/python-systemd-233.ebuild
 2004162109 ./dev-python/python-systemd/python-systemd-234.ebuild
@@ -13325,8 +13359,8 @@
 2001131309 ./dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
 2005302109 ./dev-python/python-zunclient/python-zunclient-4.0.1.ebuild
 2001051415 ./dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
-2005141839 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
-2005141839 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+2006041239 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+2006041239 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
 2003201309 ./dev-python/pythondialog/pythondialog-3.4.0.ebuild
 2004032241 ./dev-python/pythondialog/pythondialog-3.3.0.ebuild
 1702282250 ./dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
@@ -13374,8 +13408,8 @@
 2004261339 ./dev-python/ratelimit/ratelimit-1.4.1.ebuild
 2002060039 ./dev-python/raven/raven-5.33.0.ebuild
 2004131639 ./dev-python/rdflib/rdflib-4.2.2-r1.ebuild
-2005280009 ./dev-python/readme_renderer/readme_renderer-25.0.ebuild
 2005311309 ./dev-python/readme_renderer/readme_renderer-26.0.ebuild
+2006012338 ./dev-python/readme_renderer/readme_renderer-25.0.ebuild
 2003251439 ./dev-python/rebulk/rebulk-0.9.0.ebuild
 2005211139 ./dev-python/rebulk/rebulk-2.0.1.ebuild
 2005171109 ./dev-python/recommonmark/recommonmark-0.6.0.ebuild
@@ -13411,6 +13445,7 @@
 2004092039 ./dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
 2002060039 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
 2003251909 ./dev-python/responses/responses-0.10.7.ebuild
+2006022139 ./dev-python/responses/responses-0.10.14.ebuild
 2003261841 ./dev-python/restkit/restkit-4.2.2.ebuild
 2002060039 ./dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
 2002060039 ./dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
@@ -13464,7 +13499,7 @@
 2003092139 ./dev-python/seaborn/seaborn-0.10.0.ebuild
 2003251909 ./dev-python/secretstorage/secretstorage-3.1.1.ebuild
 2005031309 ./dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
-2005311309 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
+2006012009 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
 2001051415 ./dev-python/selectors34/selectors34-1.2.ebuild
 2005181509 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2003291139 ./dev-python/semantic_version/semantic_version-2.8.4.ebuild
@@ -13531,7 +13566,7 @@
 2002060939 ./dev-python/speaklater/speaklater-1.3-r1.ebuild
 2001100439 ./dev-python/speg/speg-0.3.ebuild
 2001051415 ./dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
-2001051415 ./dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+2006040939 ./dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
 2004032241 ./dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
 2003251909 ./dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
 2004261609 ./dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -13605,7 +13640,7 @@
 2003201309 ./dev-python/stomper/stomper-0.3.0.ebuild
 2005250944 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
 2004141539 ./dev-python/stripe/stripe-2.43.0.ebuild
-2004251209 ./dev-python/stripe/stripe-2.46.0.ebuild
+2006040939 ./dev-python/stripe/stripe-2.46.0.ebuild
 2003301709 ./dev-python/subprocess32/subprocess32-3.5.4.ebuild
 2004032241 ./dev-python/subunit/subunit-1.2.0-r1.ebuild
 2005311909 ./dev-python/subunit/subunit-1.4.0.ebuild
@@ -13634,7 +13669,7 @@
 2003162209 ./dev-python/tenacity/tenacity-4.8.0.ebuild
 2005302339 ./dev-python/tenacity/tenacity-6.1.0.ebuild
 2001051415 ./dev-python/termcolor/termcolor-1.1.0-r1.ebuild
-2005252339 ./dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+2006032309 ./dev-python/termcolor/termcolor-1.1.0-r2.ebuild
 2003291339 ./dev-python/terminado/terminado-0.8.1.ebuild
 2005031309 ./dev-python/terminado/terminado-0.8.3.ebuild
 2002041909 ./dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -13644,7 +13679,7 @@
 2004211139 ./dev-python/testfixtures/testfixtures-6.14.1.ebuild
 2002061009 ./dev-python/testpath/testpath-0.3.1.ebuild
 2005270939 ./dev-python/testpath/testpath-0.4.4.ebuild
-2006011438 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
+2006040939 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
 2004032241 ./dev-python/testrepository/testrepository-0.0.20.ebuild
 2005311909 ./dev-python/testresources/testresources-2.0.1.ebuild
 2005311909 ./dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -13678,8 +13713,9 @@
 2001051415 ./dev-python/tqdm/tqdm-4.33.0.ebuild
 2001051415 ./dev-python/tqdm/tqdm-9999.ebuild
 2003170539 ./dev-python/tqdm/tqdm-4.40.0.ebuild
-2004051709 ./dev-python/tqdm/tqdm-4.45.0.ebuild
 2005311309 ./dev-python/tqdm/tqdm-4.46.0.ebuild
+2006012338 ./dev-python/tqdm/tqdm-4.45.0.ebuild
+2006031709 ./dev-python/tqdm/tqdm-4.46.1.ebuild
 2005311909 ./dev-python/traceback2/traceback2-1.4.0.ebuild
 2003171139 ./dev-python/traitlets/traitlets-4.3.2.ebuild
 2003192109 ./dev-python/traitlets/traitlets-4.3.3.ebuild
@@ -13694,12 +13730,10 @@
 2002061009 ./dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
 2002061009 ./dev-python/tvdb_api/tvdb_api-2.0.ebuild
 2005291109 ./dev-python/tvdb_api/tvdb_api-2.0-r1.ebuild
-2005311309 ./dev-python/twine/twine-1.15.0.ebuild
-2005311309 ./dev-python/twine/twine-3.1.1.ebuild
-2004032241 ./dev-python/twisted/twisted-16.6.0-r3.ebuild
-2004211539 ./dev-python/twisted/twisted-18.4.0.ebuild
-2005271839 ./dev-python/twisted/twisted-19.10.0.ebuild
-2006011208 ./dev-python/twisted/twisted-20.3.0.ebuild
+2006012338 ./dev-python/twine/twine-1.15.0.ebuild
+2006012338 ./dev-python/twine/twine-3.1.1.ebuild
+2006040939 ./dev-python/twisted/twisted-19.10.0.ebuild
+2006031839 ./dev-python/twisted/twisted-20.3.0.ebuild
 2005041009 ./dev-python/twython/twython-3.7.0.ebuild
 2005091339 ./dev-python/txAMQP/txAMQP-0.8.2.ebuild
 2003171139 ./dev-python/txaio/txaio-2.9.0.ebuild
@@ -13718,11 +13752,12 @@
 2005262009 ./dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
 2003171139 ./dev-python/ujson/ujson-1.35-r1.ebuild
 2005031339 ./dev-python/ujson/ujson-2.0.3.ebuild
+2006032009 ./dev-python/ujson/ujson-3.0.0.ebuild
 2001051415 ./dev-python/uncertainties/uncertainties-3.0.1.ebuild
 2006010910 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
 2003272009 ./dev-python/unidecode/unidecode-0.04.21.ebuild
 2004291409 ./dev-python/unidecode/unidecode-1.1.1.ebuild
-2005291939 ./dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+2006040939 ./dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
 2005311909 ./dev-python/unittest2/unittest2-1.1.0.ebuild
 2002091942 ./dev-python/uranium/uranium-4.3.0-r1.ebuild
 2005252309 ./dev-python/uranium/uranium-4.6.1.ebuild
@@ -13734,7 +13769,7 @@
 2004032241 ./dev-python/urllib3/urllib3-1.24.2.ebuild
 2004121239 ./dev-python/urllib3/urllib3-1.25.8.ebuild
 2005271909 ./dev-python/urllib3/urllib3-1.25.9.ebuild
-2003071409 ./dev-python/urwid/urwid-2.1.0.ebuild
+2006032038 ./dev-python/urwid/urwid-2.1.0.ebuild
 2002061039 ./dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
 2003182209 ./dev-python/utidylib/utidylib-0.6.ebuild
 2005191609 ./dev-python/uvloop/uvloop-0.14.0.ebuild
@@ -13750,8 +13785,8 @@
 2004032241 ./dev-python/virtualenv/virtualenv-16.0.0.ebuild
 2004150839 ./dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild
 2005182338 ./dev-python/virtualenv/virtualenv-20.0.18.ebuild
-2005311309 ./dev-python/virtualenv/virtualenv-16.7.10.ebuild
-2005302309 ./dev-python/virtualenv/virtualenv-20.0.21.ebuild
+2006012338 ./dev-python/virtualenv/virtualenv-16.7.10.ebuild
+2006040039 ./dev-python/virtualenv/virtualenv-20.0.21.ebuild
 2005020739 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2002061039 ./dev-python/visitor/visitor-0.1.3.ebuild
 2002061039 ./dev-python/vobject/vobject-0.9.6.1-r1.ebuild
@@ -13759,12 +13794,15 @@
 2001051415 ./dev-python/vpython/vpython-7.4.6.ebuild
 2005261939 ./dev-python/waitress/waitress-1.3.1.ebuild
 2005262009 ./dev-python/waitress/waitress-1.4.3.ebuild
+2006021009 ./dev-python/waitress/waitress-1.4.4.ebuild
 2002051839 ./dev-python/warlock/warlock-1.3.0.ebuild
 2005302109 ./dev-python/warlock/warlock-1.3.3.ebuild
 2002040009 ./dev-python/watchdog/watchdog-0.8.3-r2.ebuild
 2005031339 ./dev-python/watchdog/watchdog-0.9.0-r1.ebuild
+2006031008 ./dev-python/watchdog/watchdog-0.10.2.ebuild
 2004032241 ./dev-python/wcwidth/wcwidth-0.1.8.ebuild
-2005251939 ./dev-python/wcwidth/wcwidth-0.1.9.ebuild
+2006031839 ./dev-python/wcwidth/wcwidth-0.1.9.ebuild
+2006031109 ./dev-python/wcwidth/wcwidth-0.2.2-r1.ebuild
 2003231509 ./dev-python/weasyprint/weasyprint-51.ebuild
 2005101838 ./dev-python/webassets/webassets-2.0.ebuild
 2004032241 ./dev-python/webcolors/webcolors-1.10.ebuild
@@ -13787,7 +13825,7 @@
 2001051415 ./dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
 2001051415 ./dev-python/widgetsnbextension/widgetsnbextension-3.4.2.ebuild
 2004032241 ./dev-python/wrapt/wrapt-1.11.2-r1.ebuild
-2005301109 ./dev-python/wrapt/wrapt-1.12.1.ebuild
+2006040039 ./dev-python/wrapt/wrapt-1.12.1.ebuild
 2001262039 ./dev-python/ws4py/ws4py-0.3.4-r1.ebuild
 2001262039 ./dev-python/ws4py/ws4py-0.5.1.ebuild
 2005211809 ./dev-python/ws4py/ws4py-9999.ebuild
@@ -13800,7 +13838,7 @@
 2002060039 ./dev-python/wtforms/wtforms-2.2.1.ebuild
 2004261839 ./dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
 2004160109 ./dev-python/wxpython/wxpython-3.0.2.0.ebuild
-2005102109 ./dev-python/wxpython/wxpython-4.0.7.ebuild
+2006030139 ./dev-python/wxpython/wxpython-4.0.7.ebuild
 2005172009 ./dev-python/xapp/xapp-2.0.1.ebuild
 2003252109 ./dev-python/xarray/xarray-0.12.1.ebuild
 2004151309 ./dev-python/xcffib/xcffib-0.9.0.ebuild
@@ -13815,11 +13853,11 @@
 2001051415 ./dev-python/yapf/yapf-0.28.0.ebuild
 2004290539 ./dev-python/yapf/yapf-0.30.0.ebuild
 2002061039 ./dev-python/yappi/yappi-1.0.ebuild
-2005040939 ./dev-python/yappi/yappi-1.2.5.ebuild
+2006040939 ./dev-python/yappi/yappi-1.2.5.ebuild
 2005031339 ./dev-python/yapsy/yapsy-1.12.2.ebuild
 2001131309 ./dev-python/yaql/yaql-1.1.3.ebuild
 2003252109 ./dev-python/yarl/yarl-1.3.0.ebuild
-2006011009 ./dev-python/yarl/yarl-1.4.2.ebuild
+2006040039 ./dev-python/yarl/yarl-1.4.2.ebuild
 2004200209 ./dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
 2002052009 ./dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
 2005302339 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -13847,24 +13885,24 @@
 2006010309 ./dev-python/pathspec/pathspec-0.8.0.ebuild
 2005141939 ./dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
 2001271039 ./dev-python/test_server/test_server-0.0.31.ebuild
-2005302309 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
+2006012338 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2004240909 ./dev-python/elementpath/elementpath-1.4.4.ebuild
 2005302309 ./dev-python/elementpath/elementpath-1.4.5.ebuild
-2005271039 ./dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
 2005311309 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
-2004242339 ./dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+2006012338 ./dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
 2005311309 ./dev-python/pypiserver/pypiserver-1.3.2.ebuild
+2006012338 ./dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
 2005302339 ./dev-python/pytest-services/pytest-services-2.0.1.ebuild
-2004301039 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
-2004301039 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
-2005302309 ./dev-python/towncrier/towncrier-19.2.0.ebuild
+2006040939 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+2006040939 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+2006012338 ./dev-python/towncrier/towncrier-19.2.0.ebuild
 2005302309 ./dev-python/xmlschema/xmlschema-1.1.3.ebuild
 2005301509 ./dev-python/xmlschema/xmlschema-1.2.0.ebuild
 2005262009 ./dev-python/soupsieve/soupsieve-1.9.5.ebuild
 2005262009 ./dev-python/soupsieve/soupsieve-1.9.6.ebuild
 2005262009 ./dev-python/soupsieve/soupsieve-2.0.1.ebuild
 2004281909 ./dev-python/alagitpull/alagitpull-0.0.23.ebuild
-2005301509 ./dev-python/pipfile/pipfile-0.0.2.ebuild
+2006031008 ./dev-python/pipfile/pipfile-0.0.2.ebuild
 1912080109 ./dev-python/flit/flit-2.1.0.ebuild
 2001310039 ./dev-python/flit_core/flit_core-2.1.0.ebuild
 2001310039 ./dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -13879,11 +13917,12 @@
 2005160409 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2001171339 ./dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
 2001051415 ./dev-python/lark-parser/lark-parser-0.7.8.ebuild
-2005200938 ./dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+2006031839 ./dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
 2005101838 ./dev-python/pybind11/pybind11-2.4.3.ebuild
-2005162309 ./dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
+2006032238 ./dev-python/pybind11/pybind11-2.5.0.ebuild
 2005270939 ./dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild
 2005301509 ./dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
+2006031839 ./dev-python/pyproject2setuppy/pyproject2setuppy-4.ebuild
 2004111109 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
 2004111109 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
 2004111109 ./dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -13894,8 +13933,8 @@
 2004111109 ./dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
 1912290609 ./dev-python/helpdev/helpdev-0.6.10.ebuild
 2004201909 ./dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
-2005040939 ./dev-python/contextvars/contextvars-2.4.ebuild
-2005040939 ./dev-python/immutables/immutables-0.11.ebuild
+2006040939 ./dev-python/contextvars/contextvars-2.4.ebuild
+2006040939 ./dev-python/immutables/immutables-0.11.ebuild
 2005021509 ./dev-python/libsass/libsass-0.20.0.ebuild
 2003272009 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
 2001051415 ./dev-python/qtsass/qtsass-0.1.1.ebuild
@@ -13970,11 +14009,11 @@
 2005091439 ./dev-python/lunr/lunr-0.5.6.ebuild
 2005091439 ./dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
 2004161009 ./dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
-2005302309 ./dev-python/distlib/distlib-0.3.0.ebuild
+2006040038 ./dev-python/distlib/distlib-0.3.0.ebuild
 2005131809 ./dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
 2005211139 ./dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
 2004251909 ./dev-python/websockets/websockets-8.1.ebuild
-2005302309 ./dev-python/cppy/cppy-1.1.0.ebuild
+2006012338 ./dev-python/cppy/cppy-1.1.0.ebuild
 2004271139 ./dev-python/dataclasses/dataclasses-0.7.ebuild
 2004272239 ./dev-python/blessed/blessed-1.17.5.ebuild
 2005071039 ./dev-python/pebble/pebble-4.5.2.ebuild
@@ -13982,13 +14021,13 @@
 2004290539 ./dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
 2004291009 ./dev-python/nose-random/nose-random-1.0.0.ebuild
 2005121009 ./dev-python/python-slugify/python-slugify-1.2.6.ebuild
-2006010238 ./dev-python/csv23/csv23-0.3.2.ebuild
+2006012338 ./dev-python/csv23/csv23-0.3.2.ebuild
 2005040309 ./dev-python/aiofiles/aiofiles-0.4.0.ebuild
 2005301939 ./dev-python/asgiref/asgiref-3.2.7.ebuild
 2005070339 ./dev-python/snapshottest/snapshottest-0.5.1.ebuild
 2005070339 ./dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
 2005190008 ./dev-python/cbor2/cbor2-5.1.0.ebuild
-2005090409 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
+2006030139 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
 2005151109 ./dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
 2005101639 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
 2005150039 ./dev-python/google-api-core/google-api-core-1.17.0.ebuild
@@ -14007,6 +14046,10 @@
 2005270009 ./dev-python/spyder-vim/spyder-vim-0_pre20200514.ebuild
 2005311639 ./dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
 2005311639 ./dev-python/python-mimeparse/python-mimeparse-1.6.0.ebuild
+2006030139 ./dev-python/black/black-19.10_beta0.ebuild
+2006020209 ./dev-python/klein/klein-19.6.0.ebuild
+2006032009 ./dev-python/python-dotenv/python-dotenv-0.13.0.ebuild
+2006020209 ./dev-python/tubes/tubes-0.2.0.ebuild
 2005201639 ./dev-qt/assistant/assistant-5.14.2.ebuild
 2005261809 ./dev-qt/assistant/assistant-5.15.0.ebuild
 2005261809 ./dev-qt/designer/designer-5.15.0.ebuild
@@ -14044,9 +14087,8 @@
 2005261809 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.0.ebuild
 2005261809 ./dev-qt/qtdbus/qtdbus-5.15.0.ebuild
 2005302239 ./dev-qt/qtdbus/qtdbus-5.14.2.ebuild
-2005091109 ./dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
 2005261809 ./dev-qt/qtdeclarative/qtdeclarative-5.15.0.ebuild
-2005302239 ./dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
+2006032209 ./dev-qt/qtdeclarative/qtdeclarative-5.14.2-r2.ebuild
 2005201308 ./dev-qt/qtdiag/qtdiag-5.14.2.ebuild
 2005261809 ./dev-qt/qtdiag/qtdiag-5.15.0.ebuild
 2005201639 ./dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
@@ -15685,6 +15727,7 @@
 2002011009 ./dev-ruby/cmdparse/cmdparse-3.0.5.ebuild
 2005030639 ./dev-ruby/cmdparse/cmdparse-3.0.6.ebuild
 2004122139 ./dev-ruby/coderay/coderay-1.1.2.ebuild
+2006020809 ./dev-ruby/coderay/coderay-1.1.3.ebuild
 1902031409 ./dev-ruby/coercible/coercible-1.0.0.ebuild
 1805191109 ./dev-ruby/coffee-rails/coffee-rails-4.2.2-r1.ebuild
 1905050939 ./dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild
@@ -15709,6 +15752,7 @@
 2004180909 ./dev-ruby/compass/compass-1.0.3-r1.ebuild
 2004122139 ./dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
 2004200309 ./dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
+2006030938 ./dev-ruby/connection_pool/connection_pool-2.2.3.ebuild
 2004122139 ./dev-ruby/contracts/contracts-0.16.0.ebuild
 1901121109 ./dev-ruby/coolio/coolio-1.5.3.ebuild
 1904030909 ./dev-ruby/coolio/coolio-1.5.4.ebuild
@@ -15837,15 +15881,16 @@
 2004122139 ./dev-ruby/ffi/ffi-1.11.3.ebuild
 2004122139 ./dev-ruby/ffi/ffi-1.12.1.ebuild
 2004122139 ./dev-ruby/ffi/ffi-1.12.2.ebuild
+2006030938 ./dev-ruby/ffi/ffi-1.13.0.ebuild
 2005231239 ./dev-ruby/file-tail/file-tail-1.2.0.ebuild
 1902021209 ./dev-ruby/filesize/filesize-0.2.0.ebuild
 1902021209 ./dev-ruby/fivemat/fivemat-1.3.7.ebuild
 2003261039 ./dev-ruby/flexmock/flexmock-2.3.6.ebuild
 1903140909 ./dev-ruby/flickraw/flickraw-0.9.10.ebuild
 1902021209 ./dev-ruby/flickraw/flickraw-0.9.9.ebuild
-1902021209 ./dev-ruby/flog/flog-4.6.2.ebuild
-1909150909 ./dev-ruby/flog/flog-4.6.3.ebuild
-1912151009 ./dev-ruby/flog/flog-4.6.4.ebuild
+2006041239 ./dev-ruby/flog/flog-4.6.2.ebuild
+2006041239 ./dev-ruby/flog/flog-4.6.3.ebuild
+2006041239 ./dev-ruby/flog/flog-4.6.4.ebuild
 1905152139 ./dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild
 1902021209 ./dev-ruby/forgery/forgery-0.7.0.ebuild
 1901290109 ./dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
@@ -16118,6 +16163,7 @@
 1904282339 ./dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
 1904300909 ./dev-ruby/net-http-persistent/net-http-persistent-3.0.1.ebuild
 1907250909 ./dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
+2006040738 ./dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
 1901311039 ./dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild
 1901191809 ./dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
 1904220909 ./dev-ruby/net-scp/net-scp-2.0.0.ebuild
@@ -16236,8 +16282,7 @@
 2005121739 ./dev-ruby/pundit/pundit-2.1.0.ebuild
 2002071009 ./dev-ruby/puppet_forge/puppet_forge-2.3.2.ebuild
 2002211009 ./dev-ruby/puppet_forge/puppet_forge-2.3.3.ebuild
-2003202139 ./dev-ruby/puppetdb-termini/puppetdb-termini-6.9.1.ebuild
-2005022139 ./dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
+2006020338 ./dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
 2003031039 ./dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
 2002091942 ./dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
 2004122139 ./dev-ruby/qed/qed-2.9.2.ebuild
@@ -16620,7 +16665,7 @@
 2001231009 ./dev-ruby/spreadsheet/spreadsheet-1.2.6.ebuild
 1903301009 ./dev-ruby/spring/spring-2.0.2.ebuild
 1906151309 ./dev-ruby/spring/spring-2.1.0.ebuild
-1905050939 ./dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
+2006020809 ./dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
 2001130939 ./dev-ruby/sprockets/sprockets-3.7.2.ebuild
 1901192009 ./dev-ruby/spy/spy-1.0.0.ebuild
 2004122139 ./dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
@@ -16721,7 +16766,7 @@
 2005031939 ./dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
 2001021339 ./dev-ruby/uconv/uconv-0.6.1-r2.ebuild
 1905050939 ./dev-ruby/uglifier/uglifier-4.1.20.ebuild
-1909291239 ./dev-ruby/uglifier/uglifier-4.2.0.ebuild
+2006020809 ./dev-ruby/uglifier/uglifier-4.2.0.ebuild
 1905241139 ./dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
 1905012309 ./dev-ruby/unf/unf-0.1.4.ebuild
 1907042139 ./dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
@@ -16748,8 +16793,8 @@
 1905060909 ./dev-ruby/websocket-driver/websocket-driver-0.7.0.ebuild
 2001222209 ./dev-ruby/websocket-driver/websocket-driver-0.7.1.ebuild
 2005240739 ./dev-ruby/websocket-driver/websocket-driver-0.7.2.ebuild
-1901142009 ./dev-ruby/websocket-extensions/websocket-extensions-0.1.3.ebuild
 2001200939 ./dev-ruby/websocket-extensions/websocket-extensions-0.1.4.ebuild
+2006040738 ./dev-ruby/websocket-extensions/websocket-extensions-0.1.5.ebuild
 2001222209 ./dev-ruby/websocket/websocket-1.2.8.ebuild
 2001021339 ./dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild
 2002112051 ./dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
@@ -17165,42 +17210,26 @@
 2003090909 ./dev-util/bpftrace/bpftrace-0.9.4.ebuild
 2005282339 ./dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
 2004032241 ./dev-util/bsdiff/bsdiff-4.3-r4.ebuild
-1911300209 ./dev-util/btyacc/btyacc-3.0-r3.ebuild
+2006041239 ./dev-util/btyacc/btyacc-3.0-r3.ebuild
 1804140239 ./dev-util/build/build-0.3.10.ebuild
-2002041639 ./dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
-2002041639 ./dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
 2005122139 ./dev-util/buildbot-console-view/buildbot-console-view-2.7.0.ebuild
-2002041639 ./dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
-2002041639 ./dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild
 2005132309 ./dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
-2002041639 ./dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
-2002041639 ./dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.ebuild
 2005122139 ./dev-util/buildbot-pkg/buildbot-pkg-2.7.0.ebuild
-2002041639 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
-2002041639 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
 2005122139 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.7.0.ebuild
-2002041639 ./dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
-2002041639 ./dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild
 2005140009 ./dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
-2005140009 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
-2002041639 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
-2002041639 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild
+2006020209 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
 2005132309 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
-2002041639 ./dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
-2002041639 ./dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
-2002041639 ./dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild
 2005122139 ./dev-util/buildbot-www/buildbot-www-2.7.0.ebuild
-2002041639 ./dev-util/buildbot/buildbot-0.9.12-r1.ebuild
-2002041639 ./dev-util/buildbot/buildbot-1.1.2.ebuild
-2002041639 ./dev-util/buildbot/buildbot-1.3.0.ebuild
+2006020209 ./dev-util/buildbot-www/buildbot-www-2.8.0.ebuild
 2005140009 ./dev-util/buildbot/buildbot-2.7.0.ebuild
-2005140009 ./dev-util/buildbot/buildbot-9999.ebuild
+2006020209 ./dev-util/buildbot/buildbot-2.8.0.ebuild
+2006020209 ./dev-util/buildbot/buildbot-9999.ebuild
 2002140109 ./dev-util/bustle/bustle-0.4.7-r1.ebuild
 2004132310 ./dev-util/bustle/bustle-0.4.2-r1.ebuild
 2004132310 ./dev-util/bustle/bustle-0.5.4.ebuild
@@ -17294,8 +17323,7 @@
 1910071309 ./dev-util/cproto/cproto-4.7o.ebuild
 2004211009 ./dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
 2005192039 ./dev-util/cram/cram-0.7.ebuild
-1910210509 ./dev-util/crash/crash-7.2.7.ebuild
-2002161739 ./dev-util/crash/crash-7.2.8.ebuild
+2006030609 ./dev-util/crash/crash-7.2.8-r1.ebuild
 1912081239 ./dev-util/creduce/creduce-2.11.0_pre20191110.ebuild
 2003261841 ./dev-util/cscope/cscope-15.8a-r2.ebuild
 2003261841 ./dev-util/cscope/cscope-15.9.ebuild
@@ -17357,7 +17385,7 @@
 1705222055 ./dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
 1711221924 ./dev-util/docker-ls/docker-ls-0.3.1.ebuild
 2005071839 ./dev-util/dogtail/dogtail-0.9.10.ebuild
-2005291109 ./dev-util/dogtail/dogtail-0.9.11.ebuild
+2006040939 ./dev-util/dogtail/dogtail-0.9.11.ebuild
 2002112051 ./dev-util/doxy-coverage/doxy-coverage-151229.ebuild
 2003181409 ./dev-util/dput-ng/dput-ng-1.28-r1.ebuild
 2002091639 ./dev-util/drone-cli/drone-cli-0.8.6.ebuild
@@ -17403,8 +17431,8 @@
 2003162209 ./dev-util/gcovr/gcovr-4.2.ebuild
 2003261841 ./dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild
 2004032241 ./dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
-2005132039 ./dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
 2005250027 ./dev-util/gdbus-codegen/gdbus-codegen-2.64.3.ebuild
+2006031839 ./dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
 2004132009 ./dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
 2002222009 ./dev-util/geany/geany-9999.ebuild
 2004132009 ./dev-util/geany/geany-1.36.ebuild
@@ -17415,8 +17443,8 @@
 2005132039 ./dev-util/glade/glade-3.22.2.ebuild
 2003261841 ./dev-util/glib-utils/glib-utils-2.62.5.ebuild
 2004032241 ./dev-util/glib-utils/glib-utils-2.60.7.ebuild
-2005132039 ./dev-util/glib-utils/glib-utils-2.62.6.ebuild
 2005250027 ./dev-util/glib-utils/glib-utils-2.64.3.ebuild
+2006031839 ./dev-util/glib-utils/glib-utils-2.62.6.ebuild
 1912210209 ./dev-util/global/global-6.5.7.ebuild
 1912310609 ./dev-util/global/global-6.6.4.ebuild
 2002151310 ./dev-util/global/global-6.3.1.ebuild
@@ -17440,9 +17468,9 @@
 2002110009 ./dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
 2004032241 ./dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
 2004211009 ./dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
-2005132039 ./dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+2006031839 ./dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
 2004032241 ./dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
-2005132039 ./dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+2006031839 ./dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
 2004112039 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild
 2004300039 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
 2001020139 ./dev-util/gyp/gyp-99999999999999.ebuild
@@ -17494,11 +17522,11 @@
 2005210139 ./dev-util/kdbg/kdbg-3.0.1.ebuild
 2003021539 ./dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
 2003201209 ./dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
-2005071109 ./dev-util/kdevelop-php/kdevelop-php-5.5.1.ebuild
+2006021809 ./dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
 2003201209 ./dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
-2005071109 ./dev-util/kdevelop-python/kdevelop-python-5.5.1.ebuild
+2006021809 ./dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
 2003201209 ./dev-util/kdevelop/kdevelop-5.4.6.ebuild
-2005071109 ./dev-util/kdevelop/kdevelop-5.5.1.ebuild
+2006021809 ./dev-util/kdevelop/kdevelop-5.5.2.ebuild
 2002112051 ./dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
 2002112051 ./dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
 2005150139 ./dev-util/kernelshark/kernelshark-1.0.ebuild
@@ -17553,9 +17581,9 @@
 2002140109 ./dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r3.ebuild
 2002140109 ./dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild
 2002140109 ./dev-util/mingw64-runtime/mingw64-runtime-7.0.0.ebuild
-2002110009 ./dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
-2002110009 ./dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
-1702282250 ./dev-util/molecule/molecule-2.ebuild
+2006041239 ./dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+2006041239 ./dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
+2006041239 ./dev-util/molecule/molecule-2.ebuild
 1907151840 ./dev-util/mpatch/mpatch-0.8-r1.ebuild
 1907151840 ./dev-util/mutrace/mutrace-0.2-r1.ebuild
 1708131410 ./dev-util/nemiver/nemiver-0.9.6.ebuild
@@ -17616,6 +17644,7 @@
 2002130009 ./dev-util/perf/perf-4.14.33-r1.ebuild
 2005071839 ./dev-util/perf/perf-5.4.20.ebuild
 2005221639 ./dev-util/perf/perf-5.6.14.ebuild
+2006031338 ./dev-util/perf/perf-5.7.ebuild
 2005301039 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
 2006010309 ./dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
 2004032241 ./dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -17629,7 +17658,8 @@
 2004211009 ./dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
 2005161339 ./dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
 2005161339 ./dev-util/pkgdiff/pkgdiff-9999.ebuild
-1709040939 ./dev-util/plan9port/plan9port-20140306-r4.ebuild
+2006021438 ./dev-util/plan9port/plan9port-0_pre20200526.ebuild
+2006021438 ./dev-util/plan9port/plan9port-9999.ebuild
 2005210239 ./dev-util/ply/ply-2.1.1.ebuild
 1702282250 ./dev-util/premake/premake-3.7.ebuild
 1702282250 ./dev-util/premake/premake-4.3-r1.ebuild
@@ -17675,6 +17705,7 @@
 2004211339 ./dev-util/re2c/re2c-1.3-r1.ebuild
 1810250139 ./dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
 1912071709 ./dev-util/rebar/rebar-2.6.4.ebuild
+2006012108 ./dev-util/rebar/rebar-2.6.4-r1.ebuild
 2002091942 ./dev-util/redo/redo-0.42-r1.ebuild
 2003221339 ./dev-util/redo/redo-0.42a.ebuild
 2003221339 ./dev-util/redo/redo-99999.ebuild
@@ -17767,12 +17798,12 @@
 1904191639 ./dev-util/stepman/stepman-0.10.5.ebuild
 2003261841 ./dev-util/strace/strace-5.4.ebuild
 2004032241 ./dev-util/strace/strace-5.3.ebuild
-2004091139 ./dev-util/strace/strace-5.5.ebuild
 2004091139 ./dev-util/strace/strace-9999.ebuild
 2005022339 ./dev-util/strace/strace-5.6.ebuild
+2006021238 ./dev-util/strace/strace-5.7.ebuild
 1811300009 ./dev-util/stressapptest/stressapptest-1.0.9.ebuild
 2004141539 ./dev-util/stripe-mock/stripe-mock-0.79.0.ebuild
-2004251309 ./dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
+2006040939 ./dev-util/stripe-mock/stripe-mock-0.88.0.ebuild
 1912100639 ./dev-util/stubgen/stubgen-2.08.ebuild
 2004031739 ./dev-util/sysdig/sysdig-0.26.6.ebuild
 2005051039 ./dev-util/sysdig/sysdig-0.26.7.ebuild
@@ -17840,7 +17871,7 @@
 1710161045 ./dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
 1907292210 ./dev-util/xxdi/xxdi-1.0.0.ebuild
 1911100039 ./dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
-2005291109 ./dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+2006040939 ./dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
 2004032241 ./dev-util/yacc/yacc-1.9.1-r6.ebuild
 1702282250 ./dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
 2004030409 ./dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
@@ -17851,7 +17882,7 @@
 2004250709 ./dev-util/ccls/ccls-9999.ebuild
 2004292109 ./dev-util/ccls/ccls-0.20190823.6.ebuild
 2004202139 ./dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
-2003180409 ./dev-util/ydiff/ydiff-1.1.ebuild
+2006040939 ./dev-util/ydiff/ydiff-1.1.ebuild
 2004031739 ./dev-util/sysdig-kmod/sysdig-kmod-0.26.6.ebuild
 2005051039 ./dev-util/sysdig-kmod/sysdig-kmod-0.26.7.ebuild
 2005150039 ./dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
@@ -17862,6 +17893,7 @@
 2005310739 ./dev-util/github-cli/github-cli-0.9.0-r1.ebuild
 2005310739 ./dev-util/github-cli/github-cli-9999.ebuild
 2005210809 ./dev-util/webhook/webhook-2.7.0.ebuild
+2006020209 ./dev-util/buildbot-badges/buildbot-badges-2.8.0.ebuild
 1908011609 ./dev-vcs/bfg/bfg-1.13.0.ebuild
 1910111911 ./dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
 2002112051 ./dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
@@ -17891,6 +17923,7 @@
 1907181609 ./dev-vcs/fossil/fossil-2.9.ebuild
 2002021739 ./dev-vcs/fossil/fossil-2.10.ebuild
 2005020609 ./dev-vcs/fossil/fossil-2.10-r1.ebuild
+2006021508 ./dev-vcs/fossil/fossil-2.11.ebuild
 1911101840 ./dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
 1911101840 ./dev-vcs/git-annex/git-annex-6.20170818.ebuild
 2001051415 ./dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
@@ -17920,7 +17953,7 @@
 2005191108 ./dev-vcs/git/git-9999-r2.ebuild
 2005191108 ./dev-vcs/git/git-9999-r3.ebuild
 2005191108 ./dev-vcs/git/git-9999.ebuild
-2005271409 ./dev-vcs/git/git-2.27.0_rc2.ebuild
+2006021209 ./dev-vcs/git/git-2.27.0.ebuild
 2002271939 ./dev-vcs/gitg/gitg-3.32.1-r1.ebuild
 2001162209 ./dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
 2002112051 ./dev-vcs/gitinspector/gitinspector-0.4.4.ebuild
@@ -17980,8 +18013,8 @@
 2005210308 ./dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
 2002111539 ./dev-vcs/stgit/stgit-0.19.ebuild
 2002111539 ./dev-vcs/stgit/stgit-0.20.ebuild
-2003170939 ./dev-vcs/stgit/stgit-0.21.ebuild
 2005291739 ./dev-vcs/stgit/stgit-0.22.ebuild
+2006032209 ./dev-vcs/stgit/stgit-0.21.ebuild
 2004032241 ./dev-vcs/subversion/subversion-1.12.2.ebuild
 2005141109 ./dev-vcs/subversion/subversion-1.13.0-r1.ebuild
 2005280009 ./dev-vcs/subversion/subversion-1.14.0.ebuild
@@ -18227,7 +18260,7 @@
 2002230040 ./games-arcade/xtux/xtux-20030306-r1.ebuild
 1910111911 ./games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
 2003271309 ./games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
-2003271239 ./games-arcade/jazz2/jazz2-0.6.3_p20200327.ebuild
+2006032338 ./games-arcade/jazz2/jazz2-0.6.4.ebuild
 1805220609 ./games-board/ace/ace-1.4-r1.ebuild
 1702282250 ./games-board/ascal/ascal-0.1.1-r1.ebuild
 1707090132 ./games-board/atakks/atakks-1.0-r1.ebuild
@@ -18242,8 +18275,7 @@
 1804291439 ./games-board/crafty/crafty-24.1-r1.ebuild
 1910111911 ./games-board/domination/domination-1.1.1.6-r1.ebuild
 1707090132 ./games-board/eboard/eboard-1.1.1-r2.ebuild
-1912081509 ./games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild
-2004202139 ./games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
+2006012338 ./games-board/four-in-a-row/four-in-a-row-3.34.4.ebuild
 1811111639 ./games-board/freedoko/freedoko-0.7.16-r1.ebuild
 1804292139 ./games-board/freedoko/freedoko-0.7.16.ebuild
 1804291439 ./games-board/fruit/fruit-2.1-r1.ebuild
@@ -18263,13 +18295,11 @@
 1707090132 ./games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
 1911101840 ./games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
 1911101840 ./games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild
-1702282250 ./games-board/grhino/grhino-0.16.1-r1.ebuild
 1904111909 ./games-board/grhino/grhino-0.16.1-r2.ebuild
 1707090132 ./games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
-2002222009 ./games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild
+2006022139 ./games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
 2005172009 ./games-board/hexxagon/hexxagon-1.0.2-r1.ebuild
-1912081509 ./games-board/iagno/iagno-3.32.0.ebuild
-2004202139 ./games-board/iagno/iagno-3.34.5.ebuild
+2006012338 ./games-board/iagno/iagno-3.34.5.ebuild
 1707090132 ./games-board/mah-jong/mah-jong-1.14-r1.ebuild
 1702282250 ./games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
 1702282250 ./games-board/megamek/megamek-0.34.10-r1.ebuild
@@ -18299,7 +18329,6 @@
 1801290438 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild
 1912081509 ./games-board/tali/tali-3.32.1.ebuild
 1902080209 ./games-board/teg/teg-0.11.2-r1.ebuild
-1711182327 ./games-board/teg/teg-0.11.2.ebuild
 2002230040 ./games-board/tetzle/tetzle-2.1.3.ebuild
 2001220239 ./games-board/xboard/xboard-4.9.1.ebuild
 1805220609 ./games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
@@ -18399,7 +18428,7 @@
 1807120009 ./games-engines/exult/exult-9999.ebuild
 1712012239 ./games-engines/frobtads/frobtads-1.2.3-r1.ebuild
 1903221939 ./games-engines/frobtads/frobtads-1.2.4.ebuild
-2002230040 ./games-engines/frotz/frotz-2.50_beta2.ebuild
+2006020338 ./games-engines/frotz/frotz-2.52.ebuild
 1807131409 ./games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
 1711182327 ./games-engines/gemrb/gemrb-0.8.3-r1.ebuild
 1807210042 ./games-engines/love/love-0.10.2.ebuild
@@ -18416,7 +18445,7 @@
 1804182146 ./games-engines/openxcom/openxcom-9999.ebuild
 2002221509 ./games-engines/qtads/qtads-3.0.0.ebuild
 2004261339 ./games-engines/renpy/renpy-6.99.12.4-r4.ebuild
-2005091639 ./games-engines/renpy/renpy-7.3.5.ebuild
+2006040939 ./games-engines/renpy/renpy-7.3.5.ebuild
 2005172009 ./games-engines/residualvm/residualvm-0.2.1-r1.ebuild
 2005172009 ./games-engines/residualvm/residualvm-0.3.1-r2.ebuild
 2005172009 ./games-engines/residualvm/residualvm-9999.ebuild
@@ -18641,8 +18670,7 @@
 1805012309 ./games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
 1805012309 ./games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild
 1806110509 ./games-puzzle/quadra/quadra-1.2.0-r1.ebuild
-1912081509 ./games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
-2004202139 ./games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
+2006012338 ./games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
 1805012309 ./games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
 1805012309 ./games-puzzle/scramble/scramble-0.9.5-r1.ebuild
 1805012309 ./games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
@@ -18850,9 +18878,9 @@
 1711182327 ./games-strategy/warmux/warmux-11.04.1-r1.ebuild
 1909021839 ./games-strategy/warzone2100/warzone2100-3.3.0.ebuild
 2002231739 ./games-strategy/warzone2100/warzone2100-3.2.3.ebuild
-2002140109 ./games-strategy/wesnoth/wesnoth-1.14.9.ebuild
-2003121409 ./games-strategy/wesnoth/wesnoth-1.14.11.ebuild
-2003121409 ./games-strategy/wesnoth/wesnoth-1.15.3.ebuild
+2006032338 ./games-strategy/wesnoth/wesnoth-1.14.11.ebuild
+2006032338 ./games-strategy/wesnoth/wesnoth-1.14.9.ebuild
+2006032338 ./games-strategy/wesnoth/wesnoth-1.15.3.ebuild
 2005172009 ./games-strategy/widelands/widelands-0.20-r1.ebuild
 2005172009 ./games-strategy/widelands/widelands-9999.ebuild
 1806110509 ./games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -18915,16 +18943,16 @@
 1711182327 ./games-util/xgamer/xgamer-0.6.2.ebuild
 1711182327 ./games-util/xqf/xqf-1.0.6.2.ebuild
 2005081846 ./games-util/eureka/eureka-1.27b.ebuild
-2006010038 ./games-util/slade/slade-3.1.12a.ebuild
+2006020009 ./games-util/slade/slade-3.1.12a.ebuild
 2004202139 ./gnome-base/dconf-editor/dconf-editor-3.34.4.ebuild
 2004032241 ./gnome-base/dconf/dconf-0.32.0-r2.ebuild
-2004221739 ./gnome-base/dconf/dconf-0.34.0.ebuild
+2006031839 ./gnome-base/dconf/dconf-0.34.0.ebuild
 2004032241 ./gnome-base/gconf/gconf-3.2.6-r4.ebuild
 2004260039 ./gnome-base/gdm/gdm-3.34.1.ebuild
 2003011939 ./gnome-base/gnome-applets/gnome-applets-3.34.0.ebuild
 2004032241 ./gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
-2004261409 ./gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
-2004202139 ./gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
+2006012338 ./gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
+2006012338 ./gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild
 2004202139 ./gnome-base/gnome-core-libs/gnome-core-libs-3.34.4.ebuild
 2003261841 ./gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
 2004202139 ./gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
@@ -18933,17 +18961,17 @@
 2003152109 ./gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild
 2004032241 ./gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
 2004221739 ./gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
-2004202139 ./gnome-base/gnome-light/gnome-light-3.34.4.ebuild
+2006012338 ./gnome-base/gnome-light/gnome-light-3.34.4.ebuild
 2003261841 ./gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
 2004032241 ./gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
 2003011939 ./gnome-base/gnome-panel/gnome-panel-3.34.1.ebuild
 2004202139 ./gnome-base/gnome-session/gnome-session-3.34.2.ebuild
 2004202139 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.34.2.ebuild
-2004261309 ./gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
+2006021108 ./gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
 2004032241 ./gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
 2004202139 ./gnome-base/gnome/gnome-3.34.4.ebuild
 2004032241 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
-2005132039 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
+2006031839 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
 2004032241 ./gnome-base/gvfs/gvfs-1.40.2.ebuild
 2004221739 ./gnome-base/gvfs/gvfs-1.42.2.ebuild
 2004032241 ./gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
@@ -18988,7 +19016,7 @@
 1912110241 ./gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
 1912110241 ./gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
 2004122139 ./gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild
-2004202139 ./gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
+2006012338 ./gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
 1912081509 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
 2004202139 ./gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
 2004202009 ./gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
@@ -19010,8 +19038,7 @@
 2004202139 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild
 2004050009 ./gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
 1912081509 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
-2004202139 ./gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
-2004260039 ./gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
+2006012338 ./gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
 2004202139 ./gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild
 2005011609 ./gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
 2004202139 ./gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
@@ -19037,7 +19064,7 @@
 2004202139 ./gnome-extra/sushi/sushi-3.34.0.ebuild
 2005012109 ./gnome-extra/synapse/synapse-0.2.99.4.ebuild
 2004032241 ./gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
-2005132039 ./gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
+2006031839 ./gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
 2004202139 ./gnome-extra/yelp/yelp-3.34.0.ebuild
 2003261841 ./gnome-extra/zenity/zenity-3.32.0.ebuild
 2004230009 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
@@ -19164,13 +19191,13 @@
 2005190109 ./gui-apps/kanshi/kanshi-1.1.0.ebuild
 2005190109 ./gui-apps/kanshi/kanshi-9999.ebuild
 2004202139 ./gui-libs/amtk/amtk-5.0.2.ebuild
-2004202139 ./gui-libs/libhandy/libhandy-0.0.13.ebuild
+2006012338 ./gui-libs/libhandy/libhandy-0.0.13.ebuild
 2001271309 ./gui-libs/tepl/tepl-4.2.1.ebuild
 2004191909 ./gui-libs/wlroots/wlroots-0.10.1.ebuild
 2004240439 ./gui-libs/wlroots/wlroots-0.10.0.ebuild
 2005160609 ./gui-libs/wlroots/wlroots-9999.ebuild
-2003122309 ./gui-libs/libwpe/libwpe-1.4.0.1.ebuild
-2003122309 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
+2006012338 ./gui-libs/libwpe/libwpe-1.4.0.1.ebuild
+2006012338 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
 2004282239 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
 2005171909 ./gui-libs/wf-config/wf-config-0.4.0.ebuild
 2005171909 ./gui-libs/wf-config/wf-config-9999.ebuild
@@ -19772,10 +19799,10 @@
 2005081846 ./kde-misc/rsibreak/rsibreak-0.12.13.ebuild
 1912251909 ./kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
 2002182339 ./kde-misc/tellico/tellico-3.2.3.ebuild
-2004241209 ./kde-misc/tellico/tellico-3.3.ebuild
+2006031409 ./kde-misc/tellico/tellico-3.3.1.ebuild
 2001121509 ./kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
 2001142239 ./kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
-2005280309 ./kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild
+2006022139 ./kde-misc/kio-fuse/kio-fuse-4.95.0.ebuild
 2005132239 ./kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
 2005211709 ./kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
 2005211709 ./kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
@@ -19808,7 +19835,6 @@
 2005211709 ./kde-plasma/milou/milou-5.18.5.ebuild
 2005211709 ./kde-plasma/oxygen/oxygen-5.18.5.ebuild
 2005211709 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
-2005211709 ./kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
 2005311909 ./kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
 2005211709 ./kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
 2005211709 ./kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
@@ -19818,7 +19844,6 @@
 2005162209 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
 2005211709 ./kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
 2005211709 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
-2005211709 ./kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
 2005311909 ./kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
 2005211709 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
 2005211709 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
@@ -19953,7 +19978,7 @@
 2005231709 ./mail-client/thunderbird/thunderbird-68.8.1.ebuild
 2004191509 ./mail-client/trojita/trojita-0.7-r2.ebuild
 2004191509 ./mail-client/trojita/trojita-9999.ebuild
-1911101439 ./mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
+2006041239 ./mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
 2002092009 ./mail-filter/afew/afew-1.2.0.ebuild
 2002092009 ./mail-filter/afew/afew-1.3.0-r1.ebuild
 2003190139 ./mail-filter/afew/afew-2.0.0.ebuild
@@ -19981,8 +20006,8 @@
 2004032241 ./mail-filter/libmilter/libmilter-1.0.2.ebuild
 2004041239 ./mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
 1911061339 ./mail-filter/libsieve/libsieve-2.2.7.ebuild
-2005122109 ./mail-filter/libspf2/libspf2-1.2.10.ebuild
-1702282250 ./mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+2006041239 ./mail-filter/libspf2/libspf2-1.2.10.ebuild
+2006041239 ./mail-filter/libsrs2/libsrs2-1.0.18.ebuild
 2005172009 ./mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
 2005271109 ./mail-filter/maildrop/maildrop-3.0.0.ebuild
 1910111911 ./mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -20047,11 +20072,12 @@
 2005061409 ./mail-mta/courier/courier-1.0.13.ebuild
 1910071309 ./mail-mta/esmtp/esmtp-1.2-r1.ebuild
 2005241439 ./mail-mta/exim/exim-4.93.0.4-r1.ebuild
+2006012108 ./mail-mta/exim/exim-4.94.ebuild
 2004032241 ./mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
 2004122209 ./mail-mta/msmtp/msmtp-1.8.8.ebuild
 2004232209 ./mail-mta/msmtp/msmtp-1.8.10.ebuild
 2004032241 ./mail-mta/netqmail/netqmail-1.06-r12.ebuild
-2005251309 ./mail-mta/netqmail/netqmail-1.06-r13.ebuild
+2006040939 ./mail-mta/netqmail/netqmail-1.06-r13.ebuild
 2003071909 ./mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
 2005240239 ./mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
 2005201039 ./mail-mta/postfix/postfix-3.5.2.ebuild
@@ -20482,7 +20508,7 @@
 2004131809 ./media-gfx/feh/feh-3.3.ebuild
 1804080138 ./media-gfx/figurine/figurine-1.0.5-r1.ebuild
 1908281139 ./media-gfx/fim/fim-0.5_rc3.ebuild
-1911131109 ./media-gfx/flam3/flam3-3.1.1.ebuild
+2006041239 ./media-gfx/flam3/flam3-3.1.1.ebuild
 1702282250 ./media-gfx/fondu/fondu-20060102-r1.ebuild
 2005140309 ./media-gfx/fontforge/fontforge-20200314.ebuild
 1707141045 ./media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
@@ -20549,6 +20575,9 @@
 2004241309 ./media-gfx/imagemagick/imagemagick-9999.ebuild
 2005151809 ./media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
 2005151809 ./media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
+2006012338 ./media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
+2006021639 ./media-gfx/imagemagick/imagemagick-7.0.10.16-r1.ebuild
+2006012338 ./media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
 2002151310 ./media-gfx/imageworsener/imageworsener-1.3.2.ebuild
 2002151310 ./media-gfx/imageworsener/imageworsener-1.3.3.ebuild
 2001051415 ./media-gfx/img2pdf/img2pdf-0.3.3.ebuild
@@ -20558,8 +20587,8 @@
 2001192309 ./media-gfx/imv/imv-9999.ebuild
 2004251709 ./media-gfx/inkscape/inkscape-1.0_rc1.ebuild
 2005052209 ./media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
-2005051609 ./media-gfx/inkscape/inkscape-1.0.ebuild
 2005081846 ./media-gfx/inkscape/inkscape-9999.ebuild
+2006021639 ./media-gfx/inkscape/inkscape-1.0.ebuild
 1906051109 ./media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
 1702282250 ./media-gfx/iscan-plugin-esdip/iscan-plugin-esdip-1.0.0.5-r1.ebuild
 1702282250 ./media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
@@ -20590,7 +20619,7 @@
 2002112051 ./media-gfx/libimagequant/libimagequant-2.12.3.ebuild
 1902030039 ./media-gfx/librecad/librecad-2.1.3-r4.ebuild
 2005201538 ./media-gfx/librecad/librecad-9999.ebuild
-2005291109 ./media-gfx/librecad/librecad-2.1.3-r5.ebuild
+2006040939 ./media-gfx/librecad/librecad-2.1.3-r5.ebuild
 1801060109 ./media-gfx/llgal/llgal-0.13.17-r2.ebuild
 1801060109 ./media-gfx/llgal/llgal-0.13.18.ebuild
 1906051109 ./media-gfx/llgal/llgal-0.13.19.ebuild
@@ -20647,7 +20676,7 @@
 1808200209 ./media-gfx/pngcrush/pngcrush-1.8.13.ebuild
 1702282250 ./media-gfx/pngnq/pngnq-1.1.ebuild
 1911201439 ./media-gfx/pngquant/pngquant-2.12.3.ebuild
-2004231309 ./media-gfx/pngquant/pngquant-2.12.6.ebuild
+2006012238 ./media-gfx/pngquant/pngquant-2.12.6.ebuild
 2002112051 ./media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
 1912131839 ./media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
 1912131839 ./media-gfx/pngtools/pngtools-0.4-r2.ebuild
@@ -20682,7 +20711,7 @@
 2001281139 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
 2002112051 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
 2005310309 ./media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
-2004191509 ./media-gfx/scour/scour-0.37.ebuild
+2006030139 ./media-gfx/scour/scour-0.37.ebuild
 2003261841 ./media-gfx/scrot/scrot-0.8_p13-r1.ebuild
 2003261841 ./media-gfx/scrot/scrot-1.2.ebuild
 2004291139 ./media-gfx/scrot/scrot-1.3-r1.ebuild
@@ -20711,7 +20740,7 @@
 1804280438 ./media-gfx/tgif/tgif-4.2.5-r2.ebuild
 1912131839 ./media-gfx/tif22pnm/tif22pnm-0.14.ebuild
 1806091709 ./media-gfx/tintii/tintii-2.10.0.ebuild
-2004032241 ./media-gfx/transfig/transfig-3.2.5e.ebuild
+2006041239 ./media-gfx/transfig/transfig-3.2.5e.ebuild
 1902271409 ./media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
 1912111539 ./media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
 2002230040 ./media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -20760,7 +20789,6 @@
 1912110241 ./media-libs/allegro/allegro-4.4.2-r2.ebuild
 2002230239 ./media-libs/allegro/allegro-4.4.3.1.ebuild
 2005102009 ./media-libs/allegro/allegro-5.2.5.0.ebuild
-2004032241 ./media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
 2005062039 ./media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
 2004032241 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
 2005311939 ./media-libs/alure/alure-1.2-r1.ebuild
@@ -20886,7 +20914,7 @@
 2004282339 ./media-libs/graphene/graphene-1.10.0.ebuild
 2002101639 ./media-libs/grilo/grilo-0.3.11.ebuild
 2003222009 ./media-libs/grilo/grilo-0.3.12.ebuild
-2002230040 ./media-libs/gsound/gsound-1.0.2-r1.ebuild
+2006012338 ./media-libs/gsound/gsound-1.0.2-r1.ebuild
 2004032241 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
 2005032239 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
 2003261841 ./media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -20904,9 +20932,9 @@
 1707291534 ./media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
 2005071839 ./media-libs/hamlib/hamlib-3.3.ebuild
 2004071209 ./media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
-2006010039 ./media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
-2006010039 ./media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
-2006010039 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
+2006020239 ./media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
+2006020239 ./media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
+2006020239 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 1912122040 ./media-libs/icclib/icclib-2.14.ebuild
@@ -21041,7 +21069,7 @@
 2005300009 ./media-libs/libinsane/libinsane-1.0.4.ebuild
 2002261509 ./media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
 2004032241 ./media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
-1912122040 ./media-libs/libirman/libirman-0.4.5.ebuild
+2006041239 ./media-libs/libirman/libirman-0.4.5.ebuild
 2004032241 ./media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
 2004032241 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
 2004040109 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
@@ -21191,16 +21219,16 @@
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-9999.ebuild
-2004131639 ./media-libs/lv2/lv2-1.14.0-r2.ebuild
-2004131639 ./media-libs/lv2/lv2-1.16.0-r1.ebuild
+2006041239 ./media-libs/lv2/lv2-1.14.0-r2.ebuild
+2006041239 ./media-libs/lv2/lv2-1.16.0-r1.ebuild
 1704231426 ./media-libs/lvtk/lvtk-1.2.0.ebuild
 2004032241 ./media-libs/memphis/memphis-0.2.3.ebuild
 2005242339 ./media-libs/mesa/mesa-19.3.5.ebuild
 2005242339 ./media-libs/mesa/mesa-20.0.4-r1.ebuild
 2005242339 ./media-libs/mesa/mesa-20.0.7.ebuild
 2005242339 ./media-libs/mesa/mesa-20.1.0_rc4.ebuild
-2005242339 ./media-libs/mesa/mesa-9999.ebuild
-2005290039 ./media-libs/mesa/mesa-20.1.0.ebuild
+2006032238 ./media-libs/mesa/mesa-20.1.0.ebuild
+2006032238 ./media-libs/mesa/mesa-9999.ebuild
 2004252309 ./media-libs/mlt/mlt-6.20.0-r1.ebuild
 2004252309 ./media-libs/mlt/mlt-6.20.0.ebuild
 1801230038 ./media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
@@ -21380,33 +21408,31 @@
 1912301839 ./media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
 2004032241 ./media-libs/zvbi/zvbi-0.2.35-r1.ebuild
 2004100109 ./media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
-2004032241 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
 2005062039 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
-2004032241 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
 2005062039 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
-2004170009 ./media-libs/libopenmpt/libopenmpt-0.4.12.ebuild
+2006032338 ./media-libs/libopenmpt/libopenmpt-0.5.0.ebuild
 2005162209 ./media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
 2002031909 ./media-libs/webvfx/webvfx-1.1.0.ebuild
 2005141639 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
+2006040508 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild
 2004111739 ./media-libs/lib3mf/lib3mf-1.8.1.ebuild
 2005211939 ./media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
 2005211939 ./media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
-2004261539 ./media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
 2005062039 ./media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
 1908030939 ./media-plugins/alsaequal/alsaequal-0.7.1.ebuild
 1712171539 ./media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
 1708230031 ./media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild
 1712031809 ./media-plugins/ams-lv2/ams-lv2-1.2.1.ebuild
-2004261339 ./media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
 2005282209 ./media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
 2005282209 ./media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
+2006021438 ./media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
+2006021508 ./media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
 1903110209 ./media-plugins/calf/calf-9999.ebuild
 2001171409 ./media-plugins/calf/calf-0.90.3.ebuild
 1811082009 ./media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
 1910071209 ./media-plugins/fil-plugins/fil-plugins-0.3.0-r1.ebuild
 2001261339 ./media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
 1702282250 ./media-plugins/g2reverb/g2reverb-0.7.1.ebuild
-1906291209 ./media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild
 1702282250 ./media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
 2003051539 ./media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r3.ebuild
 1801041239 ./media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
@@ -21877,8 +21903,8 @@
 1803300609 ./media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.5.ebuild
 1912261139 ./media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild
 2001031839 ./media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild
-2002241509 ./media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
-2003071809 ./media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
+2006041239 ./media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
+2006041239 ./media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
 1711251810 ./media-plugins/vdr-pilot/vdr-pilot-0.0.9-r1.ebuild
 1809021809 ./media-plugins/vdr-pin/vdr-pin-0.1.14.ebuild
 1912111209 ./media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
@@ -22005,7 +22031,7 @@
 2002151310 ./media-radio/unixcw/unixcw-3.5.1.ebuild
 2005241939 ./media-radio/unixcw/unixcw-3.5.1-r1.ebuild
 1911191909 ./media-radio/wsjtx/wsjtx-2.1.0.ebuild
-2005291109 ./media-radio/wsjtx/wsjtx-2.1.2.ebuild
+2006040939 ./media-radio/wsjtx/wsjtx-2.1.2.ebuild
 2002081109 ./media-radio/xastir/xastir-2.1.4.ebuild
 2005161839 ./media-radio/xastir/xastir-2.1.6.ebuild
 2002081239 ./media-radio/xdx/xdx-2.5.0.ebuild
@@ -22021,9 +22047,7 @@
 2002060709 ./media-sound/abcmidi/abcmidi-2020.01.22.ebuild
 1912241439 ./media-sound/aeolus/aeolus-0.9.7.ebuild
 1703112346 ./media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
-2004032241 ./media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
 2005061039 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
-2004032241 ./media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
 2005062039 ./media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
 1806121839 ./media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
 2002112051 ./media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -22043,9 +22067,10 @@
 1909041939 ./media-sound/asunder/asunder-2.9.4.ebuild
 1910221239 ./media-sound/asunder/asunder-2.9.5.ebuild
 1702282250 ./media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
-1911150409 ./media-sound/audacious/audacious-9999.ebuild
 2005282209 ./media-sound/audacious/audacious-3.10.1-r1.ebuild
 2005281909 ./media-sound/audacious/audacious-4.0.3.ebuild
+2006021438 ./media-sound/audacious/audacious-4.0.4.ebuild
+2006021438 ./media-sound/audacious/audacious-9999.ebuild
 2004252339 ./media-sound/audacity/audacity-2.2.2.ebuild
 2004252339 ./media-sound/audacity/audacity-2.3.2.ebuild
 2005010309 ./media-sound/audacity/audacity-2.3.3.ebuild
@@ -22111,7 +22136,7 @@
 1808152309 ./media-sound/declick/declick-0.6.5-r1.ebuild
 1803052238 ./media-sound/deinvert/deinvert-9999.ebuild
 2003212209 ./media-sound/denemo/denemo-2.3.0-r1.ebuild
-2003181409 ./media-sound/din/din-44.0.2.ebuild
+2006041239 ./media-sound/din/din-44.0.2.ebuild
 2002091942 ./media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild
 2002091942 ./media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
 1912291610 ./media-sound/drumstick/drumstick-1.1.3.ebuild
@@ -22153,6 +22178,7 @@
 2002031439 ./media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
 1910261809 ./media-sound/gnomad/gnomad-2.9.6.ebuild
 2004202139 ./media-sound/gnome-music/gnome-music-3.34.5.ebuild
+2006030109 ./media-sound/gnome-music/gnome-music-3.34.6.ebuild
 2004202139 ./media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild
 2002112051 ./media-sound/gnump3d/gnump3d-3.0-r2.ebuild
 1912311739 ./media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -22160,8 +22186,7 @@
 2002092009 ./media-sound/gpodder/gpodder-3.10.5-r1.ebuild
 1702282250 ./media-sound/gqradio/gqradio-1.9.2.ebuild
 1803140138 ./media-sound/gramofile/gramofile-1.6_p9.ebuild
-2003091639 ./media-sound/grip/grip-4.1.1.ebuild
-2004032241 ./media-sound/grip/grip-4.0.1-r1.ebuild
+2006031839 ./media-sound/grip/grip-4.1.1.ebuild
 2004032241 ./media-sound/gsm/gsm-1.0.13-r1.ebuild
 1807010809 ./media-sound/gst123/gst123-0.3.5.ebuild
 1912100409 ./media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -22187,11 +22212,11 @@
 1912241439 ./media-sound/jaaa/jaaa-0.9.2.ebuild
 2004032241 ./media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
 1712212339 ./media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
-1912121909 ./media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
+2006021939 ./media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
 1811250239 ./media-sound/jack-smf-utils/jack-smf-utils-1.0-r1.ebuild
 2002092009 ./media-sound/jack/jack-3.1.1-r3.ebuild
-2004031839 ./media-sound/jack2/jack2-9999.ebuild
-2005081846 ./media-sound/jack2/jack2-1.9.14.ebuild
+2006041239 ./media-sound/jack2/jack2-1.9.14.ebuild
+2006041239 ./media-sound/jack2/jack2-9999.ebuild
 1702282250 ./media-sound/jackbeat/jackbeat-0.7.6.ebuild
 2001231409 ./media-sound/jalv/jalv-1.6.4.ebuild
 1803140138 ./media-sound/jamin/jamin-0.95.0-r3.ebuild
@@ -22278,7 +22303,7 @@
 1910171209 ./media-sound/multimux/multimux-0.2.5.2.ebuild
 1911201139 ./media-sound/mumble/mumble-1.3.0.ebuild
 1911201139 ./media-sound/mumble/mumble-9999.ebuild
-2005051809 ./media-sound/mumble/mumble-1.3.1_rc1.ebuild
+2006030109 ./media-sound/mumble/mumble-1.3.1_rc1.ebuild
 1801230038 ./media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
 1805120339 ./media-sound/mup/mup-6.6.ebuild
 1909081709 ./media-sound/murmur/murmur-1.3.0.ebuild
@@ -22491,12 +22516,11 @@
 2005012109 ./media-sound/xnoise/xnoise-0.2.21.ebuild
 2004261339 ./media-sound/xwax/xwax-1.6-r1.ebuild
 1912302209 ./media-sound/yarock/yarock-1.4.0.ebuild
-2005012109 ./media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
-2005011039 ./media-sound/yoshimi/yoshimi-1.7.1.ebuild
+2006031839 ./media-sound/yoshimi/yoshimi-1.7.1.ebuild
 1912311739 ./media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
 1912151709 ./media-sound/jack_capture/jack_capture-0.9.73.ebuild
 2005261009 ./media-sound/jack_capture/jack_capture-9999.ebuild
-2004170009 ./media-sound/openmpt123/openmpt123-0.4.12.ebuild
+2006032338 ./media-sound/openmpt123/openmpt123-0.5.0.ebuild
 1912120010 ./media-sound/pulsemixer/pulsemixer-1.5.0.ebuild
 1912120010 ./media-sound/pulsemixer/pulsemixer-9999.ebuild
 2004131109 ./media-sound/pulsemixer/pulsemixer-1.5.1.ebuild
@@ -22517,10 +22541,10 @@
 2002091942 ./media-tv/kodi/kodi-18.3-r1.ebuild
 2002091942 ./media-tv/kodi/kodi-18.4-r1.ebuild
 2002091942 ./media-tv/kodi/kodi-18.5-r2.ebuild
-2005181938 ./media-tv/kodi/kodi-9999.ebuild
 2005201739 ./media-tv/kodi/kodi-18.7.ebuild
 2005271509 ./media-tv/kodi/kodi-18.6.ebuild
 2006010438 ./media-tv/kodi/kodi-18.7.1.ebuild
+2006040109 ./media-tv/kodi/kodi-9999.ebuild
 1902221339 ./media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
 2003150109 ./media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
 1702282250 ./media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
@@ -22534,7 +22558,7 @@
 1702282250 ./media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild
 1908011539 ./media-tv/tvbrowser-bin/tvbrowser-bin-4.0.1.ebuild
 2005241939 ./media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
-2005241939 ./media-tv/tvheadend/tvheadend-9999.ebuild
+2006032338 ./media-tv/tvheadend/tvheadend-9999.ebuild
 2002061009 ./media-tv/tvnamer/tvnamer-2.4.ebuild
 2005291109 ./media-tv/tvnamer/tvnamer-2.5.ebuild
 1707192105 ./media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild
@@ -22604,7 +22628,7 @@
 2005232339 ./media-video/ffmpeg/ffmpeg-4.2.1.ebuild
 2005232339 ./media-video/ffmpeg/ffmpeg-4.2.2.ebuild
 2005232339 ./media-video/ffmpeg/ffmpeg-9999.ebuild
-2005301039 ./media-video/ffmpeg/ffmpeg-4.2.3.ebuild
+2006040939 ./media-video/ffmpeg/ffmpeg-4.2.3.ebuild
 2004261509 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
 2004261339 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
 1808181139 ./media-video/flvstreamer/flvstreamer-2.1c.ebuild
@@ -22643,7 +22667,7 @@
 2005070709 ./media-video/mediainfo/mediainfo-20.03.ebuild
 2004032241 ./media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
 1910271539 ./media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild
-1912131639 ./media-video/mkclean/mkclean-0.8.10.ebuild
+2006041239 ./media-video/mkclean/mkclean-0.8.10.ebuild
 1805132239 ./media-video/mkvalidator/mkvalidator-0.5.2.ebuild
 1912110241 ./media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
 2001180709 ./media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild
@@ -22652,10 +22676,11 @@
 2004051309 ./media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild
 2005150839 ./media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
 2004261339 ./media-video/motion/motion-4.1.1-r1.ebuild
+2006041039 ./media-video/motion/motion-4.3.1.ebuild
 1811101609 ./media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
-1908180209 ./media-video/movit/movit-1.2.0.ebuild
-1908180209 ./media-video/movit/movit-1.6.1.ebuild
-1909081409 ./media-video/movit/movit-1.6.2.ebuild
+2006041239 ./media-video/movit/movit-1.2.0.ebuild
+2006041239 ./media-video/movit/movit-1.6.1.ebuild
+2006041239 ./media-video/movit/movit-1.6.2.ebuild
 1702282250 ./media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
 1702282250 ./media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
 2004032241 ./media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -22711,9 +22736,7 @@
 2004261539 ./media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
 2005051809 ./media-video/simplescreenrecorder/simplescreenrecorder-0.4.1.ebuild
 2005202239 ./media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
-1910111911 ./media-video/smplayer/smplayer-18.6.0.ebuild
-1911111909 ./media-video/smplayer/smplayer-19.10.2.ebuild
-2005291109 ./media-video/smplayer/smplayer-20.4.2.ebuild
+2006040939 ./media-video/smplayer/smplayer-20.4.2.ebuild
 1907221539 ./media-video/smtube/smtube-19.6.0.ebuild
 2005220009 ./media-video/smtube/smtube-20.1.0.ebuild
 1702282250 ./media-video/snappy/snappy-1.0-r1.ebuild
@@ -22744,10 +22767,11 @@
 1910221609 ./media-video/unifi-video/unifi-video-3.10.10.ebuild
 2003112339 ./media-video/unifi-video/unifi-video-3.10.11.ebuild
 2005201438 ./media-video/unifi-video/unifi-video-3.10.12.ebuild
-2001240009 ./media-video/ushare/ushare-1.1a-r9.ebuild
+2006041239 ./media-video/ushare/ushare-1.1a-r9.ebuild
 1809092039 ./media-video/v4l2loopback/v4l2loopback-0.12.0.ebuild
 1905170339 ./media-video/v4l2loopback/v4l2loopback-0.12.1.1_pre.ebuild
-1809092039 ./media-video/v4l2loopback/v4l2loopback-9999.ebuild
+2006021739 ./media-video/v4l2loopback/v4l2loopback-0.12.5.ebuild
+2006021739 ./media-video/v4l2loopback/v4l2loopback-9999.ebuild
 1911102109 ./media-video/vamps/vamps-0.99.2-r2.ebuild
 2003261841 ./media-video/vcdimager/vcdimager-2.0.1.ebuild
 2004032241 ./media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -22817,9 +22841,9 @@
 1703021343 ./net-analyzer/arpon/arpon-2.7.2.ebuild
 2002112051 ./net-analyzer/arpon/arpon-2.7.2-r1.ebuild
 1910070809 ./net-analyzer/arptools/arptools-1.0.2.ebuild
-2002230040 ./net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
 2002230040 ./net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
 2002230040 ./net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild
+2006040939 ./net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
 1906051110 ./net-analyzer/authforce/authforce-0.9.9-r2.ebuild
 2002071739 ./net-analyzer/authforce/authforce-0.9.9-r3.ebuild
 2002230040 ./net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
@@ -22856,8 +22880,8 @@
 2001300939 ./net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
 2001300939 ./net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
 2001300939 ./net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
-1702282250 ./net-analyzer/cnet/cnet-3.3.1.ebuild
-1702282250 ./net-analyzer/cnet/cnet-3.3.4.ebuild
+2006041239 ./net-analyzer/cnet/cnet-3.3.1.ebuild
+2006041239 ./net-analyzer/cnet/cnet-3.3.4.ebuild
 1702282250 ./net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
 1702282250 ./net-analyzer/cutter/cutter-1.03-r1.ebuild
 1702282250 ./net-analyzer/cutter/cutter-1.04.ebuild
@@ -22906,7 +22930,9 @@
 1711051837 ./net-analyzer/goaccess/goaccess-1.2.ebuild
 1812050209 ./net-analyzer/goaccess/goaccess-9999.ebuild
 2002112051 ./net-analyzer/goaccess/goaccess-1.3.ebuild
-2002091942 ./net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+2006020009 ./net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
+2006020009 ./net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+2006020009 ./net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
 2005091339 ./net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
 2005311239 ./net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
 2002082039 ./net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
@@ -22964,7 +22990,7 @@
 2003261841 ./net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
 2004032241 ./net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
 2006011709 ./net-analyzer/iptraf-ng/iptraf-ng-1.2.0.ebuild
-2006011709 ./net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
+2006031339 ./net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
 1805061738 ./net-analyzer/iptstate/iptstate-2.2.5.ebuild
 1805061738 ./net-analyzer/iptstate/iptstate-2.2.6.ebuild
 2001270509 ./net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
@@ -23124,7 +23150,7 @@
 1907052039 ./net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild
 2003210439 ./net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild
 2002230040 ./net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
-1808310240 ./net-analyzer/p0f/p0f-3.09_beta.ebuild
+2006041239 ./net-analyzer/p0f/p0f-3.09_beta.ebuild
 2001270339 ./net-analyzer/packit/packit-9999.ebuild
 2002061439 ./net-analyzer/packit/packit-1.6.1.ebuild
 2002061439 ./net-analyzer/packit/packit-1.7.ebuild
@@ -23176,7 +23202,7 @@
 1707301241 ./net-analyzer/sancp/sancp-1.6.1-r4.ebuild
 1807071339 ./net-analyzer/sarg/sarg-2.3.11-r1.ebuild
 1909011109 ./net-analyzer/sarg/sarg-2.3.11-r2.ebuild
-2005251309 ./net-analyzer/sarg/sarg-2.4.0.ebuild
+2006040939 ./net-analyzer/sarg/sarg-2.4.0.ebuild
 1702282250 ./net-analyzer/sbd/sbd-1.37-r1.ebuild
 1702282250 ./net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
 1908062339 ./net-analyzer/scanssh/scanssh-2.1-r1.ebuild
@@ -23302,13 +23328,10 @@
 1702282250 ./net-analyzer/yersinia/yersinia-0.7.3.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-9999.ebuild
-2003221739 ./net-analyzer/zabbix/zabbix-3.0.30.ebuild
-2004301209 ./net-analyzer/zabbix/zabbix-4.4.8.ebuild
-2005121139 ./net-analyzer/zabbix/zabbix-3.0.31.ebuild
-2005121139 ./net-analyzer/zabbix/zabbix-4.0.20.ebuild
-2005131339 ./net-analyzer/zabbix/zabbix-4.0.19.ebuild
-2005131339 ./net-analyzer/zabbix/zabbix-4.4.7.ebuild
 2005171339 ./net-analyzer/zabbix/zabbix-5.0.0.ebuild
+2006040939 ./net-analyzer/zabbix/zabbix-3.0.31.ebuild
+2006040939 ./net-analyzer/zabbix/zabbix-4.0.20.ebuild
+2006040939 ./net-analyzer/zabbix/zabbix-4.4.8.ebuild
 1805300808 ./net-analyzer/zmap/zmap-2.1.1.ebuild
 1808262039 ./net-analyzer/zmap/zmap-9999.ebuild
 1702282250 ./net-analyzer/zniper/zniper-1.0-r1.ebuild
@@ -23351,7 +23374,7 @@
 1804021338 ./net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
 2003261841 ./net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
 2003261841 ./net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
-1702282250 ./net-dialup/sendpage/sendpage-1.1.0-r3.ebuild
+2006041239 ./net-dialup/sendpage/sendpage-1.1.0-r3.ebuild
 2002230040 ./net-dialup/sercd/sercd-3.0.0-r2.ebuild
 1704141359 ./net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
 1702282250 ./net-dialup/tkvoice/tkvoice-1.5.ebuild
@@ -23434,11 +23457,11 @@
 2003220409 ./net-dns/nsd/nsd-4.3.0.ebuild
 2004171039 ./net-dns/nsd/nsd-4.3.1.ebuild
 1912111540 ./net-dns/odsclient/odsclient-1.03-r1.ebuild
-1912110241 ./net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
-1912110241 ./net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
-1912110241 ./net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
-1912110241 ./net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
-1912110241 ./net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+2006041239 ./net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
+2006041239 ./net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
+2006041239 ./net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
+2006041239 ./net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+2006041239 ./net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
 2003261841 ./net-dns/openresolv/openresolv-3.9.2.ebuild
 2004032241 ./net-dns/openresolv/openresolv-3.9.0.ebuild
 2005301309 ./net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
@@ -23608,7 +23631,7 @@
 1901132239 ./net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
 1912111540 ./net-ftp/tnftp/tnftp-20141104.ebuild
 1912111540 ./net-ftp/tnftp/tnftp-20151004.ebuild
-2001061909 ./net-ftp/uftpd/uftpd-2.11.ebuild
+2006041139 ./net-ftp/uftpd/uftpd-2.12.ebuild
 2004032241 ./net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
 1702282250 ./net-ftp/yafc/yafc-1.3.7.ebuild
 1901181409 ./net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild
@@ -23670,6 +23693,7 @@
 2005150239 ./net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
 2002110039 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2004161439 ./net-im/skypeforlinux/skypeforlinux-8.59.0.77.ebuild
+2006040109 ./net-im/skypeforlinux/skypeforlinux-8.60.0.76.ebuild
 2005141209 ./net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
 2002112051 ./net-im/swift/swift-4.0.2-r1.ebuild
 2005042039 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.1.ebuild
@@ -23686,13 +23710,14 @@
 2002022239 ./net-im/vacuum/vacuum-9999.ebuild
 2002021839 ./net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
 1702282250 ./net-im/ysm/ysm-2.9.9.1-r1.ebuild
-2005280939 ./net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
 2005280939 ./net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild
+2006040509 ./net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
+2006040509 ./net-im/telegram-desktop/telegram-desktop-2.1.8.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2003240009 ./net-im/teams/teams-1.3.00.958.ebuild
-2003281639 ./net-im/teams/teams-1.3.00.5153.ebuild
-2005182239 ./net-im/zoom/zoom-5.0.408598.0517.ebuild
+2006040939 ./net-im/teams/teams-1.3.00.5153.ebuild
 2005251839 ./net-im/zoom/zoom-5.0.413237.0524.ebuild
+2006032139 ./net-im/zoom/zoom-5.0.418682.0603.ebuild
 2005012109 ./net-im/slack/slack-4.3.2-r2.ebuild
 2005070739 ./net-im/slack/slack-4.4.2.ebuild
 2005051639 ./net-irc/anope/anope-2.0.6.ebuild
@@ -23735,7 +23760,7 @@
 2002112051 ./net-irc/muh/muh-2.2a-r1.ebuild
 1702282250 ./net-irc/nebula/nebula-0.5.ebuild
 1910130009 ./net-irc/ngircd/ngircd-24.ebuild
-2005081846 ./net-irc/ngircd/ngircd-25.ebuild
+2006031839 ./net-irc/ngircd/ngircd-25.ebuild
 1802070108 ./net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
 2002230040 ./net-irc/onis/onis-0.8.2-r1.ebuild
 1912111540 ./net-irc/pisg/pisg-0.73-r1.ebuild
@@ -23757,6 +23782,7 @@
 1910111911 ./net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
 2003010539 ./net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
 2004201139 ./net-irc/unrealircd/unrealircd-5.0.4.ebuild
+2006021639 ./net-irc/unrealircd/unrealircd-5.0.5.1.ebuild
 2002101539 ./net-irc/weechat/weechat-9999.ebuild
 2002241739 ./net-irc/weechat/weechat-2.7.1.ebuild
 2004031009 ./net-irc/weechat/weechat-2.8.ebuild
@@ -23803,12 +23829,12 @@
 2003261841 ./net-libs/glib-networking/glib-networking-2.64.0.ebuild
 2004260509 ./net-libs/glib-networking/glib-networking-2.64.2.ebuild
 2004301039 ./net-libs/glib-networking/glib-networking-2.60.4.ebuild
-2005132039 ./net-libs/glib-networking/glib-networking-2.62.3.ebuild
+2006031839 ./net-libs/glib-networking/glib-networking-2.62.3.ebuild
 1908281909 ./net-libs/gloox/gloox-1.0.22.ebuild
 2004032241 ./net-libs/gnet/gnet-2.0.8-r2.ebuild
 2004122139 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.32.1.ebuild
 2004202139 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.34.1.ebuild
-2004032241 ./net-libs/gnutls/gnutls-3.6.13.ebuild
+2006012239 ./net-libs/gnutls/gnutls-3.6.13-r1.ebuild
 1908021309 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
 1905052209 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild
 1906041939 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
@@ -23867,7 +23893,7 @@
 2002230040 ./net-libs/libbtbb/libbtbb-2018.12.1.ebuild
 2002230040 ./net-libs/libbtbb/libbtbb-9999.ebuild
 1703010340 ./net-libs/libcapi/libcapi-3.0.7-r1.ebuild
-1906250139 ./net-libs/libcork/libcork-0.15.0.ebuild
+2006021739 ./net-libs/libcork/libcork-0.15.0-r1.ebuild
 1906250139 ./net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
 2002151310 ./net-libs/libcrafter/libcrafter-0.3.ebuild
 2002151310 ./net-libs/libcrafter/libcrafter-9999.ebuild
@@ -23926,7 +23952,7 @@
 1806052039 ./net-libs/libmirisdr/libmirisdr-9999.ebuild
 2004211009 ./net-libs/libmnl/libmnl-1.0.3-r1.ebuild
 2004211009 ./net-libs/libmnl/libmnl-1.0.4.ebuild
-2002092209 ./net-libs/libmrss/libmrss-0.19.2.ebuild
+2006041239 ./net-libs/libmrss/libmrss-0.19.2.ebuild
 2002111509 ./net-libs/libnatpmp/libnatpmp-20150609.ebuild
 1907031039 ./net-libs/libndp/libndp-1.7.ebuild
 1912292339 ./net-libs/libnet/libnet-1.2.9999.ebuild
@@ -23943,7 +23969,7 @@
 2002112051 ./net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
 1805061738 ./net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
 2002112051 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
-2005302239 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+2006040939 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
 2004211009 ./net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
 2004211009 ./net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
 1912031139 ./net-libs/libnftnl/libnftnl-1.1.4.ebuild
@@ -23957,7 +23983,7 @@
 2004211009 ./net-libs/libnsl/libnsl-0-r1.ebuild
 2004211009 ./net-libs/libnsl/libnsl-1.2.0.ebuild
 2004032241 ./net-libs/libntlm/libntlm-1.4.ebuild
-2002092209 ./net-libs/libnxml/libnxml-0.18.3.ebuild
+2006041239 ./net-libs/libnxml/libnxml-0.18.3.ebuild
 2004032241 ./net-libs/liboauth/liboauth-1.0.3-r1.ebuild
 2002112051 ./net-libs/liboping/liboping-1.10.0-r2.ebuild
 1806040509 ./net-libs/libosmo-abis/libosmo-abis-9999.ebuild
@@ -24009,7 +24035,7 @@
 2004032241 ./net-libs/libsmi/libsmi-0.4.8-r1.ebuild
 2003261841 ./net-libs/libsoup/libsoup-2.62.3.ebuild
 2004032241 ./net-libs/libsoup/libsoup-2.66.4.ebuild
-2004221739 ./net-libs/libsoup/libsoup-2.70.0.ebuild
+2006031839 ./net-libs/libsoup/libsoup-2.70.0.ebuild
 1907151840 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 2004032241 ./net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
 2004032241 ./net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -24070,6 +24096,7 @@
 1702282250 ./net-libs/netwib/netwib-5.39.0.ebuild
 2003261841 ./net-libs/nghttp2/nghttp2-9999.ebuild
 2004052209 ./net-libs/nghttp2/nghttp2-1.40.0.ebuild
+2006031909 ./net-libs/nghttp2/nghttp2-1.41.0.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-9999.ebuild
 2002112051 ./net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -24084,13 +24111,14 @@
 2005211009 ./net-libs/nodejs/nodejs-99999999.ebuild
 2005262309 ./net-libs/nodejs/nodejs-12.17.0.ebuild
 2005311939 ./net-libs/nodejs/nodejs-14.2.0.ebuild
+2006030039 ./net-libs/nodejs/nodejs-14.4.0.ebuild
 1912170009 ./net-libs/ntirpc/ntirpc-1.7.1.ebuild
 1912170009 ./net-libs/ntirpc/ntirpc-1.7.4.ebuild
 1912170009 ./net-libs/ntirpc/ntirpc-3.0.ebuild
 2003091609 ./net-libs/ntirpc/ntirpc-3.2.ebuild
 1702282250 ./net-libs/obby/obby-0.4.8-r1.ebuild
-1912121809 ./net-libs/onion/onion-0.8.ebuild
-1912121809 ./net-libs/onion/onion-9999.ebuild
+2006041239 ./net-libs/onion/onion-0.8.ebuild
+2006041239 ./net-libs/onion/onion-9999.ebuild
 1702282250 ./net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
 1910111911 ./net-libs/openpgm/openpgm-5.1.118-r1.ebuild
 1910111911 ./net-libs/openpgm/openpgm-5.2.122.ebuild
@@ -24107,9 +24135,8 @@
 2003131839 ./net-libs/quiche/quiche-0.3.0.ebuild
 2005152039 ./net-libs/quiche/quiche-0.4.0.ebuild
 2005152039 ./net-libs/quiche/quiche-9999.ebuild
-1912110241 ./net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
 2003110009 ./net-libs/qxmpp/qxmpp-9999.ebuild
-2005291109 ./net-libs/qxmpp/qxmpp-1.2.0.ebuild
+2006040939 ./net-libs/qxmpp/qxmpp-1.2.0.ebuild
 2004032241 ./net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
 2002091942 ./net-libs/rest/rest-0.8.1.ebuild
 2002061039 ./net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
@@ -24159,7 +24186,7 @@
 2005260939 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2003122339 ./net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
 2004131939 ./net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
-2005150039 ./net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+2006012339 ./net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-99999.ebuild
 1912300239 ./net-libs/xrootd/xrootd-4.8.3.ebuild
@@ -24305,8 +24332,8 @@
 1912111540 ./net-mail/sendEmail/sendEmail-1.56-r2.ebuild
 2003241639 ./net-mail/serialmail/serialmail-0.75-r4.ebuild
 1907151840 ./net-mail/signify/signify-1.14.ebuild
-2004211009 ./net-mail/smtptools/smtptools-0.2.3.ebuild
 2005281209 ./net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+2006041239 ./net-mail/smtptools/smtptools-0.2.3.ebuild
 1912111540 ./net-mail/swaks/swaks-20130209.0-r1.ebuild
 2004261709 ./net-mail/swaks/swaks-20190914.0.ebuild
 1909280609 ./net-mail/t-prot/t-prot-3.4.ebuild
@@ -24359,7 +24386,7 @@
 1911110039 ./net-misc/autoupnp/autoupnp-0.4.7.ebuild
 1911110039 ./net-misc/autoupnp/autoupnp-9999.ebuild
 2004081309 ./net-misc/axel/axel-2.17.7.ebuild
-2005312238 ./net-misc/axel/axel-2.17.8.ebuild
+2006040939 ./net-misc/axel/axel-2.17.8.ebuild
 2002230040 ./net-misc/babeld/babeld-1.8.2.ebuild
 2002230040 ./net-misc/babeld/babeld-1.9.1.ebuild
 1702282250 ./net-misc/balance/balance-3.57.ebuild
@@ -24461,8 +24488,7 @@
 2004211009 ./net-misc/dropbear/dropbear-2019.78.ebuild
 2002101140 ./net-misc/dropbox-cli/dropbox-cli-19.ebuild
 2005121009 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
-2005292039 ./net-misc/dropbox/dropbox-97.4.467.ebuild
-2005292039 ./net-misc/dropbox/dropbox-98.4.158.ebuild
+2006021538 ./net-misc/dropbox/dropbox-98.4.158.ebuild
 2005280909 ./net-misc/econnman/econnman-1.1-r1.ebuild
 2002230040 ./net-misc/efax/efax-0.9a-r4.ebuild
 2002230040 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -24497,8 +24523,8 @@
 2002230040 ./net-misc/geomyidae/geomyidae-0.32.2.ebuild
 2002230040 ./net-misc/geomyidae/geomyidae-0.34.ebuild
 2005091309 ./net-misc/gerbera/gerbera-1.4.0-r1.ebuild
-2005091409 ./net-misc/gerbera/gerbera-1.5.0.ebuild
-2005091409 ./net-misc/gerbera/gerbera-9999.ebuild
+2006040109 ./net-misc/gerbera/gerbera-1.5.0-r1.ebuild
+2006040109 ./net-misc/gerbera/gerbera-9999.ebuild
 1702282250 ./net-misc/getdate/getdate-1.2-r1.ebuild
 2003150109 ./net-misc/getdate/getdate-1.2-r2.ebuild
 2004202139 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild
@@ -24609,8 +24635,8 @@
 1906121439 ./net-misc/mico/mico-2.3.13-r14.ebuild
 1906041439 ./net-misc/mico/mico-9999.ebuild
 1702282250 ./net-misc/midentd/midentd-2.3.1-r2.ebuild
-1904210839 ./net-misc/mikutter/mikutter-3.8.6.ebuild
-1904210839 ./net-misc/mikutter/mikutter-9999.ebuild
+2006041239 ./net-misc/mikutter/mikutter-3.8.6.ebuild
+2006041239 ./net-misc/mikutter/mikutter-9999.ebuild
 2004261539 ./net-misc/minidlna/minidlna-1.2.1-r1.ebuild
 2002230040 ./net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
 2004021039 ./net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild
@@ -24793,7 +24819,7 @@
 2005221539 ./net-misc/remmina/remmina-1.4.4-r2.ebuild
 2005251539 ./net-misc/remmina/remmina-1.4.5.ebuild
 1908151909 ./net-misc/rinetd/rinetd-0.62-r2.ebuild
-2002230040 ./net-misc/ris-linux/ris-linux-0.4-r1.ebuild
+2006041239 ./net-misc/ris-linux/ris-linux-0.4-r1.ebuild
 2004211009 ./net-misc/rsync/rsync-3.1.3.ebuild
 1702282250 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 2002230040 ./net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild
@@ -24839,10 +24865,10 @@
 2002112051 ./net-misc/snarf/snarf-7.0-r4.ebuild
 1702282250 ./net-misc/sobby/sobby-0.4.8-r1.ebuild
 2001271409 ./net-misc/socat/socat-2.0.0_beta9.ebuild
-2001271409 ./net-misc/socat/socat-9999.ebuild
 2003261841 ./net-misc/socat/socat-1.7.3.3.ebuild
 2003261841 ./net-misc/socat/socat-1.7.3.4.ebuild
 2004032241 ./net-misc/socat/socat-1.7.3.2.ebuild
+2006031239 ./net-misc/socat/socat-9999.ebuild
 2002230040 ./net-misc/sock/sock-1.1-r1.ebuild
 2001051415 ./net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
 2001051415 ./net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild
@@ -24850,7 +24876,7 @@
 2003152212 ./net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
 2004192139 ./net-misc/spice-gtk/spice-gtk-0.38.ebuild
 2004192139 ./net-misc/spice-gtk/spice-gtk-9999.ebuild
-1710031628 ./net-misc/spiped/spiped-1.6.0-r1.ebuild
+2006040009 ./net-misc/spiped/spiped-1.6.0-r1.ebuild
 1902180709 ./net-misc/spread/spread-4.4.1.ebuild
 1902121009 ./net-misc/spread/spread-5.0.1.ebuild
 1706042153 ./net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
@@ -24935,8 +24961,8 @@
 2001292109 ./net-misc/wput/wput-0.6.2.ebuild
 2004032241 ./net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
 1810272209 ./net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
-2002210209 ./net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
 2002241739 ./net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
+2006040939 ./net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
 1912110109 ./net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
 1912110109 ./net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
 1912221909 ./net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
@@ -25085,9 +25111,7 @@
 2005261909 ./net-p2p/transmission/transmission-3.00-r1.ebuild
 2005261909 ./net-p2p/transmission/transmission-9999.ebuild
 1806011708 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
-1702282250 ./net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
 1911232009 ./net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
-1806041338 ./net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
 1911232009 ./net-p2p/vuze/vuze-5.7.6.0.ebuild
 1812040109 ./net-p2p/xmr-stak/xmr-stak-2.7.0.ebuild
 1812110009 ./net-p2p/xmr-stak/xmr-stak-2.7.1.ebuild
@@ -25184,9 +25208,6 @@
 1702282250 ./net-proxy/cntlm/cntlm-0.93_beta5-r2.ebuild
 2004032241 ./net-proxy/dante/dante-1.4.1-r2.ebuild
 1902161239 ./net-proxy/dnsproxy/dnsproxy-1.17.ebuild
-1808220809 ./net-proxy/haproxy/haproxy-1.8.13.ebuild
-1807210139 ./net-proxy/haproxy/haproxy-1.8.9.ebuild
-2004021639 ./net-proxy/haproxy/haproxy-1.9.15.ebuild
 2004141539 ./net-proxy/haproxy/haproxy-2.0.14.ebuild
 2004141539 ./net-proxy/haproxy/haproxy-2.1.4.ebuild
 2004241239 ./net-proxy/haproxy/haproxy-1.9.15-r1.ebuild
@@ -25196,9 +25217,11 @@
 2004250239 ./net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
 2005232239 ./net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
 2005232239 ./net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
+2006021109 ./net-proxy/haproxy/haproxy-2.1.5.ebuild
 1705270153 ./net-proxy/hatop/hatop-0.7.7.ebuild
 1702282250 ./net-proxy/havp/havp-0.92a-r2.ebuild
 1911180139 ./net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
+2006041108 ./net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.2.4.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.3.0.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
@@ -25212,7 +25235,7 @@
 1912111540 ./net-proxy/redsocks/redsocks-0.5.ebuild
 1912111540 ./net-proxy/redsocks/redsocks-9999.ebuild
 2002082109 ./net-proxy/redsocks/redsocks-0.5-r1.ebuild
-1907151840 ./net-proxy/rejik/rejik-3.2.10.ebuild
+2006041239 ./net-proxy/rejik/rejik-3.2.10.ebuild
 2006010608 ./net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
 2005200939 ./net-proxy/squid/squid-4.11.ebuild
 1705121220 ./net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild
@@ -25330,11 +25353,11 @@
 2004041439 ./net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
 2004101909 ./net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
 2003291409 ./net-wireless/bluez/bluez-5.54.ebuild
-1908201509 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
+2006020109 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
 1807262139 ./net-wireless/bss/bss-0.8-r1.ebuild
 1702282250 ./net-wireless/btcrack/btcrack-9999.ebuild
-1910152239 ./net-wireless/chirp/chirp-99999999.ebuild
-2005051939 ./net-wireless/chirp/chirp-20200430.ebuild
+2006041239 ./net-wireless/chirp/chirp-20200430.ebuild
+2006041239 ./net-wireless/chirp/chirp-99999999.ebuild
 2004191811 ./net-wireless/cpyrit-cuda/cpyrit-cuda-0.5.0.ebuild
 1702282250 ./net-wireless/cpyrit-opencl/cpyrit-opencl-0.5.0.ebuild
 1702282250 ./net-wireless/crackle/crackle-0.1.ebuild
@@ -25343,32 +25366,35 @@
 2004052339 ./net-wireless/crda/crda-4.14.ebuild
 1809071809 ./net-wireless/cubicsdr/cubicsdr-0.2.3-r2.ebuild
 1809071809 ./net-wireless/cubicsdr/cubicsdr-9999.ebuild
-1808200139 ./net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
-1909271709 ./net-wireless/dump1090/dump1090-9999.ebuild
-2001211409 ./net-wireless/dump1090/dump1090-3.7.2.ebuild
+2006020009 ./net-wireless/dump1090/dump1090-3.7.2.ebuild
+2006020009 ./net-wireless/dump1090/dump1090-9999.ebuild
 2004202139 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild
-2002091942 ./net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
 2002091942 ./net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
-2002091942 ./net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
-2002091942 ./net-wireless/gnuradio/gnuradio-9999.ebuild
+2006031739 ./net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
+2006031739 ./net-wireless/gnuradio/gnuradio-9999.ebuild
 1912111540 ./net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild
 1904182109 ./net-wireless/gqrx-scanner/gqrx-scanner-1.0.1_p20190329.ebuild
-1901112139 ./net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
-2001280109 ./net-wireless/gqrx/gqrx-2.12.1.ebuild
-2001280109 ./net-wireless/gqrx/gqrx-9999.ebuild
+2006041239 ./net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
+2006041239 ./net-wireless/gqrx/gqrx-2.12.1.ebuild
+2006041239 ./net-wireless/gqrx/gqrx-9999.ebuild
 2002091942 ./net-wireless/gr-baz/gr-baz-9999.ebuild
 2002091942 ./net-wireless/gr-doa/gr-doa-9999.ebuild
 2002091942 ./net-wireless/gr-foo/gr-foo-9999.ebuild
-2002091942 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
-2002091942 ./net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
-1908122109 ./net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
-1908122109 ./net-wireless/gr-iio/gr-iio-9999.ebuild
-2002091942 ./net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
-2002091942 ./net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
-2002091942 ./net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
-2002091942 ./net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
-2002091942 ./net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
-2002091942 ./net-wireless/gr-paint/gr-paint-9999.ebuild
+2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
+2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
+2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+2006020009 ./net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
+2006022109 ./net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
+2006022109 ./net-wireless/gr-iio/gr-iio-9999.ebuild
+2006020009 ./net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
+2006020009 ./net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
+2006020009 ./net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+2006020009 ./net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
+2006020009 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
+2006020009 ./net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+2006020009 ./net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
+2006020009 ./net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
+2006020009 ./net-wireless/gr-paint/gr-paint-9999.ebuild
 2002091942 ./net-wireless/gr-rds/gr-rds-9999.ebuild
 2002091942 ./net-wireless/gr-rftap/gr-rftap-9999.ebuild
 1909122209 ./net-wireless/gr-scan/gr-scan-20160211.ebuild
@@ -25378,7 +25404,7 @@
 2002180009 ./net-wireless/hidclient/hidclient-20120728.ebuild
 1902171839 ./net-wireless/horst/horst-5.1.ebuild
 1902171839 ./net-wireless/horst/horst-9999.ebuild
-2004291909 ./net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
+2006041239 ./net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
 1911271639 ./net-wireless/hostapd/hostapd-2.9-r1.ebuild
 2004220139 ./net-wireless/hostapd/hostapd-2.9-r2.ebuild
 2004220139 ./net-wireless/hostapd/hostapd-9999.ebuild
@@ -25481,22 +25507,16 @@
 1903200539 ./net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
 1903200539 ./net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
 1903200539 ./net-wireless/ubertooth/ubertooth-9999.ebuild
-1802110138 ./net-wireless/uhd/uhd-3.10.3.0.ebuild
-1912110241 ./net-wireless/uhd/uhd-3.11.0.0.ebuild
-1912110241 ./net-wireless/uhd/uhd-3.12.0.0.ebuild
-1912110241 ./net-wireless/uhd/uhd-3.13.0.1.ebuild
-1912110241 ./net-wireless/uhd/uhd-3.13.1.0.ebuild
-1912110241 ./net-wireless/uhd/uhd-3.14.0.0.ebuild
-1912110241 ./net-wireless/uhd/uhd-3.14.1.1.ebuild
-2004102339 ./net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+2006020009 ./net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+2006020009 ./net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
 1910162109 ./net-wireless/unifi/unifi-5.6.42-r1.ebuild
 2005151709 ./net-wireless/unifi/unifi-5.12.72.ebuild
 2005181440 ./net-wireless/unifi/unifi-5.13.27.ebuild
 2005201439 ./net-wireless/unifi/unifi-5.14.7.ebuild
 2005272039 ./net-wireless/unifi/unifi-5.13.29.ebuild
 2005281439 ./net-wireless/unifi/unifi-5.14.9.ebuild
-2003251309 ./net-wireless/urh/urh-2.8.4.ebuild
-2003251309 ./net-wireless/urh/urh-9999.ebuild
+2006020009 ./net-wireless/urh/urh-2.8.8.ebuild
+2006020009 ./net-wireless/urh/urh-9999.ebuild
 1702282250 ./net-wireless/wavemon/wavemon-0.7.6.ebuild
 1707261621 ./net-wireless/wavemon/wavemon-0.8.0.ebuild
 1905291309 ./net-wireless/wepattack/wepattack-0.1.3-r5.ebuild
@@ -26103,8 +26123,7 @@
 1908180209 ./sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
 1902052209 ./sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
 2005210239 ./sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild
-1702282250 ./sci-chemistry/mopac7/mopac7-1.15.ebuild
-2005291109 ./sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
+2006040939 ./sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
 1702282250 ./sci-chemistry/mpqc/mpqc-2.3.1-r4.ebuild
 1902052209 ./sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
 2005211139 ./sci-chemistry/mustang/mustang-3.2.2.ebuild
@@ -26139,7 +26158,7 @@
 1704201938 ./sci-chemistry/pymol-plugins-msms/pymol-plugins-msms-100415-r1.ebuild
 2002230040 ./sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
 2003042109 ./sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
-2003042109 ./sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
+2006040039 ./sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
 2002230040 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
 1702282250 ./sci-chemistry/raster3d/raster3d-3.0.2.ebuild
 1702282250 ./sci-chemistry/raster3d/raster3d-3.0.3.ebuild
@@ -26165,14 +26184,14 @@
 2001122339 ./sci-chemistry/votca-csg/votca-csg-1.5.ebuild
 2001130109 ./sci-chemistry/votca-csg/votca-csg-1.6_rc1.ebuild
 2001130109 ./sci-chemistry/votca-csg/votca-csg-9999.ebuild
-2005211109 ./sci-chemistry/votca-csg/votca-csg-1.6.ebuild
+2006040939 ./sci-chemistry/votca-csg/votca-csg-1.6.ebuild
 1709031641 ./sci-chemistry/votca-csgapps/votca-csgapps-1.4.1.ebuild
 1707301304 ./sci-chemistry/votca-csgapps/votca-csgapps-1.4.ebuild
 1905201409 ./sci-chemistry/votca-csgapps/votca-csgapps-1.5.ebuild
 1911220539 ./sci-chemistry/votca-csgapps/votca-csgapps-1.5.1.ebuild
 2001130109 ./sci-chemistry/votca-csgapps/votca-csgapps-1.6_rc1.ebuild
 2001130109 ./sci-chemistry/votca-csgapps/votca-csgapps-9999.ebuild
-2005211109 ./sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
+2006040939 ./sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
 1901312339 ./sci-chemistry/votca-ctp/votca-ctp-1.5.ebuild
 1911220539 ./sci-chemistry/votca-ctp/votca-ctp-1.5.1.ebuild
 1809272039 ./sci-chemistry/votca-xtp/votca-xtp-1.4.1.ebuild
@@ -26181,7 +26200,7 @@
 1911220539 ./sci-chemistry/votca-xtp/votca-xtp-1.5.1.ebuild
 2004030109 ./sci-chemistry/votca-xtp/votca-xtp-1.6_rc1.ebuild
 2004030109 ./sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
-2005211109 ./sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
+2006040939 ./sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
 1909061639 ./sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
 1808262139 ./sci-chemistry/xds-bin/xds-bin-20170930.ebuild
 1912310209 ./sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild
@@ -26300,7 +26319,7 @@
 1902211339 ./sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
 2004202139 ./sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild
 2002171539 ./sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
-2005291109 ./sci-geosciences/gmt/gmt-5.4.4.ebuild
+2006040939 ./sci-geosciences/gmt/gmt-5.4.4.ebuild
 2001271309 ./sci-geosciences/gnome-maps/gnome-maps-3.34.3.ebuild
 2005210239 ./sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
 2005211409 ./sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -26316,7 +26335,7 @@
 2002290939 ./sci-geosciences/gpxsee/gpxsee-7.23.ebuild
 2003090340 ./sci-geosciences/gpxsee/gpxsee-7.25.ebuild
 2003291939 ./sci-geosciences/gpxsee/gpxsee-7.26.ebuild
-2004290939 ./sci-geosciences/gpxsee/gpxsee-7.29.ebuild
+2006040939 ./sci-geosciences/gpxsee/gpxsee-7.29.ebuild
 2002140110 ./sci-geosciences/grass/grass-7.4.4-r3.ebuild
 2002140110 ./sci-geosciences/grass/grass-7.4.4.ebuild
 1805212239 ./sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
@@ -26405,7 +26424,7 @@
 1902031409 ./sci-geosciences/viking/viking-1.7.ebuild
 2003011309 ./sci-geosciences/viking/viking-1.7-r1.ebuild
 1903170109 ./sci-geosciences/xtide/xtide-2.15.1.ebuild
-2005291109 ./sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
+2006040939 ./sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
 2002171539 ./sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
 2001290039 ./sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
 2001301539 ./sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
@@ -26439,7 +26458,7 @@
 1707312112 ./sci-libs/bliss/bliss-0.73-r1.ebuild
 2001051415 ./sci-libs/bmrblib/bmrblib-1.0.3.ebuild
 2001141809 ./sci-libs/btf/btf-1.2.0.ebuild
-2003022039 ./sci-libs/btf/btf-1.2.6.ebuild
+2006030139 ./sci-libs/btf/btf-1.2.6.ebuild
 1702282250 ./sci-libs/buddy/buddy-2.4-r1.ebuild
 1910111911 ./sci-libs/camd/camd-2.3.1.ebuild
 2003022039 ./sci-libs/camd/camd-2.4.6.ebuild
@@ -26511,7 +26530,7 @@
 2002151310 ./sci-libs/colpack/colpack-1.0.10.ebuild
 1702282250 ./sci-libs/cqrlib/cqrlib-1.1.3.ebuild
 1910111911 ./sci-libs/cxsparse/cxsparse-3.1.2-r1.ebuild
-2003022039 ./sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+2006030139 ./sci-libs/cxsparse/cxsparse-3.2.0.ebuild
 1906221639 ./sci-libs/dcmtk/dcmtk-3.6.3.ebuild
 1908091939 ./sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild
 2001052109 ./sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -26545,7 +26564,7 @@
 1702282250 ./sci-libs/gamer/gamer-1.5-r2.ebuild
 1912132109 ./sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
 2004111239 ./sci-libs/gdal/gdal-3.0.4-r1.ebuild
-2005012109 ./sci-libs/geos/geos-3.8.1.ebuild
+2006041239 ./sci-libs/geos/geos-3.8.1.ebuild
 1702282250 ./sci-libs/gerris/gerris-20131206-r1.ebuild
 2002092009 ./sci-libs/getdata/getdata-0.9.0-r3.ebuild
 1909040139 ./sci-libs/gmsh/gmsh-4.4.1.ebuild
@@ -26590,14 +26609,14 @@
 1707170426 ./sci-libs/kim-api/kim-api-1.8.2.ebuild
 2005111609 ./sci-libs/kim-api/kim-api-2.1.3.ebuild
 2001141809 ./sci-libs/klu/klu-1.2.1.ebuild
-2005162309 ./sci-libs/klu/klu-1.3.9.ebuild
+2006030139 ./sci-libs/klu/klu-1.3.9.ebuild
 1910111911 ./sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
 1910111911 ./sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild
 2004032241 ./sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
 2003080739 ./sci-libs/lapack/lapack-3.8.0-r1.ebuild
-2005200939 ./sci-libs/lapack/lapack-3.8.0.ebuild
+2006012309 ./sci-libs/lapack/lapack-3.8.0.ebuild
 1910111911 ./sci-libs/ldl/ldl-2.1.0.ebuild
-2003022039 ./sci-libs/ldl/ldl-2.2.6.ebuild
+2006030139 ./sci-libs/ldl/ldl-2.2.6.ebuild
 1912110241 ./sci-libs/lemon/lemon-1.3.1.ebuild
 2002112051 ./sci-libs/levmar/levmar-2.6.ebuild
 2002112051 ./sci-libs/libaec/libaec-1.0.1.ebuild
@@ -26656,8 +26675,8 @@
 1702282250 ./sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild
 1702282250 ./sci-libs/libtifiles2/libtifiles2-1.1.7.ebuild
 2005172009 ./sci-libs/libxc/libxc-2.1.3.ebuild
-2005172009 ./sci-libs/libxc/libxc-2.2.3.ebuild
 2005172009 ./sci-libs/libxc/libxc-3.0.0.ebuild
+2006040939 ./sci-libs/libxc/libxc-2.2.3.ebuild
 2005070039 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
 2005091409 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
 2005130009 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild
@@ -26727,10 +26746,10 @@
 2004271809 ./sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
 1704221903 ./sci-libs/openlibm/openlibm-0.5.4.ebuild
 2004030639 ./sci-libs/openlibm/openlibm-0.7.0.ebuild
-1912110241 ./sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
-1912110241 ./sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
-1912110241 ./sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
-1912110241 ./sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+2006041239 ./sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
+2006041239 ./sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
+2006041239 ./sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+2006041239 ./sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
 2004240109 ./sci-libs/p4est/p4est-2.0.ebuild
 2004240109 ./sci-libs/p4est/p4est-2.2.ebuild
 2004240109 ./sci-libs/p4est/p4est-9999.ebuild
@@ -26789,11 +26808,11 @@
 1912110241 ./sci-libs/silo/silo-4.10.2-r1.ebuild
 1702282250 ./sci-libs/spqr/spqr-1.2.3-r1.ebuild
 2004140139 ./sci-libs/spqr/spqr-1.3.1.ebuild
-2005152039 ./sci-libs/spqr/spqr-2.0.9.ebuild
+2006030139 ./sci-libs/spqr/spqr-2.0.9.ebuild
 1702282250 ./sci-libs/spr/spr-3.3.2.ebuild
 1702282250 ./sci-libs/suitesparse/suitesparse-4.0.2.ebuild
 1702282250 ./sci-libs/suitesparse/suitesparse-4.2.1.ebuild
-2005152039 ./sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+2006030139 ./sci-libs/suitesparse/suitesparse-5.4.0.ebuild
 2003022039 ./sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
 2004032241 ./sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
 1907161639 ./sci-libs/sundials/sundials-4.0.2.ebuild
@@ -26808,7 +26827,7 @@
 2003091609 ./sci-libs/symengine/symengine-0.5.0-r1.ebuild
 2005022339 ./sci-libs/symengine/symengine-0.6.0.ebuild
 2004032241 ./sci-libs/szip/szip-2.1-r2.ebuild
-1912132109 ./sci-libs/ta-lib/ta-lib-0.4.0.ebuild
+2006041239 ./sci-libs/ta-lib/ta-lib-0.4.0.ebuild
 1910201609 ./sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild
 1702282250 ./sci-libs/taucs/taucs-2.2.ebuild
 2001051415 ./sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
@@ -26834,7 +26853,7 @@
 1911220539 ./sci-libs/votca-tools/votca-tools-1.5.1.ebuild
 2001130109 ./sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
 2001130109 ./sci-libs/votca-tools/votca-tools-9999.ebuild
-2005211109 ./sci-libs/votca-tools/votca-tools-1.6.ebuild
+2006040939 ./sci-libs/votca-tools/votca-tools-1.6.ebuild
 2005120909 ./sci-libs/vtk/vtk-8.1.0-r7.ebuild
 2005121839 ./sci-libs/vtk/vtk-8.2.0.ebuild
 1912110241 ./sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
@@ -26863,6 +26882,7 @@
 2005041609 ./sci-libs/linbox/linbox-1.6.3.ebuild
 2005151939 ./sci-libs/ignition-common/ignition-common-3.5.0.ebuild
 2005151939 ./sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
+2006020009 ./sci-libs/volk/volk-2.3.0.ebuild
 1805271108 ./sci-mathematics/4ti2/4ti2-1.6.7.ebuild
 2002140110 ./sci-mathematics/4ti2/4ti2-1.6.2.ebuild
 2002140110 ./sci-mathematics/4ti2/4ti2-1.6.5.ebuild
@@ -26952,7 +26972,7 @@
 1910111911 ./sci-mathematics/octave/octave-4.4.1.ebuild
 1910111911 ./sci-mathematics/octave/octave-5.1.0.ebuild
 2004111909 ./sci-mathematics/octave/octave-4.2.2.ebuild
-2005251539 ./sci-mathematics/octave/octave-5.2.0.ebuild
+2006040939 ./sci-mathematics/octave/octave-5.2.0.ebuild
 1703111348 ./sci-mathematics/otter/otter-3.3-r3.ebuild
 2002241609 ./sci-mathematics/pari-data/pari-data-20191216.ebuild
 2002241609 ./sci-mathematics/pari/pari-2.11.2.ebuild
@@ -27048,16 +27068,17 @@
 2002112051 ./sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
 2002112051 ./sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
 1906300709 ./sci-physics/geant-data/geant-data-4.10.05.ebuild
-2004271209 ./sci-physics/geant-data/geant-data-4.10.6-r1.ebuild
-2004271209 ./sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild
-2004271209 ./sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild
+2006040939 ./sci-physics/geant-data/geant-data-4.10.6-r1.ebuild
+2006040939 ./sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild
+2006040939 ./sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild
 1912312209 ./sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
 2005201609 ./sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild
 2005201609 ./sci-physics/geant-vmc/geant-vmc-9999.ebuild
-1906300709 ./sci-physics/geant/geant-4.10.05_p01.ebuild
-2004071609 ./sci-physics/geant/geant-4.10.6-r1.ebuild
-2004071609 ./sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
-2004071609 ./sci-physics/geant/geant-4.10.6_p1-r1.ebuild
+2006031109 ./sci-physics/geant/geant-4.10.05_p01.ebuild
+2006031109 ./sci-physics/geant/geant-4.10.6-r1.ebuild
+2006031109 ./sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
+2006031109 ./sci-physics/geant/geant-4.10.6_p1-r1.ebuild
+2006031109 ./sci-physics/geant/geant-4.10.6_p2.ebuild
 1805170109 ./sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild
 1805170109 ./sci-physics/h2o-gtk/h2o-gtk-9999.ebuild
 1912110241 ./sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
@@ -27946,7 +27967,7 @@
 2004211209 ./sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
 2003191139 ./sys-apps/apparmor/apparmor-2.13.4.ebuild
 1812242309 ./sys-apps/apply-default-acl/apply-default-acl-0.4.2.ebuild
-2005270409 ./sys-apps/apply-default-acl/apply-default-acl-0.4.3.ebuild
+2006020039 ./sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
 1712021939 ./sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
 2003261841 ./sys-apps/attr/attr-9999.ebuild
 2004211009 ./sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -27967,7 +27988,6 @@
 1702282250 ./sys-apps/biosdevname/biosdevname-0.7.2.ebuild
 1907090039 ./sys-apps/biosdevname/biosdevname-0.7.3.ebuild
 1803132238 ./sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
-1912031339 ./sys-apps/bleachbit/bleachbit-3.0.ebuild
 2005281909 ./sys-apps/bleachbit/bleachbit-4.0.0.ebuild
 2001310139 ./sys-apps/bolt/bolt-0.8-r1.ebuild
 2005040939 ./sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -27985,7 +28005,7 @@
 1711271440 ./sys-apps/clrngd/clrngd-1.0.3.ebuild
 2004032241 ./sys-apps/collectl/collectl-4.3.1.ebuild
 2003021439 ./sys-apps/colorized-logs/colorized-logs-2.4.ebuild
-2004282239 ./sys-apps/colorized-logs/colorized-logs-2.5.ebuild
+2006040939 ./sys-apps/colorized-logs/colorized-logs-2.5.ebuild
 1910120039 ./sys-apps/consolation/consolation-0.0.7.ebuild
 1702282250 ./sys-apps/conspy/conspy-1.10.ebuild
 1910311409 ./sys-apps/conspy/conspy-1.14.ebuild
@@ -27996,8 +28016,7 @@
 1912151809 ./sys-apps/cpuid/cpuid-20180519.ebuild
 2005200039 ./sys-apps/cpuid/cpuid-20200427.ebuild
 2004211009 ./sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
-1708312330 ./sys-apps/crazydiskinfo/crazydiskinfo-1.0.2.ebuild
-2003251309 ./sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
+2006041009 ./sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
 2001091509 ./sys-apps/daemonize/daemonize-1.7.8.ebuild
 2004211009 ./sys-apps/daisydog/daisydog-2014.05.30.ebuild
 1702261911 ./sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
@@ -28152,7 +28171,7 @@
 2005081846 ./sys-apps/hwloc/hwloc-1.11.13.ebuild
 2005081846 ./sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
 2005081846 ./sys-apps/hwloc/hwloc-2.0.4.ebuild
-2005181909 ./sys-apps/hwloc/hwloc-2.1.0.ebuild
+2006041239 ./sys-apps/hwloc/hwloc-2.1.0.ebuild
 2004032241 ./sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
 2003111509 ./sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
 1912221009 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
@@ -28246,8 +28265,9 @@
 1711271440 ./sys-apps/lssbus/lssbus-0.1.ebuild
 2004211009 ./sys-apps/makedev/makedev-3.23.1-r1.ebuild
 2003261841 ./sys-apps/man-db/man-db-2.9.1.ebuild
-2003261841 ./sys-apps/man-db/man-db-9999.ebuild
 2004032241 ./sys-apps/man-db/man-db-2.8.7.ebuild
+2006021239 ./sys-apps/man-db/man-db-2.9.2.ebuild
+2006021239 ./sys-apps/man-db/man-db-9999.ebuild
 2004211009 ./sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
 2005172309 ./sys-apps/man-pages/man-pages-5.05-r2.ebuild
 2005172309 ./sys-apps/man-pages/man-pages-5.06.ebuild
@@ -28288,7 +28308,7 @@
 2005121539 ./sys-apps/netloc/netloc-0.5.ebuild
 1803260038 ./sys-apps/netplug/netplug-1.2.9.2-r2.ebuild
 1904210239 ./sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
-1907151840 ./sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild
+2006041239 ./sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild
 1706100008 ./sys-apps/noexec/noexec-1.1.0-r1.ebuild
 2003040709 ./sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
 2004260809 ./sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild
@@ -28329,8 +28349,8 @@
 2001051415 ./sys-apps/policycoreutils/policycoreutils-9999.ebuild
 2002112309 ./sys-apps/policycoreutils/policycoreutils-3.0.ebuild
 2005081846 ./sys-apps/portage/portage-2.3.99-r2.ebuild
-2005282309 ./sys-apps/portage/portage-2.3.100.ebuild
 2005282309 ./sys-apps/portage/portage-9999.ebuild
+2006031109 ./sys-apps/portage/portage-2.3.100-r1.ebuild
 1906061309 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild
 2005281139 ./sys-apps/prctl/prctl-1.6-r1.ebuild
 1801060139 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -28340,7 +28360,7 @@
 2002112051 ./sys-apps/pv/pv-1.6.0-r1.ebuild
 1911101840 ./sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
 1912151809 ./sys-apps/qdirstat/qdirstat-1.6.ebuild
-2005291109 ./sys-apps/qdirstat/qdirstat-1.6.1.ebuild
+2006040939 ./sys-apps/qdirstat/qdirstat-1.6.1.ebuild
 1912210209 ./sys-apps/qingy/qingy-1.0.0-r4.ebuild
 2002092009 ./sys-apps/razercfg/razercfg-0.39-r2.ebuild
 1801130140 ./sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
@@ -28358,10 +28378,10 @@
 1904210639 ./sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
 1908081909 ./sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
 1911080339 ./sys-apps/rng-tools/rng-tools-6.8.ebuild
-2003301539 ./sys-apps/rng-tools/rng-tools-6.10.ebuild
 2004032241 ./sys-apps/rng-tools/rng-tools-5-r2.ebuild
 2004032241 ./sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
 2004052339 ./sys-apps/rng-tools/rng-tools-6.9.ebuild
+2006040939 ./sys-apps/rng-tools/rng-tools-6.10.ebuild
 1910261809 ./sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild
 2001131509 ./sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
 1904082239 ./sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild
@@ -28398,8 +28418,8 @@
 2003261841 ./sys-apps/sandbox/sandbox-2.17.ebuild
 2004032241 ./sys-apps/sandbox/sandbox-2.12.ebuild
 2004211009 ./sys-apps/sandbox/sandbox-2.13.ebuild
-2005312239 ./sys-apps/sandbox/sandbox-2.18.ebuild
 2005311409 ./sys-apps/sandbox/sandbox-2.20.ebuild
+2006040939 ./sys-apps/sandbox/sandbox-2.18.ebuild
 2003311009 ./sys-apps/sdparm/sdparm-1.11.ebuild
 2004032241 ./sys-apps/sdparm/sdparm-1.10.ebuild
 1908171339 ./sys-apps/secilc/secilc-2.9.ebuild
@@ -28440,9 +28460,9 @@
 1810211839 ./sys-apps/systemd-readahead/systemd-readahead-216.ebuild
 2004032241 ./sys-apps/systemd/systemd-244.ebuild
 2004271809 ./sys-apps/systemd/systemd-245-r5.ebuild
-2005310539 ./sys-apps/systemd/systemd-244.3.ebuild
 2005310539 ./sys-apps/systemd/systemd-245.5.ebuild
 2005310539 ./sys-apps/systemd/systemd-9999.ebuild
+2006020138 ./sys-apps/systemd/systemd-244.3.ebuild
 2005021439 ./sys-apps/sysvinit/sysvinit-2.93.ebuild
 2005021439 ./sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
 2005021439 ./sys-apps/sysvinit/sysvinit-2.96.ebuild
@@ -28518,7 +28538,7 @@
 2001211409 ./sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
 2005102239 ./sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild
 2002230040 ./sys-apps/pnputils/pnputils-0.1.ebuild
-2003122309 ./sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+2006012339 ./sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
 2002222009 ./sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
 2001110009 ./sys-apps/earlyoom/earlyoom-1.3.ebuild
 2001110009 ./sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -28605,7 +28625,7 @@
 1912291610 ./sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
 2004032241 ./sys-auth/polkit/polkit-0.115-r4.ebuild
 2004192339 ./sys-auth/polkit/polkit-0.116-r1.ebuild
-2004032241 ./sys-auth/realtime-base/realtime-base-0.1.ebuild
+2006041239 ./sys-auth/realtime-base/realtime-base-0.1.ebuild
 2005091439 ./sys-auth/rtkit/rtkit-0.12-r1.ebuild
 2005091439 ./sys-auth/rtkit/rtkit-0.13-r1.ebuild
 2004032241 ./sys-auth/skey/skey-1.1.5-r11.ebuild
@@ -28629,9 +28649,9 @@
 2005311909 ./sys-block/arcconf/arcconf-2.01.22270-r1.ebuild
 2005311909 ./sys-block/arcconf/arcconf-3.01.23531.ebuild
 2005311909 ./sys-block/arcconf/arcconf-3.04.23699.ebuild
-1808262339 ./sys-block/blktrace/blktrace-1.1.0-r1.ebuild
-1808262339 ./sys-block/blktrace/blktrace-1.1.0.ebuild
-2005250139 ./sys-block/blktrace/blktrace-1.2.0.ebuild
+2006041239 ./sys-block/blktrace/blktrace-1.1.0-r1.ebuild
+2006041239 ./sys-block/blktrace/blktrace-1.1.0.ebuild
+2006041239 ./sys-block/blktrace/blktrace-1.2.0.ebuild
 2001051415 ./sys-block/blocks/blocks-0.1.4_pre131210-r1.ebuild
 2001051415 ./sys-block/blocks/blocks-9999.ebuild
 1702282250 ./sys-block/buffer/buffer-1.19-r2.ebuild
@@ -28761,7 +28781,7 @@
 1708230040 ./sys-boot/arcload/arcload-0.50-r3.ebuild
 1907151840 ./sys-boot/bootcreator/bootcreator-1.1.ebuild
 1907151840 ./sys-boot/bootcreator/bootcreator-1.2.ebuild
-1910211109 ./sys-boot/colo/colo-1.22.ebuild
+2006041239 ./sys-boot/colo/colo-1.22.ebuild
 2002230040 ./sys-boot/cromwell-bin/cromwell-bin-2.40-r1.ebuild
 1702282250 ./sys-boot/cromwell/cromwell-2.40-r3.ebuild
 1702282250 ./sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -28803,6 +28823,7 @@
 1808152009 ./sys-boot/shim/shim-15.5-r1.ebuild
 1805071938 ./sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
 1906282209 ./sys-boot/silo/silo-1.4.14_p20170829.ebuild
+2006030539 ./sys-boot/silo/silo-1.4.14_p20200602.ebuild
 1911071039 ./sys-boot/syslinux/syslinux-5.10.ebuild
 1910052209 ./sys-boot/syslinux/syslinux-6.03.ebuild
 1910052209 ./sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -28831,7 +28852,7 @@
 2004240009 ./sys-cluster/ceph/ceph-12.2.12-r3.ebuild
 2004240009 ./sys-cluster/ceph/ceph-14.2.7-r1.ebuild
 2004240009 ./sys-cluster/ceph/ceph-14.2.9-r1.ebuild
-2006011009 ./sys-cluster/ceph/ceph-15.2.3.ebuild
+2006012239 ./sys-cluster/ceph/ceph-15.2.3.ebuild
 1812141709 ./sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
 2002092009 ./sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
 2002092009 ./sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
@@ -28863,13 +28884,13 @@
 1805042139 ./sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
 1702282250 ./sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
 2002230040 ./sys-cluster/fake/fake-1.1.10.ebuild
-2002101639 ./sys-cluster/galera/galera-25.3.25.ebuild
-2002101639 ./sys-cluster/galera/galera-25.3.26.ebuild
-2002101639 ./sys-cluster/galera/galera-25.3.28-r1.ebuild
-2002101639 ./sys-cluster/galera/galera-25.3.28.ebuild
-2002101639 ./sys-cluster/galera/galera-26.4.2.ebuild
-2004270309 ./sys-cluster/galera/galera-26.4.3.ebuild
 2005240109 ./sys-cluster/galera/galera-26.4.4.ebuild
+2006041239 ./sys-cluster/galera/galera-25.3.25.ebuild
+2006041239 ./sys-cluster/galera/galera-25.3.26.ebuild
+2006041239 ./sys-cluster/galera/galera-25.3.28-r1.ebuild
+2006041239 ./sys-cluster/galera/galera-25.3.28.ebuild
+2006041239 ./sys-cluster/galera/galera-26.4.2.ebuild
+2006041239 ./sys-cluster/galera/galera-26.4.3.ebuild
 1905311709 ./sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild
 1912111540 ./sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
 1904050039 ./sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
@@ -28900,8 +28921,8 @@
 2004032241 ./sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
 2004032241 ./sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
 1911222009 ./sys-cluster/keepalived/keepalived-2.0.19.ebuild
-2001251839 ./sys-cluster/keepalived/keepalived-2.0.20.ebuild
 2004032241 ./sys-cluster/keepalived/keepalived-2.0.17.ebuild
+2006040939 ./sys-cluster/keepalived/keepalived-2.0.20.ebuild
 2005181139 ./sys-cluster/knem/knem-1.1.3.ebuild
 2005181139 ./sys-cluster/knem/knem-9999.ebuild
 2002190239 ./sys-cluster/kube-apiserver/kube-apiserver-1.16.7.ebuild
@@ -29191,11 +29212,11 @@
 2005290239 ./sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
 2005300039 ./sys-devel/gcc/gcc-4.9.4-r1.ebuild
 2005300039 ./sys-devel/gcc/gcc-5.5.0.ebuild
-2005300039 ./sys-devel/gcc/gcc-6.5.0-r1.ebuild
-2005300039 ./sys-devel/gcc/gcc-6.5.0-r2.ebuild
 2005300039 ./sys-devel/gcc/gcc-7.5.0-r1.ebuild
 2005300039 ./sys-devel/gcc/gcc-8.4.0-r1.ebuild
 2005300039 ./sys-devel/gcc/gcc-9.3.0-r1.ebuild
+2006040009 ./sys-devel/gcc/gcc-6.5.0-r1.ebuild
+2006040009 ./sys-devel/gcc/gcc-6.5.0-r2.ebuild
 1912111540 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2004172239 ./sys-devel/gdb/gdb-9999.ebuild
 2005200039 ./sys-devel/gdb/gdb-9.1.ebuild
@@ -29261,10 +29282,10 @@
 2005062039 ./sys-devel/llvm/llvm-9.0.1.ebuild
 2005201439 ./sys-devel/llvm/llvm-10.0.1.9999.ebuild
 2005201439 ./sys-devel/llvm/llvm-10.0.1_rc1.ebuild
-1909170139 ./sys-devel/llvmgold/llvmgold-8.ebuild
 2001182039 ./sys-devel/llvmgold/llvmgold-11.ebuild
-2003042209 ./sys-devel/llvmgold/llvmgold-10.ebuild
-2003092139 ./sys-devel/llvmgold/llvmgold-9.ebuild
+2006040739 ./sys-devel/llvmgold/llvmgold-10.ebuild
+2006040739 ./sys-devel/llvmgold/llvmgold-8.ebuild
+2006040739 ./sys-devel/llvmgold/llvmgold-9.ebuild
 2004211009 ./sys-devel/m4/m4-1.4.17.ebuild
 2004211009 ./sys-devel/m4/m4-1.4.18-r1.ebuild
 2003261841 ./sys-devel/make/make-4.3.ebuild
@@ -29276,10 +29297,8 @@
 2004211009 ./sys-devel/patch/patch-2.7.6-r4.ebuild
 2004032241 ./sys-devel/pmake/pmake-1.111.3.3.ebuild
 2004062339 ./sys-devel/prelink/prelink-20151030.ebuild
-2004062339 ./sys-devel/prelink/prelink-99999999.ebuild
-1910111911 ./sys-devel/qconf/qconf-2.3.ebuild
-1910111911 ./sys-devel/qconf/qconf-2.4.ebuild
-2005291109 ./sys-devel/qconf/qconf-2.5.ebuild
+2006041139 ./sys-devel/prelink/prelink-99999999.ebuild
+2006040939 ./sys-devel/qconf/qconf-2.5.ebuild
 2003261841 ./sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
 1901180209 ./sys-devel/slibtool/slibtool-0.5.28.ebuild
 2005221039 ./sys-devel/smatch/smatch-1.60.ebuild
@@ -29330,7 +29349,7 @@
 2002101639 ./sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
 2002101639 ./sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
 1905300009 ./sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
-2005090209 ./sys-firmware/intel-microcode/intel-microcode-20200508_p20200508.ebuild
+2006020138 ./sys-firmware/intel-microcode/intel-microcode-20200520_p20200601.ebuild
 1702282250 ./sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
 1708061641 ./sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
 1806231709 ./sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -29537,8 +29556,8 @@
 1811231339 ./sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
 2005041639 ./sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
 2005111509 ./sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
-2002112051 ./sys-fs/ncdu/ncdu-1.14.1.ebuild
-2002141839 ./sys-fs/ncdu/ncdu-1.14.2.ebuild
+2006012239 ./sys-fs/ncdu/ncdu-1.14.2.ebuild
+2006012239 ./sys-fs/ncdu/ncdu-1.15.ebuild
 1702282250 ./sys-fs/nilfs-utils/nilfs-utils-2.1.6.ebuild
 1702282250 ./sys-fs/nilfs-utils/nilfs-utils-2.2.2.ebuild
 2002112051 ./sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
@@ -29546,7 +29565,7 @@
 2002231739 ./sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
 2002231739 ./sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
 2004231409 ./sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
-1902221309 ./sys-fs/owfs/owfs-3.2_p2-r2.ebuild
+2006041239 ./sys-fs/owfs/owfs-3.2_p2-r2.ebuild
 2002151310 ./sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
 2004032241 ./sys-fs/quota/quota-4.04-r3.ebuild
 2004032241 ./sys-fs/quota/quota-4.05-r1.ebuild
@@ -29711,6 +29730,12 @@
 2005272309 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.43.ebuild
 2005272309 ./sys-kernel/gentoo-sources/gentoo-sources-5.6.15.ebuild
 2006011609 ./sys-kernel/gentoo-sources/gentoo-sources-5.7.0.ebuild
+2006031739 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.183.ebuild
+2006031739 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.126.ebuild
+2006031739 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.226.ebuild
+2006031739 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.226.ebuild
+2006031739 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.44.ebuild
+2006031739 ./sys-kernel/gentoo-sources/gentoo-sources-5.6.16.ebuild
 2004130109 ./sys-kernel/git-sources/git-sources-5.7_rc1.ebuild
 2004200139 ./sys-kernel/git-sources/git-sources-5.7_rc2.ebuild
 2004270209 ./sys-kernel/git-sources/git-sources-5.7_rc3.ebuild
@@ -29740,9 +29765,9 @@
 2004211009 ./sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
 2004211009 ./sys-kernel/linux-headers/linux-headers-4.19.ebuild
 2004211009 ./sys-kernel/linux-headers/linux-headers-4.4.ebuild
-2005251539 ./sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
 2005301539 ./sys-kernel/linux-headers/linux-headers-5.6.ebuild
 2006011009 ./sys-kernel/linux-headers/linux-headers-5.7.ebuild
+2006040939 ./sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
 2002112051 ./sys-kernel/mips-sources/mips-sources-4.14.149.ebuild
 2002112051 ./sys-kernel/mips-sources/mips-sources-4.18.20.ebuild
 2002112051 ./sys-kernel/mips-sources/mips-sources-4.19.79.ebuild
@@ -29759,6 +29784,7 @@
 2005040739 ./sys-kernel/pf-sources/pf-sources-5.6_p6.ebuild
 2005150839 ./sys-kernel/pf-sources/pf-sources-5.6_p7.ebuild
 2005311609 ./sys-kernel/pf-sources/pf-sources-5.6_p8.ebuild
+2006021509 ./sys-kernel/pf-sources/pf-sources-5.7_p1.ebuild
 1903250339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
 1907152339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.75_p20190925.ebuild
@@ -29773,13 +29799,13 @@
 2005280209 ./sys-kernel/rt-sources/rt-sources-5.6.14_p7.ebuild
 2002101539 ./sys-kernel/spl/spl-0.7.13.ebuild
 2005231509 ./sys-kernel/vanilla-sources/vanilla-sources-3.16.84.ebuild
-2005272039 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.182.ebuild
-2005272039 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.125.ebuild
-2005272039 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.225.ebuild
-2005272039 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.225.ebuild
-2005272039 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.43.ebuild
-2005272039 ./sys-kernel/vanilla-sources/vanilla-sources-5.6.15.ebuild
 2006011908 ./sys-kernel/vanilla-sources/vanilla-sources-5.7.0.ebuild
+2006031209 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.183.ebuild
+2006031209 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.126.ebuild
+2006031209 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.226.ebuild
+2006031209 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.226.ebuild
+2006031209 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.44.ebuild
+2006031209 ./sys-kernel/vanilla-sources/vanilla-sources-5.6.16.ebuild
 1907151840 ./sys-kernel/xbox-sources/xbox-sources-2.6.16.26.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
@@ -30130,14 +30156,7 @@
 1910071209 ./sys-process/latencytop/latencytop-0.5-r1.ebuild
 2003261841 ./sys-process/lsof/lsof-4.93.2-r1.ebuild
 2004211009 ./sys-process/lsof/lsof-4.91.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.1.0.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.2.0.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.2.1.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.3.0-r1.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.3.0.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.3.1.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.3.2.ebuild
-1702282250 ./sys-process/memwatch/memwatch-0.3.3.ebuild
+2006041009 ./sys-process/memwatch/memwatch-0.3.3.ebuild
 1806021809 ./sys-process/minit/minit-0.10-r1.ebuild
 1905230039 ./sys-process/nmon/nmon-16g.ebuild
 1903261209 ./sys-process/nmon/nmon-16i.ebuild
@@ -30192,7 +30211,7 @@
 1910111911 ./virtual/blas/blas-3.6.ebuild
 1910111911 ./virtual/blas/blas-3.7.ebuild
 2004032241 ./virtual/blas/blas-1.0.ebuild
-2005200939 ./virtual/blas/blas-3.8.ebuild
+2006012309 ./virtual/blas/blas-3.8.ebuild
 1910111911 ./virtual/cblas/cblas-3.6.ebuild
 1910111911 ./virtual/cblas/cblas-3.7.ebuild
 2004032241 ./virtual/cblas/cblas-1.0.ebuild
@@ -30245,7 +30264,7 @@
 1910111911 ./virtual/lapack/lapack-3.7.ebuild
 2004032241 ./virtual/lapack/lapack-3.0.ebuild
 2004032241 ./virtual/lapack/lapack-3.1.ebuild
-2005200939 ./virtual/lapack/lapack-3.8.ebuild
+2006012309 ./virtual/lapack/lapack-3.8.ebuild
 1910111911 ./virtual/lapacke/lapacke-3.8.ebuild
 2004032241 ./virtual/latex-base/latex-base-1.0.ebuild
 1703291854 ./virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
@@ -30309,8 +30328,8 @@
 2004211009 ./virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild
 2004211009 ./virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
 2004211009 ./virtual/perl-Carp/perl-Carp-1.500.0-r2.ebuild
-2004112009 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0.ebuild
 2004211009 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.84.0-r1.ebuild
+2006020039 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
 2004211009 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
 2004211009 ./virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
 2004211009 ./virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild
@@ -30350,6 +30369,7 @@
 2004211009 ./virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r9.ebuild
 2004112009 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.003.140.ebuild
 2004211009 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.911.100.ebuild
+2006012339 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
 2004211009 ./virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild
 2004211009 ./virtual/perl-Module-Load/perl-Module-Load-0.340.0.ebuild
 2004211009 ./virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r12.ebuild
@@ -30479,8 +30499,8 @@
 1901261609 ./www-apache/mod_qos/mod_qos-11.61.ebuild
 1702282250 ./www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
 1804262239 ./www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
-1810202109 ./www-apache/mod_security/mod_security-2.9.1-r1.ebuild
-1903110209 ./www-apache/mod_security/mod_security-2.9.3.ebuild
+2006041239 ./www-apache/mod_security/mod_security-2.9.1-r1.ebuild
+2006041239 ./www-apache/mod_security/mod_security-2.9.3.ebuild
 1910071309 ./www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
 1908200639 ./www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
 1706121125 ./www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
@@ -30494,8 +30514,8 @@
 1903040439 ./www-apache/modsecurity-crs/modsecurity-crs-3.1.0.ebuild
 1702282250 ./www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
 1904020739 ./www-apache/passenger/passenger-6.0.2.ebuild
-1909180909 ./www-apache/passenger/passenger-6.0.4.ebuild
 2005311139 ./www-apache/passenger/passenger-6.0.5.ebuild
+2006040939 ./www-apache/passenger/passenger-6.0.4.ebuild
 1910122139 ./www-apache/pwauth/pwauth-2.3.10.ebuild
 1912111540 ./www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
 1912111540 ./www-apps/agendav/agendav-2.2.0.ebuild
@@ -30542,14 +30562,13 @@
 2005220409 ./www-apps/drupal/drupal-8.7.14.ebuild
 2005220409 ./www-apps/drupal/drupal-8.8.6.ebuild
 1907310809 ./www-apps/dspam-web/dspam-web-3.10.1.ebuild
-2003151439 ./www-apps/gitea/gitea-1.10.6.ebuild
-2005131109 ./www-apps/gitea/gitea-1.11.5.ebuild
 2005131109 ./www-apps/gitea/gitea-9999.ebuild
+2006020739 ./www-apps/gitea/gitea-1.11.6.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.1.1-r2.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.1.1.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.2.1.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.2.ebuild
-2005111539 ./www-apps/grafana-bin/grafana-bin-6.7.3.ebuild
+2006041139 ./www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
 2004211139 ./www-apps/hugo/hugo-0.69.0.ebuild
 1904250439 ./www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
 1903242209 ./www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
@@ -30654,14 +30673,14 @@
 1702282250 ./www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
 1702282250 ./www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
 1702282250 ./www-apps/webdavcgi/webdavcgi-1.1.1.ebuild
-1702282250 ./www-apps/webmcp/webmcp-1.2.6.ebuild
+2006020039 ./www-apps/webmcp/webmcp-1.2.6.ebuild
 1702282250 ./www-apps/websvn/websvn-2.3.3-r1.ebuild
 1912111540 ./www-apps/wiliki/wiliki-0.6.1-r1.ebuild
 2004300809 ./www-apps/wordpress/wordpress-5.4.1.ebuild
 1912121239 ./www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
 2002120009 ./www-apps/octoprint/octoprint-1.4.0_rc5.ebuild
 2005300209 ./www-client/chromium/chromium-83.0.4103.61.ebuild
-2005300209 ./www-client/chromium/chromium-84.0.4136.5.ebuild
+2006012039 ./www-client/chromium/chromium-84.0.4147.30.ebuild
 2002112051 ./www-client/dillo/dillo-3.0.5.ebuild
 2002231739 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2002231739 ./www-client/dillo/dillo-3.1_p20181005.ebuild
@@ -30671,26 +30690,30 @@
 2004032241 ./www-client/elinks/elinks-0.12_pre6-r1.ebuild
 2004032241 ./www-client/elinks/elinks-0.12_pre6-r4.ebuild
 1912110241 ./www-client/epiphany/epiphany-3.30.5.ebuild
-2001271309 ./www-client/epiphany/epiphany-3.32.6.ebuild
-2004202139 ./www-client/epiphany/epiphany-3.34.4.ebuild
+2006012339 ./www-client/epiphany/epiphany-3.32.6.ebuild
+2006012339 ./www-client/epiphany/epiphany-3.34.4.ebuild
 2005280239 ./www-client/falkon/falkon-3.1.0-r1.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
 1912111540 ./www-client/firefox-bin/firefox-bin-52.9.0.ebuild
 2005041909 ./www-client/firefox-bin/firefox-bin-68.8.0.ebuild
 2005041909 ./www-client/firefox-bin/firefox-bin-76.0.ebuild
 2005081846 ./www-client/firefox-bin/firefox-bin-76.0.1.ebuild
+2006030409 ./www-client/firefox-bin/firefox-bin-68.9.0.ebuild
+2006040309 ./www-client/firefox-bin/firefox-bin-77.0.1.ebuild
 2004261439 ./www-client/firefox/firefox-52.9.0-r1.ebuild
 2005062209 ./www-client/firefox/firefox-68.8.0.ebuild
 2005082323 ./www-client/firefox/firefox-76.0-r1.ebuild
 2005082323 ./www-client/firefox/firefox-76.0.1.ebuild
+2006041108 ./www-client/firefox/firefox-68.9.0.ebuild
+2006040739 ./www-client/firefox/firefox-77.0.1.ebuild
 2005302209 ./www-client/google-chrome-beta/google-chrome-beta-84.0.4147.30.ebuild
 2005302209 ./www-client/google-chrome-unstable/google-chrome-unstable-85.0.4158.4.ebuild
-2005201909 ./www-client/google-chrome/google-chrome-83.0.4103.61.ebuild
+2006040009 ./www-client/google-chrome/google-chrome-83.0.4103.97.ebuild
 2002231739 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 1808061609 ./www-client/jd/jd-2.8.5_p120826.ebuild
 1808081609 ./www-client/jd/jd-2.8.9_p150226.ebuild
-2003261841 ./www-client/links/links-2.20.2-r1.ebuild
 2004032241 ./www-client/links/links-2.20.2.ebuild
+2006040009 ./www-client/links/links-2.20.2-r1.ebuild
 1912110241 ./www-client/luakit/luakit-2017.08.10.ebuild
 2004011809 ./www-client/luakit/luakit-9999.ebuild
 2003261841 ./www-client/lynx/lynx-2.9.0_pre1.ebuild
@@ -30723,8 +30746,8 @@
 2005012109 ./www-client/uget/uget-2.2.0.ebuild
 2005012109 ./www-client/uget/uget-2.2.1.ebuild
 2005012109 ./www-client/uget/uget-9999.ebuild
-2005202109 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.1.1921.3_p1.ebuild
 2005281609 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.1.1929.3_p1.ebuild
+2006031239 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.1.1929.13_p1.ebuild
 2005101709 ./www-client/vivaldi/vivaldi-3.0.1874.38_p1.ebuild
 2002140110 ./www-client/w3m/w3m-0.5.3_p20190105.ebuild
 2004032241 ./www-client/w3m/w3m-0.5.3_p20180125.ebuild
@@ -30766,9 +30789,9 @@
 2005172009 ./www-misc/xxv/xxv-1.6.1-r1.ebuild
 2005121039 ./www-plugins/adobe-flash/adobe-flash-32.0.0.371.ebuild
 2003090209 ./www-plugins/browserpass/browserpass-3.0.6-r2.ebuild
-2005201909 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.61.ebuild
 2005302209 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.30_beta.ebuild
 2005302209 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4158.4_alpha.ebuild
+2006040009 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.97.ebuild
 2004261109 ./www-plugins/freshplayerplugin/freshplayerplugin-0.3.9-r1.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.0.0.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.3.0.ebuild
@@ -30803,19 +30826,19 @@
 1804280139 ./www-servers/monkeyd/monkeyd-9999.ebuild
 2005071639 ./www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
 2005262209 ./www-servers/nginx/nginx-1.18.0-r1.ebuild
-2005262209 ./www-servers/nginx/nginx-1.19.0.ebuild
+2006030009 ./www-servers/nginx/nginx-1.19.0-r1.ebuild
 1912111540 ./www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
 1912111540 ./www-servers/ocsigenserver/ocsigenserver-9999.ebuild
 1803140138 ./www-servers/pound/pound-2.7f-r1.ebuild
 1802271938 ./www-servers/pshs/pshs-0.3.3.ebuild
 1702282250 ./www-servers/pshs/pshs-9999.ebuild
-2002291009 ./www-servers/puma/puma-4.3.3.ebuild
 2003021539 ./www-servers/puma/puma-3.12.4.ebuild
+2006031009 ./www-servers/puma/puma-4.3.3.ebuild
 1912111540 ./www-servers/resin/resin-4.0.48-r1.ebuild
 2005241709 ./www-servers/servefile/servefile-0.4.4_p20200211.ebuild
 1708221206 ./www-servers/sniproxy/sniproxy-0.5.0.ebuild
 1912110241 ./www-servers/sniproxy/sniproxy-0.6.0.ebuild
-2004032241 ./www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
+2006041239 ./www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
 2002230040 ./www-servers/thttpd/thttpd-2.27.1.ebuild
 2002230040 ./www-servers/thttpd/thttpd-9999.ebuild
 2004201339 ./www-servers/tomcat/tomcat-7.0.103.ebuild
@@ -30853,8 +30876,8 @@
 2003261841 ./x11-apps/ico/ico-1.0.4.ebuild
 2003261841 ./x11-apps/ico/ico-1.0.5.ebuild
 1907132139 ./x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
-2005050009 ./x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
-2005050009 ./x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+2006032239 ./x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
+2006032239 ./x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
 2003261841 ./x11-apps/listres/listres-1.0.4.ebuild
 2004032241 ./x11-apps/luit/luit-20190106.ebuild
 2003261841 ./x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -31318,11 +31341,11 @@
 2002112051 ./x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
 2002112051 ./x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
 2005231339 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
-2005281909 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
+2006031839 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
 1811061009 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
 2004050839 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
 1910122109 ./x11-misc/lightdm/lightdm-1.28.0.ebuild
-2005281909 ./x11-misc/lightdm/lightdm-1.30.0.ebuild
+2006031839 ./x11-misc/lightdm/lightdm-1.30.0.ebuild
 1805220439 ./x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
 1905131209 ./x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
 1910072239 ./x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -31382,7 +31405,7 @@
 2005202109 ./x11-misc/qarma/qarma-1.ebuild
 1812052309 ./x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
 1704271327 ./x11-misc/qlipper/qlipper-5.0.0.ebuild
-2005291109 ./x11-misc/qlipper/qlipper-5.1.2.ebuild
+2006040939 ./x11-misc/qlipper/qlipper-5.1.2.ebuild
 2005210239 ./x11-misc/qps/qps-1.10.20.ebuild
 2005210239 ./x11-misc/qps/qps-2.0.0.ebuild
 2005210239 ./x11-misc/qps/qps-2.1.0.ebuild
@@ -31605,7 +31628,7 @@
 2004010939 ./x11-misc/xtrlock/xtrlock-2.13.ebuild
 1708232117 ./x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
 1708232117 ./x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild
-2005251539 ./x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+2006040939 ./x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
 2001311509 ./x11-misc/xvkbd/xvkbd-4.0.ebuild
 2002112051 ./x11-misc/xvkbd/xvkbd-3.7.ebuild
 2002112051 ./x11-misc/xvkbd/xvkbd-3.9.ebuild
@@ -31847,9 +31870,9 @@
 1809192139 ./x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
 2001292139 ./x11-plugins/wmxres/wmxres-1.2-r1.ebuild
 2003280239 ./x11-plugins/lurch/lurch-0.6.8.ebuild
-2005300609 ./x11-terms/alacritty/alacritty-0.4.2-r1.ebuild
-2005300609 ./x11-terms/alacritty/alacritty-0.4.3_rc1.ebuild
-2005300609 ./x11-terms/alacritty/alacritty-9999.ebuild
+2006021209 ./x11-terms/alacritty/alacritty-0.4.2-r1.ebuild
+2006021209 ./x11-terms/alacritty/alacritty-0.4.3.ebuild
+2006021209 ./x11-terms/alacritty/alacritty-9999.ebuild
 2004241209 ./x11-terms/aterm/aterm-1.0.1-r4.ebuild
 2002101039 ./x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
 1804280409 ./x11-terms/eterm/eterm-9999.ebuild
@@ -31920,7 +31943,7 @@
 2005101409 ./x11-themes/arc-theme/arc-theme-20200502.ebuild
 2004032241 ./x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
 1707301027 ./x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r1.ebuild
-2002112051 ./x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
+2006041239 ./x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
 1902221239 ./x11-themes/clearlooks-phenix/clearlooks-phenix-7.0.1.ebuild
 1709181058 ./x11-themes/clearlooks-phenix/clearlooks-phenix-9999.ebuild
 1702282250 ./x11-themes/comix-xcursors/comix-xcursors-0.8.2.ebuild
@@ -32097,7 +32120,7 @@
 1807091839 ./x11-themes/zukini/zukini-20120817.ebuild
 1805050439 ./x11-themes/zukitwo-shell/zukitwo-shell-2016.08.08.ebuild
 1805050439 ./x11-themes/zukitwo/zukitwo-2016.08.08.ebuild
-2004271539 ./x11-themes/e-flat-theme/e-flat-theme-0_pre20200427.ebuild
+2006021209 ./x11-themes/e-flat-theme/e-flat-theme-0_pre20200602.ebuild
 1910111911 ./x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
 2002010139 ./x11-wm/aewm/aewm-1.3.12-r1.ebuild
 2002112051 ./x11-wm/aewm/aewm-1.3.12.ebuild
@@ -32145,7 +32168,7 @@
 2002112051 ./x11-wm/i3/i3-4.16.1-r1.ebuild
 2002112051 ./x11-wm/i3/i3-4.17.1-r1.ebuild
 2002112051 ./x11-wm/i3/i3-9999.ebuild
-2005251539 ./x11-wm/i3/i3-4.18.ebuild
+2006040939 ./x11-wm/i3/i3-4.18.ebuild
 2002230040 ./x11-wm/icewm/icewm-1.5.5.ebuild
 2003181239 ./x11-wm/icewm/icewm-1.6.5.ebuild
 2005301139 ./x11-wm/icewm/icewm-1.6.6.ebuild
@@ -32186,7 +32209,7 @@
 2005151009 ./x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
 2005151009 ./x11-wm/sawfish/sawfish-1.12.90.ebuild
 1910111911 ./x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
-1912242109 ./x11-wm/sithwm/sithwm-1.2.3.ebuild
+2006041239 ./x11-wm/sithwm/sithwm-1.2.3.ebuild
 1802221208 ./x11-wm/spectrwm/spectrwm-3.1.0.ebuild
 2002112051 ./x11-wm/spectrwm/spectrwm-3.2.0.ebuild
 2003161709 ./x11-wm/spectrwm/spectrwm-3.3.0.ebuild
@@ -32223,7 +32246,7 @@
 2002191639 ./x11-wm/2bwm/2bwm-0.3.ebuild
 2002191639 ./x11-wm/2bwm/2bwm-9999.ebuild
 2003191509 ./xfce-base/exo/exo-0.12.11.ebuild
-2005271009 ./xfce-base/exo/exo-4.15.1.ebuild
+2006031339 ./xfce-base/exo/exo-4.15.1.ebuild
 2003261841 ./xfce-base/garcon/garcon-0.6.4-r2.ebuild
 2004042339 ./xfce-base/garcon/garcon-0.7.0.ebuild
 2004032241 ./xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
@@ -32515,8 +32538,9 @@
 2005190138 metadata/md5-cache/acct-group/apache-0
 2005190138 metadata/md5-cache/acct-group/svnusers-0
 2005200439 metadata/md5-cache/acct-group/exabgp-0
-2005302339 metadata/md5-cache/acct-group/Manifest.gz
 2005302339 metadata/md5-cache/acct-group/clair-0
+2006041039 metadata/md5-cache/acct-group/Manifest.gz
+2006041039 metadata/md5-cache/acct-group/motion-0
 2003261939 metadata/md5-cache/acct-user/abrt-0
 2003261939 metadata/md5-cache/acct-user/alias-0
 2003261939 metadata/md5-cache/acct-user/amavis-0
@@ -32699,8 +32723,9 @@
 2005190138 metadata/md5-cache/acct-user/apache-0
 2005190138 metadata/md5-cache/acct-user/svn-0
 2005200439 metadata/md5-cache/acct-user/exabgp-0
-2005302339 metadata/md5-cache/acct-user/Manifest.gz
 2005302339 metadata/md5-cache/acct-user/clair-0
+2006041039 metadata/md5-cache/acct-user/Manifest.gz
+2006041039 metadata/md5-cache/acct-user/motion-0
 2002221412 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
 2002221412 metadata/md5-cache/app-accessibility/emacspeak-9999
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
@@ -32709,9 +32734,7 @@
 2005260027 metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
 2005260027 metadata/md5-cache/app-accessibility/accerciser-3.22.0
 2005260027 metadata/md5-cache/app-accessibility/at-spi2-atk-2.32.0
-2005260027 metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
 2005260027 metadata/md5-cache/app-accessibility/at-spi2-core-2.32.1
-2005260027 metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0
 2005260027 metadata/md5-cache/app-accessibility/at-spi2-core-2.36.0
 2005260027 metadata/md5-cache/app-accessibility/brltty-5.2-r1
 2005260027 metadata/md5-cache/app-accessibility/brltty-6.0-r1
@@ -32741,9 +32764,11 @@
 2005260027 metadata/md5-cache/app-accessibility/sphinx2-0.6
 2005260027 metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
 2005290339 metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
-2006010910 metadata/md5-cache/app-accessibility/Manifest.gz
 2006010910 metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
 2006010910 metadata/md5-cache/app-accessibility/sphinxbase-0.8
+2006031839 metadata/md5-cache/app-accessibility/Manifest.gz
+2006031839 metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
+2006031839 metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0
 1712300140 metadata/md5-cache/app-admin/aws-elb-tools-1.0.15.1-r1
 1903312039 metadata/md5-cache/app-admin/checksec-1.11.1
 1810171539 metadata/md5-cache/app-admin/checksec-1.9.0
@@ -33005,15 +33030,7 @@
 2005260027 metadata/md5-cache/app-admin/psmon-1.39-r1
 2005260027 metadata/md5-cache/app-admin/puppet-5.5.19-r1
 2005260027 metadata/md5-cache/app-admin/puppet-5.5.20
-2005260027 metadata/md5-cache/app-admin/puppet-6.14.0
-2005260027 metadata/md5-cache/app-admin/puppet-6.15.0
-2005260027 metadata/md5-cache/app-admin/puppet-agent-6.14.0
-2005260027 metadata/md5-cache/app-admin/puppet-agent-6.15.0
 2005260027 metadata/md5-cache/app-admin/puppet-lint-2.4.2
-2005260027 metadata/md5-cache/app-admin/puppetdb-6.10.0
-2005260027 metadata/md5-cache/app-admin/puppetdb-6.9.1
-2005260027 metadata/md5-cache/app-admin/puppetserver-6.11.0
-2005260027 metadata/md5-cache/app-admin/puppetserver-6.9.1-r1
 2005260027 metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
 2005260027 metadata/md5-cache/app-admin/pydf-12-r1
 2005260027 metadata/md5-cache/app-admin/qpage-3.3
@@ -33082,7 +33099,6 @@
 2005292009 metadata/md5-cache/app-admin/consul-1.7.2
 2005291409 metadata/md5-cache/app-admin/mcelog-169
 2005291409 metadata/md5-cache/app-admin/mcelog-170
-2006010910 metadata/md5-cache/app-admin/Manifest.gz
 2006010910 metadata/md5-cache/app-admin/ansible-2.9.7
 2006010910 metadata/md5-cache/app-admin/ansible-2.9.9
 2006010910 metadata/md5-cache/app-admin/ansible-9999
@@ -33092,7 +33108,6 @@
 2006010910 metadata/md5-cache/app-admin/cdist-5.1.3
 2006010910 metadata/md5-cache/app-admin/cdist-6.0.0
 2006010910 metadata/md5-cache/app-admin/cdist-6.5.4
-2005311139 metadata/md5-cache/app-admin/clsync-0.4.4
 2005311139 metadata/md5-cache/app-admin/clsync-9999
 2006010910 metadata/md5-cache/app-admin/clustershell-1.7.3
 2006010910 metadata/md5-cache/app-admin/conkyforecast-2.24-r1
@@ -33127,13 +33142,21 @@
 2006010910 metadata/md5-cache/app-admin/supervisor-4.2.0
 2006010910 metadata/md5-cache/app-admin/webapp-config-1.55-r1
 2006010910 metadata/md5-cache/app-admin/webapp-config-9999
+2006040939 metadata/md5-cache/app-admin/Manifest.gz
+2006040939 metadata/md5-cache/app-admin/clsync-0.4.4
+2006012009 metadata/md5-cache/app-admin/denyhosts-3.0-r2
+2006020339 metadata/md5-cache/app-admin/puppet-6.15.0
+2006020339 metadata/md5-cache/app-admin/puppet-agent-6.15.0
+2006032109 metadata/md5-cache/app-admin/puppet-agent-6.16.0
+2006020339 metadata/md5-cache/app-admin/puppetdb-6.10.0
+2006020339 metadata/md5-cache/app-admin/puppetserver-6.11.0
 2005260027 metadata/md5-cache/app-antivirus/clamav-0.102.2-r1
 2005260027 metadata/md5-cache/app-antivirus/clamav-0.102.2-r3
 2005260027 metadata/md5-cache/app-antivirus/clamav-0.102.3
 2005260027 metadata/md5-cache/app-antivirus/clamtk-6.02-r1
-2005260027 metadata/md5-cache/app-antivirus/clamtk-6.03
-2006010910 metadata/md5-cache/app-antivirus/Manifest.gz
 2006010910 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
+2006040939 metadata/md5-cache/app-antivirus/Manifest.gz
+2006040939 metadata/md5-cache/app-antivirus/clamtk-6.03
 1909082140 metadata/md5-cache/app-arch/atool-0.39.0-r1
 1702282308 metadata/md5-cache/app-arch/pet2tgz-0.3
 1802120308 metadata/md5-cache/app-arch/stenc-1.0.7
@@ -33174,7 +33197,6 @@
 2005260027 metadata/md5-cache/app-arch/file-roller-3.32.4
 2005260027 metadata/md5-cache/app-arch/funzix-1.0
 2005260027 metadata/md5-cache/app-arch/gcab-1.3
-2005260027 metadata/md5-cache/app-arch/gcab-1.4
 2005260027 metadata/md5-cache/app-arch/gnome-autoar-0.2.4
 2005260027 metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r1
 2005260027 metadata/md5-cache/app-arch/gzip-1.10
@@ -33266,7 +33288,6 @@
 2005260027 metadata/md5-cache/app-arch/zstd-1.4.4-r3
 2005260027 metadata/md5-cache/app-arch/zstd-1.4.4-r4
 2005301209 metadata/md5-cache/app-arch/unar-1.10.7
-2006010910 metadata/md5-cache/app-arch/Manifest.gz
 2006010910 metadata/md5-cache/app-arch/bloscpack-0.16.0
 2006010910 metadata/md5-cache/app-arch/brotli-1.0.6-r1
 2006010910 metadata/md5-cache/app-arch/brotli-1.0.7
@@ -33279,6 +33300,8 @@
 2006010910 metadata/md5-cache/app-arch/vimball-0.5.1
 2006010910 metadata/md5-cache/app-arch/vimball-9999
 2006010008 metadata/md5-cache/app-arch/xarchiver-0.5.4.15
+2006031839 metadata/md5-cache/app-arch/Manifest.gz
+2006031839 metadata/md5-cache/app-arch/gcab-1.4
 1806240109 metadata/md5-cache/app-backup/ccollect-0.8
 1706110808 metadata/md5-cache/app-backup/cdbkup-1.0-r2
 1906012109 metadata/md5-cache/app-backup/consul-backinator-1.6.5
@@ -33302,7 +33325,6 @@
 2002060939 metadata/md5-cache/app-backup/mkstage4-0.2
 2002112051 metadata/md5-cache/app-backup/rsnapshot-1.4.2
 2003241809 metadata/md5-cache/app-backup/backupninja-1.1.0
-2004041909 metadata/md5-cache/app-backup/rdedup-1.0.2
 2004101039 metadata/md5-cache/app-backup/mkstage4-0.3
 2004101039 metadata/md5-cache/app-backup/mkstage4-9999
 2005260027 metadata/md5-cache/app-backup/amanda-3.3.9
@@ -33372,7 +33394,6 @@
 2005260027 metadata/md5-cache/app-backup/tsm-8.1.6.0
 2005260027 metadata/md5-cache/app-backup/zbackup-1.4.4-r1
 2005260027 metadata/md5-cache/app-backup/zbackup-9999
-2006011009 metadata/md5-cache/app-backup/Manifest.gz
 2006010910 metadata/md5-cache/app-backup/attic-0.16-r1
 2006010910 metadata/md5-cache/app-backup/attic-9999
 2006010910 metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
@@ -33382,10 +33403,6 @@
 2006010910 metadata/md5-cache/app-backup/borgweb-0.2.0-r2
 2006010910 metadata/md5-cache/app-backup/borgweb-0.3.0
 2006010910 metadata/md5-cache/app-backup/cachedir-1.4
-2006010910 metadata/md5-cache/app-backup/duplicity-0.8.09-r1
-2006010910 metadata/md5-cache/app-backup/duplicity-0.8.11.1596
-2006010910 metadata/md5-cache/app-backup/duplicity-0.8.11.1596-r1
-2006010910 metadata/md5-cache/app-backup/duplicity-0.8.12.1612
 2006010910 metadata/md5-cache/app-backup/duplicity-0.8.12.1612-r1
 2006010910 metadata/md5-cache/app-backup/genbackupdata-1.9
 2006010910 metadata/md5-cache/app-backup/holland-1.0.10
@@ -33397,9 +33414,16 @@
 2006010910 metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
 2006010910 metadata/md5-cache/app-backup/rdiff-backup-2.0.0
 2006010910 metadata/md5-cache/app-backup/rdiff-backup-2.0.3
-2006011009 metadata/md5-cache/app-backup/snapper-0.8.9
 2005311609 metadata/md5-cache/app-backup/synology-cloud-station-backup-4469
 2006010910 metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
+2006040609 metadata/md5-cache/app-backup/Manifest.gz
+2006021709 metadata/md5-cache/app-backup/bacula-9.4.4-r3
+2006021709 metadata/md5-cache/app-backup/bacula-9.6.3-r1
+2006022139 metadata/md5-cache/app-backup/dar-2.6.10
+2006022338 metadata/md5-cache/app-backup/duplicity-0.8.13
+2006021809 metadata/md5-cache/app-backup/kup-0.8.0
+2006021209 metadata/md5-cache/app-backup/rdedup-1.0.2
+2006040609 metadata/md5-cache/app-backup/snapper-0.8.9-r1
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -33554,8 +33578,6 @@
 2003261841 metadata/md5-cache/app-crypt/openpgp-keys-gentoo-auth-20191030
 2004032241 metadata/md5-cache/app-crypt/quickcrypt-0.9.2b-r1
 2004041839 metadata/md5-cache/app-crypt/easy-rsa-3.0.7
-2004131139 metadata/md5-cache/app-crypt/nitrocli-0.3.2
-2004131809 metadata/md5-cache/app-crypt/nitrocli-0.3.1
 2004200009 metadata/md5-cache/app-crypt/ubuntu-keyring-2020.02.11.2
 2004211009 metadata/md5-cache/app-crypt/gentoo-keys-201901130136
 2004211009 metadata/md5-cache/app-crypt/hashalot-0.3-r2
@@ -33665,7 +33687,6 @@
 2005260027 metadata/md5-cache/app-crypt/moolticute-0.43.3
 2005260027 metadata/md5-cache/app-crypt/moolticute-9999
 2005260027 metadata/md5-cache/app-crypt/nasty-0.6-r1
-2005260027 metadata/md5-cache/app-crypt/nitrocli-0.3.3
 2005260027 metadata/md5-cache/app-crypt/nitrokey-app-1.4
 2005260027 metadata/md5-cache/app-crypt/nitrokey-app-9999
 2005260027 metadata/md5-cache/app-crypt/nwipe-0.25
@@ -33731,8 +33752,6 @@
 2005260027 metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
 2005272209 metadata/md5-cache/app-crypt/gnupg-2.2.20
 2005271609 metadata/md5-cache/app-crypt/mit-krb5-1.18.2
-2005270939 metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
-2006010910 metadata/md5-cache/app-crypt/Manifest.gz
 2006010910 metadata/md5-cache/app-crypt/acme-1.3.0-r1
 2006010910 metadata/md5-cache/app-crypt/acme-1.4.0
 2006010910 metadata/md5-cache/app-crypt/acme-9999
@@ -33741,7 +33760,6 @@
 2006010910 metadata/md5-cache/app-crypt/acme-tiny-9999
 2006010910 metadata/md5-cache/app-crypt/certbot-1.3.0
 2006010910 metadata/md5-cache/app-crypt/certbot-1.4.0
-2006010910 metadata/md5-cache/app-crypt/certbot-9999
 2006010910 metadata/md5-cache/app-crypt/certbot-apache-1.3.0-r1
 2006010910 metadata/md5-cache/app-crypt/certbot-apache-1.4.0
 2006010910 metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -33759,6 +33777,16 @@
 2006010910 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.2.0
 2006010910 metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
 2006010910 metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
+2006040939 metadata/md5-cache/app-crypt/Manifest.gz
+2006032139 metadata/md5-cache/app-crypt/acme-1.5.0
+2006032139 metadata/md5-cache/app-crypt/certbot-1.5.0
+2006032139 metadata/md5-cache/app-crypt/certbot-9999
+2006032139 metadata/md5-cache/app-crypt/certbot-apache-1.5.0
+2006032139 metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
+2006021209 metadata/md5-cache/app-crypt/nitrocli-0.3.1
+2006021209 metadata/md5-cache/app-crypt/nitrocli-0.3.2
+2006021209 metadata/md5-cache/app-crypt/nitrocli-0.3.3
+2006040939 metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1702282308 metadata/md5-cache/app-dicts/eblook-1.6.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
@@ -33967,17 +33995,13 @@
 2004032241 metadata/md5-cache/app-dicts/myspell-es-2.3
 2004032241 metadata/md5-cache/app-dicts/myspell-et-20030606
 2004032241 metadata/md5-cache/app-dicts/myspell-fo-0.4.2
-2004032241 metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
 2004032241 metadata/md5-cache/app-dicts/myspell-ga-20160213
 2004032241 metadata/md5-cache/app-dicts/myspell-gl-20131013
 2004032241 metadata/md5-cache/app-dicts/myspell-he-2012.08.15
 2004032241 metadata/md5-cache/app-dicts/myspell-hr-20080813
 2004032241 metadata/md5-cache/app-dicts/myspell-ia-20140518
-2004032241 metadata/md5-cache/app-dicts/myspell-id-2.0
-2004032241 metadata/md5-cache/app-dicts/myspell-is-2012.09.01
 2004032241 metadata/md5-cache/app-dicts/myspell-it-20081129-r1
 2004032241 metadata/md5-cache/app-dicts/myspell-kk-1.1.2
-2004032241 metadata/md5-cache/app-dicts/myspell-km-1.6
 2004032241 metadata/md5-cache/app-dicts/myspell-ku-0.21
 2004032241 metadata/md5-cache/app-dicts/myspell-lt-1.3
 2004032241 metadata/md5-cache/app-dicts/myspell-lv-1.3.0
@@ -33994,12 +34018,9 @@
 2004032241 metadata/md5-cache/app-dicts/myspell-ro-3.3.10
 2004032241 metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
 2004032241 metadata/md5-cache/app-dicts/myspell-sk-20110224
-2004032241 metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
 2004032241 metadata/md5-cache/app-dicts/myspell-sq-1.6.4
-2004032241 metadata/md5-cache/app-dicts/myspell-sv-2.14
 2004032241 metadata/md5-cache/app-dicts/myspell-sw-20110106
 2004032241 metadata/md5-cache/app-dicts/myspell-tn-20060316
-2004032241 metadata/md5-cache/app-dicts/myspell-uk-1.6.5
 2004032241 metadata/md5-cache/app-dicts/myspell-zu-20100126
 2004211009 metadata/md5-cache/app-dicts/aspell-af-0.50.0
 2004211009 metadata/md5-cache/app-dicts/aspell-be-0.01-r1
@@ -34038,7 +34059,6 @@
 2004211009 metadata/md5-cache/app-dicts/aspell-uk-1.4.0.0
 2004211009 metadata/md5-cache/app-dicts/aspell-vi-0.01.1.1
 2005102009 metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
-2005260027 metadata/md5-cache/app-dicts/Manifest.gz
 2005260027 metadata/md5-cache/app-dicts/canna-2ch-20040519
 2005260027 metadata/md5-cache/app-dicts/canna-cannadic-0.95c
 2005260027 metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -34054,6 +34074,14 @@
 2005260027 metadata/md5-cache/app-dicts/wordnet-3.0-r4
 2005260027 metadata/md5-cache/app-dicts/wordnet-3.0-r5
 2005260027 metadata/md5-cache/app-dicts/wordnet-3.1
+2006041239 metadata/md5-cache/app-dicts/Manifest.gz
+2006041239 metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
+2006041239 metadata/md5-cache/app-dicts/myspell-id-2.0
+2006041239 metadata/md5-cache/app-dicts/myspell-is-2012.09.01
+2006041239 metadata/md5-cache/app-dicts/myspell-km-1.6
+2006041239 metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
+2006041239 metadata/md5-cache/app-dicts/myspell-sv-2.14
+2006041239 metadata/md5-cache/app-dicts/myspell-uk-1.6.5
 1807210109 metadata/md5-cache/app-doc/clsync-docs-0.4.2
 1702282308 metadata/md5-cache/app-doc/csound-manual-6.06
 1702282308 metadata/md5-cache/app-doc/csound-manual-6.07
@@ -34169,7 +34197,6 @@
 2004211009 metadata/md5-cache/app-doc/pms-bin-7_p20180430
 2004211009 metadata/md5-cache/app-doc/tldp-howto-20120707
 2004211009 metadata/md5-cache/app-doc/zsh-lovers-0.9.0
-2005061939 metadata/md5-cache/app-doc/clsync-docs-0.4.4-r1
 2005260027 metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
 2005260027 metadata/md5-cache/app-doc/doxygen-9999
 2005260027 metadata/md5-cache/app-doc/elisp-manual-18.1.03
@@ -34200,9 +34227,10 @@
 2005281509 metadata/md5-cache/app-doc/doxygen-1.8.15
 2005281509 metadata/md5-cache/app-doc/doxygen-1.8.16-r1
 2005281509 metadata/md5-cache/app-doc/doxygen-1.8.17
-2006010910 metadata/md5-cache/app-doc/Manifest.gz
 2006010910 metadata/md5-cache/app-doc/cppman-0.4.8-r2
 2006010910 metadata/md5-cache/app-doc/cppman-0.4.9
+2006040939 metadata/md5-cache/app-doc/Manifest.gz
+2006040939 metadata/md5-cache/app-doc/clsync-docs-0.4.4-r1
 1910022239 metadata/md5-cache/app-editors/jed-0.99.19-r1
 1702282308 metadata/md5-cache/app-editors/jupp-3.1_p30
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
@@ -34602,10 +34630,10 @@
 2005260027 metadata/md5-cache/app-emacs/twittering-mode-9999
 2005260027 metadata/md5-cache/app-emacs/yc-4.0.13
 2005260027 metadata/md5-cache/app-emacs/zenirc-2.112-r1
-2005291109 metadata/md5-cache/app-emacs/auctex-12.2
-2006010910 metadata/md5-cache/app-emacs/Manifest.gz
 2005311409 metadata/md5-cache/app-emacs/emms-5.4
 2006010910 metadata/md5-cache/app-emacs/pymacs-0.26-r1
+2006040939 metadata/md5-cache/app-emacs/Manifest.gz
+2006040939 metadata/md5-cache/app-emacs/auctex-12.2
 1804270439 metadata/md5-cache/app-emulation/bochs-2.6.9
 1805292338 metadata/md5-cache/app-emulation/coldfire-0.3.1
 1909190709 metadata/md5-cache/app-emulation/cri-o-1.15.1
@@ -34734,7 +34762,6 @@
 2005260027 metadata/md5-cache/app-emulation/crossover-bin-18.1.0
 2005260027 metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
 2005260027 metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
-2005260027 metadata/md5-cache/app-emulation/crun-0.10.6
 2005260027 metadata/md5-cache/app-emulation/dinero-4.7-r1
 2005260027 metadata/md5-cache/app-emulation/dlx-1.5.20
 2005260027 metadata/md5-cache/app-emulation/docker-19.03.8
@@ -34748,11 +34775,6 @@
 2005260027 metadata/md5-cache/app-emulation/faudio-19.09
 2005260027 metadata/md5-cache/app-emulation/faudio-20.02
 2005260027 metadata/md5-cache/app-emulation/faudio-9999
-2005260027 metadata/md5-cache/app-emulation/firecracker-0.18.0
-2005260027 metadata/md5-cache/app-emulation/firecracker-0.18.1
-2005260027 metadata/md5-cache/app-emulation/firecracker-0.19.0
-2005260027 metadata/md5-cache/app-emulation/firecracker-0.19.1
-2005260027 metadata/md5-cache/app-emulation/firecracker-0.21.1
 2005260027 metadata/md5-cache/app-emulation/flannel-0.11.0
 2005260027 metadata/md5-cache/app-emulation/free42-2.0.20
 2005260027 metadata/md5-cache/app-emulation/free42-2.5.14
@@ -34791,10 +34813,6 @@
 2005260027 metadata/md5-cache/app-emulation/lxc-templates-3.0.4
 2005260027 metadata/md5-cache/app-emulation/lxd-3.14
 2005260027 metadata/md5-cache/app-emulation/lxd-4.0.1
-2005260027 metadata/md5-cache/app-emulation/nemu-2.1.0
-2005260027 metadata/md5-cache/app-emulation/nemu-2.2.0
-2005260027 metadata/md5-cache/app-emulation/nemu-2.2.1
-2005260027 metadata/md5-cache/app-emulation/nemu-9999
 2005260027 metadata/md5-cache/app-emulation/open-vm-tools-11.0.1-r1
 2005260027 metadata/md5-cache/app-emulation/open-vm-tools-11.1.0
 2005260027 metadata/md5-cache/app-emulation/pcem-16
@@ -34834,8 +34852,6 @@
 2005260027 metadata/md5-cache/app-emulation/virt-viewer-7.0
 2005260027 metadata/md5-cache/app-emulation/virt-viewer-8.0
 2005260027 metadata/md5-cache/app-emulation/virtualbox-5.2.40
-2005260027 metadata/md5-cache/app-emulation/virtualbox-6.0.20
-2005260027 metadata/md5-cache/app-emulation/virtualbox-6.1.6
 2005260027 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.40.137108
 2005260027 metadata/md5-cache/app-emulation/virtualbox-bin-6.0.20.137117
 2005260027 metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129
@@ -34881,7 +34897,6 @@
 2005271839 metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
 2005281909 metadata/md5-cache/app-emulation/simh-3.11.1
 2005291209 metadata/md5-cache/app-emulation/bochs-9999
-2006010910 metadata/md5-cache/app-emulation/Manifest.gz
 2006010910 metadata/md5-cache/app-emulation/cloud-init-19.4
 2006010910 metadata/md5-cache/app-emulation/cloud-init-20.1
 2006010910 metadata/md5-cache/app-emulation/cloud-init-9999
@@ -34899,6 +34914,20 @@
 2006010910 metadata/md5-cache/app-emulation/sen-0.6.1
 2006010910 metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
 2006010910 metadata/md5-cache/app-emulation/virt-manager-9999
+2006041039 metadata/md5-cache/app-emulation/Manifest.gz
+2006021438 metadata/md5-cache/app-emulation/crun-0.13
+2006022109 metadata/md5-cache/app-emulation/diskimage-builder-3.0.0
+2006032009 metadata/md5-cache/app-emulation/docker-compose-1.26.0
+2006021209 metadata/md5-cache/app-emulation/firecracker-0.18.0
+2006021209 metadata/md5-cache/app-emulation/firecracker-0.18.1
+2006021209 metadata/md5-cache/app-emulation/firecracker-0.19.0
+2006021209 metadata/md5-cache/app-emulation/firecracker-0.19.1
+2006021209 metadata/md5-cache/app-emulation/firecracker-0.21.1
+2006041039 metadata/md5-cache/app-emulation/nemu-2.2.1
+2006041039 metadata/md5-cache/app-emulation/nemu-9999
+2006030339 metadata/md5-cache/app-emulation/virtualbox-6.0.20
+2006030339 metadata/md5-cache/app-emulation/virtualbox-6.1.6
+2006040139 metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -34947,8 +34976,6 @@
 2005090609 metadata/md5-cache/app-eselect/eselect-iptables-20200508
 2005170009 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2005171709 metadata/md5-cache/app-eselect/eselect-sh-0.4.1
-2005200938 metadata/md5-cache/app-eselect/eselect-blas-0.2
-2005260027 metadata/md5-cache/app-eselect/Manifest.gz
 2005260027 metadata/md5-cache/app-eselect/eselect-java-0.4.0
 2005260027 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-9999
 2005260027 metadata/md5-cache/app-eselect/eselect-metasploit-0.16
@@ -34963,6 +34990,8 @@
 2005260027 metadata/md5-cache/app-eselect/eselect-repository-7
 2005260027 metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
 2005260027 metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
+2006012309 metadata/md5-cache/app-eselect/Manifest.gz
+2006012309 metadata/md5-cache/app-eselect/eselect-blas-0.2
 1905191439 metadata/md5-cache/app-forensics/air-2.0.0-r2
 1908021439 metadata/md5-cache/app-forensics/libewf-20171104
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
@@ -35100,7 +35129,6 @@
 2005260027 metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
 2005260027 metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
 2005260027 metadata/md5-cache/app-i18n/ibus-1.5.21-r1
-2005260027 metadata/md5-cache/app-i18n/ibus-1.5.22
 2005260027 metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
 2005260027 metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
 2005260027 metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
@@ -35184,10 +35212,12 @@
 2005271539 metadata/md5-cache/app-i18n/fbterm-1.7_p20190503
 2005271609 metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.0
 2005291739 metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92
-2006010910 metadata/md5-cache/app-i18n/Manifest.gz
 2006010910 metadata/md5-cache/app-i18n/nkf-2.1.4
 2006010910 metadata/md5-cache/app-i18n/nkf-2.1.5
 2006010910 metadata/md5-cache/app-i18n/transifex-client-0.13.9
+2006031839 metadata/md5-cache/app-i18n/Manifest.gz
+2006031839 metadata/md5-cache/app-i18n/ibus-1.5.22
+2006031309 metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2005260027 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2005260027 metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -35418,27 +35448,18 @@
 2004032241 metadata/md5-cache/app-misc/livecd-tools-2.6
 2004032241 metadata/md5-cache/app-misc/mencal-3.0
 2004032241 metadata/md5-cache/app-misc/screenie-1.30.0-r1
-2004041909 metadata/md5-cache/app-misc/rpick-0.5.0
-2004041909 metadata/md5-cache/app-misc/skim-0.6.9
-2004041909 metadata/md5-cache/app-misc/skim-0.7.0
-2004042239 metadata/md5-cache/app-misc/skim-0.8.1
 2004060039 metadata/md5-cache/app-misc/rtlamr-0.9.1
 2004211009 metadata/md5-cache/app-misc/c_rehash-1.7-r1
 2004211009 metadata/md5-cache/app-misc/editor-wrapper-4-r1
 2004211009 metadata/md5-cache/app-misc/mime-types-9
 2005022139 metadata/md5-cache/app-misc/mkcert-1.4.1
-2005061039 metadata/md5-cache/app-misc/rpick-0.5.1
-2005090009 metadata/md5-cache/app-misc/cargo-license-0.3.0
 2005071239 metadata/md5-cache/app-misc/colordiff-1.0.19
 2005102109 metadata/md5-cache/app-misc/faq-0.0.6
 2005100128 metadata/md5-cache/app-misc/pet-0.3.6
 2005120239 metadata/md5-cache/app-misc/go-jira-1.0.23
 2005131139 metadata/md5-cache/app-misc/geneweb-6.08.01
-2005131709 metadata/md5-cache/app-misc/rpick-0.6.1
 2005160239 metadata/md5-cache/app-misc/spire-0.10.0
 2005221639 metadata/md5-cache/app-misc/hatools-2.14
-2005260027 metadata/md5-cache/app-misc/abduco-0.5
-2005260027 metadata/md5-cache/app-misc/abduco-0.6
 2005260027 metadata/md5-cache/app-misc/abook-0.6.1
 2005260027 metadata/md5-cache/app-misc/actkbd-0.2.8-r2
 2005260027 metadata/md5-cache/app-misc/anki-2.1.0_beta27
@@ -35509,10 +35530,6 @@
 2005260027 metadata/md5-cache/app-misc/digitemp-3.7.1
 2005260027 metadata/md5-cache/app-misc/dvorak7min-1.6.1
 2005260027 metadata/md5-cache/app-misc/dvorakng-0.6.0
-2005260027 metadata/md5-cache/app-misc/dvtm-0.14-r1
-2005260027 metadata/md5-cache/app-misc/dvtm-0.15-r2
-2005260027 metadata/md5-cache/app-misc/dvtm-0.15-r3
-2005260027 metadata/md5-cache/app-misc/dvtm-9999
 2005260027 metadata/md5-cache/app-misc/egads-0.9.5-r1
 2005260027 metadata/md5-cache/app-misc/elasticsearch-5.6.16
 2005260027 metadata/md5-cache/app-misc/elasticsearch-6.8.8
@@ -35569,7 +35586,6 @@
 2005260027 metadata/md5-cache/app-misc/hilite-1.5-r1
 2005260027 metadata/md5-cache/app-misc/hivex-1.3.14
 2005260027 metadata/md5-cache/app-misc/hodie-1.5
-2005260027 metadata/md5-cache/app-misc/i2bits-0.1.0
 2005260027 metadata/md5-cache/app-misc/ignuit-2.24.3
 2005260027 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
 2005260027 metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
@@ -35591,8 +35607,6 @@
 2005260027 metadata/md5-cache/app-misc/linux-logo-5.11-r5
 2005260027 metadata/md5-cache/app-misc/linux-logo-6.0
 2005260027 metadata/md5-cache/app-misc/linuxspa-0.7.1-r2
-2005260027 metadata/md5-cache/app-misc/lirc-0.10.1-r3
-2005260027 metadata/md5-cache/app-misc/lirc-0.10.1-r4
 2005260027 metadata/md5-cache/app-misc/lockfile-progs-0.1.17
 2005260027 metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
 2005260027 metadata/md5-cache/app-misc/logserial-0.4.2
@@ -35668,7 +35682,6 @@
 2005260027 metadata/md5-cache/app-misc/scope-0.04-r1
 2005260027 metadata/md5-cache/app-misc/screen-4.8.0
 2005260027 metadata/md5-cache/app-misc/screen-9999
-2005260027 metadata/md5-cache/app-misc/sl-5.02
 2005260027 metadata/md5-cache/app-misc/slmon-0.5.13
 2005260027 metadata/md5-cache/app-misc/smtm-1.6.10-r1
 2005260027 metadata/md5-cache/app-misc/socnetv-2.2
@@ -35708,7 +35721,6 @@
 2005260027 metadata/md5-cache/app-misc/tracker-miners-2.2.2
 2005260027 metadata/md5-cache/app-misc/tracker-miners-2.3.3
 2005260027 metadata/md5-cache/app-misc/transfolio-1.0.1-r1
-2005260027 metadata/md5-cache/app-misc/ttyload-0.5.3
 2005260027 metadata/md5-cache/app-misc/ttyrec-1.0.8-r2
 2005260027 metadata/md5-cache/app-misc/ttysnoop-0.12d
 2005260027 metadata/md5-cache/app-misc/uptimed-0.4.1-r1
@@ -35736,10 +35748,8 @@
 2005260027 metadata/md5-cache/app-misc/ytree-2.02
 2005260027 metadata/md5-cache/app-misc/zisofs-tools-1.0.8
 2005260027 metadata/md5-cache/app-misc/zygrib-8.0.1-r1
-2005281909 metadata/md5-cache/app-misc/abook-0.6.1-r2
 2005281909 metadata/md5-cache/app-misc/nnn-3.2
 2005291209 metadata/md5-cache/app-misc/g15daemon-9999
-2006010910 metadata/md5-cache/app-misc/Manifest.gz
 2006010910 metadata/md5-cache/app-misc/asciinema-2.0.2
 2006010910 metadata/md5-cache/app-misc/binwalk-2.1.1
 2006010910 metadata/md5-cache/app-misc/binwalk-2.2.0
@@ -35780,6 +35790,29 @@
 2006010910 metadata/md5-cache/app-misc/yq-2.8.0
 2006010910 metadata/md5-cache/app-misc/yq-2.9.2
 2006010910 metadata/md5-cache/app-misc/yq-2.9.2-r1
+2006041239 metadata/md5-cache/app-misc/Manifest.gz
+2006041239 metadata/md5-cache/app-misc/abduco-0.5
+2006041239 metadata/md5-cache/app-misc/abduco-0.6
+2006040939 metadata/md5-cache/app-misc/abook-0.6.1-r2
+2006020209 metadata/md5-cache/app-misc/ca-certificates-20190110.3.53
+2006022038 metadata/md5-cache/app-misc/ca-certificates-20200601.3.53
+2006021209 metadata/md5-cache/app-misc/cargo-license-0.3.0
+2006041239 metadata/md5-cache/app-misc/dvtm-0.14-r1
+2006041239 metadata/md5-cache/app-misc/dvtm-0.15-r2
+2006041239 metadata/md5-cache/app-misc/dvtm-0.15-r3
+2006041239 metadata/md5-cache/app-misc/dvtm-9999
+2006030139 metadata/md5-cache/app-misc/gnote-3.36.1
+2006040009 metadata/md5-cache/app-misc/i2bits-0.1.0
+2006041239 metadata/md5-cache/app-misc/lirc-0.10.1-r3
+2006041239 metadata/md5-cache/app-misc/lirc-0.10.1-r4
+2006021209 metadata/md5-cache/app-misc/rpick-0.5.0
+2006021209 metadata/md5-cache/app-misc/rpick-0.5.1
+2006021209 metadata/md5-cache/app-misc/rpick-0.6.1
+2006021209 metadata/md5-cache/app-misc/skim-0.6.9
+2006021209 metadata/md5-cache/app-misc/skim-0.7.0
+2006021209 metadata/md5-cache/app-misc/skim-0.8.1
+2006040009 metadata/md5-cache/app-misc/sl-5.02
+2006040009 metadata/md5-cache/app-misc/ttyload-0.5.3
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -35875,7 +35908,6 @@
 2005280039 metadata/md5-cache/app-office/kmymoney-5.0.8-r1
 2005291209 metadata/md5-cache/app-office/scribus-9999
 2005301239 metadata/md5-cache/app-office/scribus-1.5.5-r1
-2006010910 metadata/md5-cache/app-office/Manifest.gz
 2006010910 metadata/md5-cache/app-office/gtg-0.3.1
 2005311909 metadata/md5-cache/app-office/libreoffice-6.4.3.2
 2005311909 metadata/md5-cache/app-office/libreoffice-bin-6.4.3.2
@@ -35883,16 +35915,18 @@
 2005311909 metadata/md5-cache/app-office/libreoffice-l10n-6.4.3.2
 2006010910 metadata/md5-cache/app-office/taskcoach-1.4.6
 2005311609 metadata/md5-cache/app-office/wps-office-11.1.0.9505
+2006032039 metadata/md5-cache/app-office/Manifest.gz
+2006032039 metadata/md5-cache/app-office/texstudio-3.0.0_pre20200601
 2004020339 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2004020339 metadata/md5-cache/app-officeext/ooofbtools-2.56
 2004020339 metadata/md5-cache/app-officeext/texmaths-0.48
-2005260027 metadata/md5-cache/app-officeext/Manifest.gz
-2005260027 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
-2005260027 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
 2005260027 metadata/md5-cache/app-officeext/languagetool-3.4
 2005260027 metadata/md5-cache/app-officeext/languagetool-3.5
 2005260027 metadata/md5-cache/app-officeext/ooo2gd-3.0.0-r1
 2005260027 metadata/md5-cache/app-officeext/sun-templates-1.0.0-r1
+2006041239 metadata/md5-cache/app-officeext/Manifest.gz
+2006041239 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
+2006041239 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
 1902181039 metadata/md5-cache/app-pda/ideviceinstaller-1.1.0
 1808151104 metadata/md5-cache/app-pda/ifuse-1.1.3
 1911201439 metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
@@ -36058,7 +36092,6 @@
 2004032241 metadata/md5-cache/app-shells/gentoo-zsh-completions-20180228
 2004032241 metadata/md5-cache/app-shells/gentoo-zsh-completions-99999999
 2004032241 metadata/md5-cache/app-shells/push-2.0-r1
-2004041909 metadata/md5-cache/app-shells/mcfly-0.3.6
 2005031640 metadata/md5-cache/app-shells/bashdb-5.0.1.1.0
 2005120109 metadata/md5-cache/app-shells/peco-0.5.7
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
@@ -36081,7 +36114,6 @@
 2005260027 metadata/md5-cache/app-shells/ccsh-0.0.4-r4
 2005260027 metadata/md5-cache/app-shells/ctypes-sh-1.1
 2005260027 metadata/md5-cache/app-shells/dash-0.5.10.2-r1
-2005260027 metadata/md5-cache/app-shells/dash-0.5.9.1-r3
 2005260027 metadata/md5-cache/app-shells/esh-0.8.5-r2
 2005260027 metadata/md5-cache/app-shells/fish-3.0.2
 2005260027 metadata/md5-cache/app-shells/fish-3.1.0
@@ -36130,12 +36162,14 @@
 2005260027 metadata/md5-cache/app-shells/yash-2.49
 2005260027 metadata/md5-cache/app-shells/zsh-5.8
 2005260027 metadata/md5-cache/app-shells/zsh-9999
-2006010910 metadata/md5-cache/app-shells/Manifest.gz
 2005302239 metadata/md5-cache/app-shells/bash-5.0_p17
-2006010910 metadata/md5-cache/app-shells/powerline-2.7
 2006010910 metadata/md5-cache/app-shells/powerline-9999
 2006010910 metadata/md5-cache/app-shells/thefuck-3.27
 2006010910 metadata/md5-cache/app-shells/thefuck-3.28
+2006021209 metadata/md5-cache/app-shells/Manifest.gz
+2006021209 metadata/md5-cache/app-shells/dash-0.5.11
+2006021209 metadata/md5-cache/app-shells/mcfly-0.3.6
+2006012309 metadata/md5-cache/app-shells/powerline-2.7-r1
 1801051609 metadata/md5-cache/app-text/antixls-0.3b
 1911091509 metadata/md5-cache/app-text/binfind-0.0.3
 1803271139 metadata/md5-cache/app-text/convmv-2.05
@@ -36214,7 +36248,6 @@
 2004032241 metadata/md5-cache/app-text/vlna-1.5
 2004032241 metadata/md5-cache/app-text/wdiff-1.2.2
 2004032241 metadata/md5-cache/app-text/xapian-omega-1.2.25
-2004041909 metadata/md5-cache/app-text/fblog-1.4.1
 2004051339 metadata/md5-cache/app-text/mythes-1.2.4
 2004050939 metadata/md5-cache/app-text/wgetpaste-2.29-r1
 2004121609 metadata/md5-cache/app-text/texlive-2019-r1
@@ -36280,12 +36313,7 @@
 2005260027 metadata/md5-cache/app-text/blogc-9999
 2005260027 metadata/md5-cache/app-text/bogosort-0.4.2-r1
 2005260027 metadata/md5-cache/app-text/c2ps-4.0
-2005260027 metadata/md5-cache/app-text/calibre-4.11.2
-2005260027 metadata/md5-cache/app-text/calibre-4.12.0
-2005260027 metadata/md5-cache/app-text/calibre-4.15.0
-2005260027 metadata/md5-cache/app-text/calibre-4.16.0
 2005270639 metadata/md5-cache/app-text/calibre-4.17.0-r1
-2005260027 metadata/md5-cache/app-text/calibre-4.9.1-r2
 2005260027 metadata/md5-cache/app-text/cb2bib-1.9.8
 2005260027 metadata/md5-cache/app-text/cb2bib-1.9.9
 2005260027 metadata/md5-cache/app-text/cb2bib-2.0.0
@@ -36351,7 +36379,6 @@
 2005260027 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.9
 2005260027 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0
 2005260027 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
-2005260027 metadata/md5-cache/app-text/grutatxt-2.0.16-r1
 2005260027 metadata/md5-cache/app-text/gspell-1.6.1
 2005260027 metadata/md5-cache/app-text/gspell-1.8.3
 2005260027 metadata/md5-cache/app-text/gtkspell-2.0.16
@@ -36391,9 +36418,6 @@
 2005260027 metadata/md5-cache/app-text/jabref-bin-4.3.1
 2005260027 metadata/md5-cache/app-text/jabref-bin-4.9999
 2005260027 metadata/md5-cache/app-text/jo-1.1
-2005260027 metadata/md5-cache/app-text/jo-1.3
-2005260027 metadata/md5-cache/app-text/jo-99999
-2005260027 metadata/md5-cache/app-text/kbibtex-0.9.1
 2005260027 metadata/md5-cache/app-text/kchmviewer-7.7-r1
 2005260027 metadata/md5-cache/app-text/kjots-5.0.2-r1
 2005260027 metadata/md5-cache/app-text/lcdf-typetools-2.106
@@ -36413,7 +36437,6 @@
 2005260027 metadata/md5-cache/app-text/libpaper-1.1.24_p5
 2005260027 metadata/md5-cache/app-text/libpaper-1.1.28
 2005260027 metadata/md5-cache/app-text/libspectre-0.2.8
-2005260027 metadata/md5-cache/app-text/libspectre-0.2.9
 2005260027 metadata/md5-cache/app-text/libstaroffice-9999
 2005260027 metadata/md5-cache/app-text/libxmlpatch-0.3.3
 2005260027 metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -36471,7 +36494,6 @@
 2005260027 metadata/md5-cache/app-text/pinfo-0.6.10-r7
 2005260027 metadata/md5-cache/app-text/pinfo-0.6.13
 2005260027 metadata/md5-cache/app-text/pinfo-99999
-2005260039 metadata/md5-cache/app-text/po4a-0.57
 2005260027 metadata/md5-cache/app-text/podofo-0.9.6_p20180715
 2005260027 metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
 2005260027 metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
@@ -36565,7 +36587,6 @@
 2005260027 metadata/md5-cache/app-text/xpdf-4.02-r4
 2005260027 metadata/md5-cache/app-text/yelp-tools-3.32.2
 2005260027 metadata/md5-cache/app-text/yodl-4.02.01
-2005260027 metadata/md5-cache/app-text/yodl-4.02.02
 2005260027 metadata/md5-cache/app-text/zathura-0.4.3
 2005260027 metadata/md5-cache/app-text/zathura-0.4.4
 2005260027 metadata/md5-cache/app-text/zathura-0.4.5
@@ -36587,9 +36608,7 @@
 2005282039 metadata/md5-cache/app-text/libqxp-0.0.2
 2005281209 metadata/md5-cache/app-text/poppler-0.89.0
 2005281209 metadata/md5-cache/app-text/poppler-9999
-2005291109 metadata/md5-cache/app-text/kbibtex-0.9.2
 2005301239 metadata/md5-cache/app-text/qpdfview-0.4.18
-2006010910 metadata/md5-cache/app-text/Manifest.gz
 2005312238 metadata/md5-cache/app-text/blogc-0.19.0
 2006010910 metadata/md5-cache/app-text/capyt-1.1.1
 2006010910 metadata/md5-cache/app-text/cherrytree-0.37.0-r1
@@ -36640,6 +36659,17 @@
 2006010910 metadata/md5-cache/app-text/xlsx2csv-0.7.6
 2006010910 metadata/md5-cache/app-text/xmldiff-1.1.1
 2006010910 metadata/md5-cache/app-text/xmldiff-2.3
+2006041239 metadata/md5-cache/app-text/Manifest.gz
+2006040209 metadata/md5-cache/app-text/calibre-4.9.1-r2
+2006021209 metadata/md5-cache/app-text/fblog-1.4.1
+2006041239 metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+2006040939 metadata/md5-cache/app-text/jo-1.3
+2006040939 metadata/md5-cache/app-text/jo-99999
+2006040939 metadata/md5-cache/app-text/kbibtex-0.9.2
+2006032209 metadata/md5-cache/app-text/libnumbertext-1.0.6
+2006032309 metadata/md5-cache/app-text/libspectre-0.2.9
+2006040939 metadata/md5-cache/app-text/po4a-0.57
+2006031239 metadata/md5-cache/app-text/yodl-4.02.02-r1
 1911262256 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1911262256 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 1911262256 metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -36883,9 +36913,10 @@
 2005260027 metadata/md5-cache/app-vim/vimpython-1.13-r2
 2005260027 metadata/md5-cache/app-vim/vimpython-1.13-r3
 2005260027 metadata/md5-cache/app-vim/voom-5.3-r1
-2006010910 metadata/md5-cache/app-vim/Manifest.gz
 2006010910 metadata/md5-cache/app-vim/pyclewn-2.1-r1
 2006010339 metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+2006022109 metadata/md5-cache/app-vim/Manifest.gz
+2006022109 metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
 1704032208 metadata/md5-cache/app-xemacs/dired-1.19
 1704032208 metadata/md5-cache/app-xemacs/easypg-1.02
 1704032208 metadata/md5-cache/app-xemacs/ediff-1.77
@@ -37242,8 +37273,6 @@
 1702282310 metadata/md5-cache/dev-cpp/pngpp-0.2.9
 1702282310 metadata/md5-cache/dev-cpp/random123-1.09-r1
 1808221139 metadata/md5-cache/dev-cpp/tclap-1.2.2
-1912110241 metadata/md5-cache/dev-cpp/asio-1.12.2
-1912110241 metadata/md5-cache/dev-cpp/asio-1.13.0
 2003311822 metadata/md5-cache/dev-cpp/sourcetrail-2019.2.39
 2003311822 metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46
 2003311822 metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
@@ -37343,11 +37372,12 @@
 2005260027 metadata/md5-cache/dev-cpp/waylandpp-9999
 2005260027 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
 2005260027 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r1
-2005260027 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r2
 2005282139 metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
-2005312238 metadata/md5-cache/dev-cpp/Manifest.gz
 2005312238 metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
 2005302239 metadata/md5-cache/dev-cpp/pangomm-2.42.1
+2006020409 metadata/md5-cache/dev-cpp/Manifest.gz
+2006020409 metadata/md5-cache/dev-cpp/asio-1.16.1
+2006012009 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r2
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1910170740 metadata/md5-cache/dev-db/innotop-1.11.1
 1910170740 metadata/md5-cache/dev-db/innotop-1.11.4
@@ -37497,10 +37527,8 @@
 2005260027 metadata/md5-cache/dev-db/mysql++-3.2.3-r1
 2005260027 metadata/md5-cache/dev-db/mysql++-3.2.4
 2005260027 metadata/md5-cache/dev-db/mysql++-3.2.5
-2005260027 metadata/md5-cache/dev-db/mysql-5.6.45-r2
 2005260027 metadata/md5-cache/dev-db/mysql-5.7.27-r1
 2005260027 metadata/md5-cache/dev-db/mysql-5.7.29
-2005260027 metadata/md5-cache/dev-db/mysql-5.7.30
 2005260027 metadata/md5-cache/dev-db/mysql-8.0.19-r1
 2005260027 metadata/md5-cache/dev-db/mysql-8.0.20
 2005260027 metadata/md5-cache/dev-db/mysql-cluster-7.2.34
@@ -37590,7 +37618,6 @@
 2005260027 metadata/md5-cache/dev-db/tinycdb-0.77-r2
 2005260027 metadata/md5-cache/dev-db/tokumx-1.5.0-r2
 2005260027 metadata/md5-cache/dev-db/tokumx-2.0.2-r2
-2005260027 metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
 2005260027 metadata/md5-cache/dev-db/tora-3.2-r1
 2005260027 metadata/md5-cache/dev-db/tora-9999
 2005260027 metadata/md5-cache/dev-db/unixODBC-2.3.7
@@ -37605,13 +37632,14 @@
 2006010910 metadata/md5-cache/dev-db/mycli-9999
 2006010910 metadata/md5-cache/dev-db/pg_activity-1.5.0
 2006010910 metadata/md5-cache/dev-db/pgcli-2.2.0
-2006010910 metadata/md5-cache/dev-db/pgxnclient-1.2-r1
-2006010910 metadata/md5-cache/dev-db/pgxnclient-1.2.1
 2005311309 metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11
 2005310739 metadata/md5-cache/dev-db/redis-6.0.4
 2006010910 metadata/md5-cache/dev-db/sadisplay-0.4.9
-2006011539 metadata/md5-cache/dev-db/Manifest.gz
 2006011539 metadata/md5-cache/dev-db/pgxnclient-1.3
+2006041239 metadata/md5-cache/dev-db/Manifest.gz
+2006020239 metadata/md5-cache/dev-db/mysql-5.6.45-r2
+2006020239 metadata/md5-cache/dev-db/mysql-5.7.30
+2006041239 metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2005260027 metadata/md5-cache/dev-dotnet/Manifest.gz
@@ -37858,7 +37886,8 @@
 2005271309 metadata/md5-cache/dev-games/aseprite-1.1.7-r1
 2005271309 metadata/md5-cache/dev-games/aseprite-1.1.9
 2005291109 metadata/md5-cache/dev-games/tiled-1.3.4
-2006011438 metadata/md5-cache/dev-games/Manifest.gz
+2006021508 metadata/md5-cache/dev-games/Manifest.gz
+2006021508 metadata/md5-cache/dev-games/tiled-1.3.5
 1902072239 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
 1902072239 metadata/md5-cache/dev-go/blackfriday-1.4
 1904271809 metadata/md5-cache/dev-go/go-bindata-1.0.0
@@ -40073,9 +40102,7 @@
 2005260027 metadata/md5-cache/dev-java/opencsv-2.3
 2005260027 metadata/md5-cache/dev-java/openjdk-11.0.7_p10
 2005260027 metadata/md5-cache/dev-java/openjdk-8.252_p09
-2005260027 metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10
 2005260027 metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
-2005260027 metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10
 2005260027 metadata/md5-cache/dev-java/openjdk-jre-bin-8.252_p09
 2005260027 metadata/md5-cache/dev-java/openjfx-11.0.7_p1
 2005260027 metadata/md5-cache/dev-java/oracle-javamail-1.5.2
@@ -40167,10 +40194,7 @@
 2005260027 metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
 2005260027 metadata/md5-cache/dev-java/swingx-ws-1.0-r1
 2005260027 metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
-2005260027 metadata/md5-cache/dev-java/swt-3.7.2-r2
-2005260027 metadata/md5-cache/dev-java/swt-3.8.2-r2
 2005260027 metadata/md5-cache/dev-java/swt-4.10
-2005260027 metadata/md5-cache/dev-java/swt-4.2-r3
 2005260027 metadata/md5-cache/dev-java/tablelayout-1.0
 2005260027 metadata/md5-cache/dev-java/tagsoup-1.2.1
 2005260027 metadata/md5-cache/dev-java/tapestry-3.0.4-r3
@@ -40182,8 +40206,6 @@
 2005260027 metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
 2005260027 metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
 2005260027 metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
-2005260027 metadata/md5-cache/dev-java/tomcat-native-1.2.23
-2005260027 metadata/md5-cache/dev-java/tomcat-native-1.2.24
 2005260027 metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
 2005260027 metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
 2005260027 metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
@@ -40242,12 +40264,18 @@
 2005260027 metadata/md5-cache/dev-java/xz-java-1.8
 2005260027 metadata/md5-cache/dev-java/yanfs-1.0
 2005260027 metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
-2006010910 metadata/md5-cache/dev-java/Manifest.gz
 2006010910 metadata/md5-cache/dev-java/java-config-2.2.0-r4
 2006010910 metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
 2006010910 metadata/md5-cache/dev-java/javatoolkit-0.6.1
 2006010910 metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
 2006010910 metadata/md5-cache/dev-java/javatoolkit-9999
+2006041209 metadata/md5-cache/dev-java/Manifest.gz
+2006020109 metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1
+2006020138 metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.7_p10-r1
+2006041209 metadata/md5-cache/dev-java/swt-3.7.2-r3
+2006041209 metadata/md5-cache/dev-java/swt-3.8.2-r3
+2006041209 metadata/md5-cache/dev-java/swt-4.2-r4
+2006031839 metadata/md5-cache/dev-java/tomcat-native-1.2.24
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1702282312 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 1904131209 metadata/md5-cache/dev-lang/duktape-2.2.1
@@ -40361,8 +40389,6 @@
 2005260027 metadata/md5-cache/dev-lang/lfe-1.0
 2005260027 metadata/md5-cache/dev-lang/lfe-1.1.1
 2005260027 metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
-2005260027 metadata/md5-cache/dev-lang/logtalk-3.18.0
-2005260027 metadata/md5-cache/dev-lang/logtalk-3.36.0
 2005260027 metadata/md5-cache/dev-lang/lua-5.1.5-r100
 2005260027 metadata/md5-cache/dev-lang/lua-5.1.5-r101
 2005260027 metadata/md5-cache/dev-lang/lua-5.1.5-r102
@@ -40391,7 +40417,6 @@
 2005260027 metadata/md5-cache/dev-lang/mercury-extras-14.01.1
 2005260027 metadata/md5-cache/dev-lang/mercury-extras-20.01
 2005260027 metadata/md5-cache/dev-lang/mercury-extras-20.01.1
-2005260027 metadata/md5-cache/dev-lang/micropython-1.11
 2005260027 metadata/md5-cache/dev-lang/mlton-20130715
 2005260027 metadata/md5-cache/dev-lang/mlton-20180207
 2005260027 metadata/md5-cache/dev-lang/mmix-20160804-r1
@@ -40488,10 +40513,6 @@
 2005260027 metadata/md5-cache/dev-lang/spidermonkey-68.8.0
 2005260027 metadata/md5-cache/dev-lang/squirrel-3.1
 2005260027 metadata/md5-cache/dev-lang/srf-1.0-r2
-2005260027 metadata/md5-cache/dev-lang/swi-prolog-8.0.3
-2005260027 metadata/md5-cache/dev-lang/swi-prolog-8.1.29
-2005260027 metadata/md5-cache/dev-lang/swi-prolog-8.1.30
-2005260027 metadata/md5-cache/dev-lang/swi-prolog-8.1.31
 2005262139 metadata/md5-cache/dev-lang/swi-prolog-8.1.32
 2005260027 metadata/md5-cache/dev-lang/swig-4.0.0
 2005260027 metadata/md5-cache/dev-lang/tcc-0.9.27
@@ -40510,12 +40531,7 @@
 2005260027 metadata/md5-cache/dev-lang/tuprolog-3.1.0
 2005260027 metadata/md5-cache/dev-lang/vala-0.36.20
 2005260027 metadata/md5-cache/dev-lang/vala-0.40.18
-2005260027 metadata/md5-cache/dev-lang/vala-0.40.20
-2005260027 metadata/md5-cache/dev-lang/vala-0.40.22
 2005260027 metadata/md5-cache/dev-lang/vala-0.44.11
-2005260027 metadata/md5-cache/dev-lang/vala-0.46.7
-2005260027 metadata/md5-cache/dev-lang/vala-0.46.9
-2005260027 metadata/md5-cache/dev-lang/vala-0.48.5
 2005260027 metadata/md5-cache/dev-lang/whitespace-0.3
 2005260027 metadata/md5-cache/dev-lang/whitespace-0.4
 2005260027 metadata/md5-cache/dev-lang/xsb-3.6.0
@@ -40540,7 +40556,6 @@
 2005281509 metadata/md5-cache/dev-lang/zig-0.4.0-r1
 2005281509 metadata/md5-cache/dev-lang/zig-0.5.0
 2005281509 metadata/md5-cache/dev-lang/zig-9999
-2006010910 metadata/md5-cache/dev-lang/Manifest.gz
 2006010910 metadata/md5-cache/dev-lang/hy-0.14.0
 2006010910 metadata/md5-cache/dev-lang/hy-0.15.0
 2006010910 metadata/md5-cache/dev-lang/hy-0.16.0
@@ -40548,6 +40563,20 @@
 2006010910 metadata/md5-cache/dev-lang/jsonnet-0.15.0
 2006010910 metadata/md5-cache/dev-lang/jsonnet-0.16.0
 2005311339 metadata/md5-cache/dev-lang/rust-1.41.1
+2006041239 metadata/md5-cache/dev-lang/Manifest.gz
+2006041239 metadata/md5-cache/dev-lang/logtalk-3.18.0
+2006041239 metadata/md5-cache/dev-lang/logtalk-3.36.0
+2006041008 metadata/md5-cache/dev-lang/micropython-1.11
+2006012338 metadata/md5-cache/dev-lang/perl-5.30.3
+2006041239 metadata/md5-cache/dev-lang/swi-prolog-8.0.3
+2006041239 metadata/md5-cache/dev-lang/swi-prolog-8.1.29
+2006041239 metadata/md5-cache/dev-lang/swi-prolog-8.1.30
+2006041239 metadata/md5-cache/dev-lang/swi-prolog-8.1.31
+2006031839 metadata/md5-cache/dev-lang/vala-0.40.20
+2006030109 metadata/md5-cache/dev-lang/vala-0.40.23
+2006030109 metadata/md5-cache/dev-lang/vala-0.46.10
+2006031839 metadata/md5-cache/dev-lang/vala-0.46.7
+2006030109 metadata/md5-cache/dev-lang/vala-0.48.6
 1708300939 metadata/md5-cache/dev-libs/bcm2835-1.52
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.6.0
@@ -40576,7 +40605,6 @@
 1811111739 metadata/md5-cache/dev-libs/libunibreak-4.1
 1906041809 metadata/md5-cache/dev-libs/libuninum-2.7
 1702282313 metadata/md5-cache/dev-libs/libusbhp-1.0.2
-1805291308 metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
 1810090339 metadata/md5-cache/dev-libs/skalibs-2.7.0.0
 1906221109 metadata/md5-cache/dev-libs/skalibs-2.8.1.0
 1901030109 metadata/md5-cache/dev-libs/stb-20180211
@@ -40653,8 +40681,6 @@
 2004142009 metadata/md5-cache/dev-libs/vala-common-0.44.11
 2004202009 metadata/md5-cache/dev-libs/wayland-protocols-1.20
 2004211009 metadata/md5-cache/dev-libs/liblzw-0.2-r1
-2004242339 metadata/md5-cache/dev-libs/vala-common-0.46.9
-2004242339 metadata/md5-cache/dev-libs/vala-common-0.48.5
 2004260509 metadata/md5-cache/dev-libs/gobject-introspection-common-1.64.1
 2005011639 metadata/md5-cache/dev-libs/userspace-rcu-0.12.1
 2005060009 metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
@@ -40662,8 +40688,6 @@
 2005102009 metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.30300.0
 2005112009 metadata/md5-cache/dev-libs/bemenu-0.4.1
 2005112009 metadata/md5-cache/dev-libs/bemenu-9999
-2005132039 metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
-2005132039 metadata/md5-cache/dev-libs/vala-common-0.46.7
 2005150039 metadata/md5-cache/dev-libs/pcl-1.12-r1
 2005172009 metadata/md5-cache/dev-libs/mathjax-2.7.7
 2005182138 metadata/md5-cache/dev-libs/libburn-1.5.2_p1
@@ -40683,8 +40707,6 @@
 2005260027 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
 2005260027 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
 2005260027 metadata/md5-cache/dev-libs/angelscript-2.34.0
-2005260027 metadata/md5-cache/dev-libs/antlr-c-3.5.2
-2005260027 metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
 2005260027 metadata/md5-cache/dev-libs/appstream-0.12.10
 2005260027 metadata/md5-cache/dev-libs/appstream-0.12.11
 2005260027 metadata/md5-cache/dev-libs/appstream-0.12.7
@@ -40696,7 +40718,6 @@
 2005260027 metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
 2005260027 metadata/md5-cache/dev-libs/atcore-1.0.0
 2005260027 metadata/md5-cache/dev-libs/atk-2.32.0
-2005260027 metadata/md5-cache/dev-libs/atk-2.34.1
 2005260027 metadata/md5-cache/dev-libs/atk-2.35.1
 2005260027 metadata/md5-cache/dev-libs/atk-2.36.0
 2005260027 metadata/md5-cache/dev-libs/avro-c-1.9.1
@@ -40727,7 +40748,6 @@
 2005260027 metadata/md5-cache/dev-libs/capnproto-0.7.0
 2005260027 metadata/md5-cache/dev-libs/cereal-1.2.1
 2005260027 metadata/md5-cache/dev-libs/cereal-1.2.2
-2005260027 metadata/md5-cache/dev-libs/cgilib-0.7-r1
 2005260027 metadata/md5-cache/dev-libs/cl-1.2.3
 2005260027 metadata/md5-cache/dev-libs/cl-1.2.4
 2005260027 metadata/md5-cache/dev-libs/cl-9999
@@ -40771,7 +40791,6 @@
 2005260027 metadata/md5-cache/dev-libs/ding-libs-0.6.1
 2005260027 metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
 2005260027 metadata/md5-cache/dev-libs/dotconf-1.3-r1
-2005260027 metadata/md5-cache/dev-libs/double-conversion-3.1.5
 2005260027 metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
 2005260027 metadata/md5-cache/dev-libs/efl-1.23.3
 2005260027 metadata/md5-cache/dev-libs/efl-1.24.2
@@ -40786,15 +40805,12 @@
 2005260027 metadata/md5-cache/dev-libs/fddl-20111124-r1
 2005260027 metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
 2005260027 metadata/md5-cache/dev-libs/ffcall-2.1
-2005260027 metadata/md5-cache/dev-libs/flatbuffers-1.12.0
 2005260027 metadata/md5-cache/dev-libs/folks-0.13.1
 2005260027 metadata/md5-cache/dev-libs/foma-0.9.18
 2005260027 metadata/md5-cache/dev-libs/freexl-1.0.1
 2005260027 metadata/md5-cache/dev-libs/freexl-1.0.2
 2005260027 metadata/md5-cache/dev-libs/fribidi-1.0.8
-2005260027 metadata/md5-cache/dev-libs/fribidi-1.0.9
 2005260027 metadata/md5-cache/dev-libs/fstrm-0.3.0
-2005260027 metadata/md5-cache/dev-libs/gdl-3.28.0
 2005260027 metadata/md5-cache/dev-libs/geoip-1.6.10
 2005260027 metadata/md5-cache/dev-libs/geoip-1.6.11
 2005260027 metadata/md5-cache/dev-libs/geoip-1.6.12
@@ -40811,7 +40827,6 @@
 2005260027 metadata/md5-cache/dev-libs/gjs-1.58.6
 2005260027 metadata/md5-cache/dev-libs/gjs-1.58.7
 2005260027 metadata/md5-cache/dev-libs/glib-2.60.7-r2
-2005260027 metadata/md5-cache/dev-libs/glib-2.62.6
 2005260027 metadata/md5-cache/dev-libs/glib-2.64.3
 2005260027 metadata/md5-cache/dev-libs/gmime-2.6.23-r1
 2005260027 metadata/md5-cache/dev-libs/gmime-3.2.5
@@ -40821,7 +40836,6 @@
 2005260027 metadata/md5-cache/dev-libs/go-fuse-0_p20150422
 2005260027 metadata/md5-cache/dev-libs/go-usb-9999
 2005260027 metadata/md5-cache/dev-libs/gobject-introspection-1.60.2-r1
-2005260027 metadata/md5-cache/dev-libs/gobject-introspection-1.62.0
 2005260027 metadata/md5-cache/dev-libs/gobject-introspection-1.64.0
 2005260027 metadata/md5-cache/dev-libs/gobject-introspection-1.64.1
 2005260027 metadata/md5-cache/dev-libs/gom-0.4
@@ -40877,7 +40891,6 @@
 2005260027 metadata/md5-cache/dev-libs/jsoncpp-1.9.1
 2005260027 metadata/md5-cache/dev-libs/jsoncpp-1.9.3_pre20200412
 2005260027 metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0
-2005260027 metadata/md5-cache/dev-libs/jthread-1.3.3
 2005260027 metadata/md5-cache/dev-libs/judy-1.0.5-r2
 2005260027 metadata/md5-cache/dev-libs/kasync-0.3.0
 2005260027 metadata/md5-cache/dev-libs/kdiagram-2.6.3
@@ -41020,10 +41033,8 @@
 2005260027 metadata/md5-cache/dev-libs/libgee-0.6.8
 2005260027 metadata/md5-cache/dev-libs/libgit2-0.28.4
 2005260027 metadata/md5-cache/dev-libs/libgit2-0.28.5
-2005260027 metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
 2005260027 metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
 2005260027 metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1-r1
-2005260027 metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r1
 2005260027 metadata/md5-cache/dev-libs/libgnome-games-support-1.4.4
 2005260027 metadata/md5-cache/dev-libs/libgpg-error-1.36
 2005260027 metadata/md5-cache/dev-libs/libgpg-error-1.37
@@ -41068,7 +41079,6 @@
 2005260027 metadata/md5-cache/dev-libs/libmba-0.9.1-r3
 2005260027 metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
 2005260027 metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
-2005260027 metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
 2005260027 metadata/md5-cache/dev-libs/libmirage-3.2.4
 2005260027 metadata/md5-cache/dev-libs/libmissing-1.1.0
 2005260027 metadata/md5-cache/dev-libs/libmix-2.05-r7
@@ -41164,13 +41174,10 @@
 2005260027 metadata/md5-cache/dev-libs/libtermkey-0.20
 2005260027 metadata/md5-cache/dev-libs/libtermkey-0.22
 2005260027 metadata/md5-cache/dev-libs/libtomfloat-0.02-r1
-2005260027 metadata/md5-cache/dev-libs/libtommath-1.1.0
 2005260027 metadata/md5-cache/dev-libs/libtompoly-0.04-r1
 2005260027 metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
 2005260027 metadata/md5-cache/dev-libs/libtsm-4.0.1
 2005260027 metadata/md5-cache/dev-libs/libtubo-5.0.15
-2005260027 metadata/md5-cache/dev-libs/libudfread-1.0.0
-2005260027 metadata/md5-cache/dev-libs/libudfread-9999
 2005260027 metadata/md5-cache/dev-libs/libugpio-0.0.6
 2005260027 metadata/md5-cache/dev-libs/libunique-1.1.6-r2
 2005260027 metadata/md5-cache/dev-libs/libunique-3.0.2-r1
@@ -41335,7 +41342,6 @@
 2005260027 metadata/md5-cache/dev-libs/pugixml-1.9
 2005260027 metadata/md5-cache/dev-libs/pugixml-1.9-r1
 2005260027 metadata/md5-cache/dev-libs/pugixml-9999
-2005260027 metadata/md5-cache/dev-libs/qcustomplot-2.0.0
 2005260027 metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
 2005260027 metadata/md5-cache/dev-libs/qqwing-1.3.3
 2005260027 metadata/md5-cache/dev-libs/qqwing-1.3.4
@@ -41354,7 +41360,6 @@
 2005260027 metadata/md5-cache/dev-libs/rasqal-0.9.33
 2005260027 metadata/md5-cache/dev-libs/re2-0.2019.12.01
 2005260027 metadata/md5-cache/dev-libs/re2-0.2020.04.01
-2005260027 metadata/md5-cache/dev-libs/re2-0.2020.05.01
 2005260027 metadata/md5-cache/dev-libs/redland-1.0.17-r2
 2005260027 metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
 2005260027 metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1
@@ -41396,8 +41401,6 @@
 2005260027 metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
 2005260027 metadata/md5-cache/dev-libs/sord-0.16.0-r1
 2005260027 metadata/md5-cache/dev-libs/sord-0.16.4
-2005260027 metadata/md5-cache/dev-libs/spdlog-1.5.0
-2005260027 metadata/md5-cache/dev-libs/spdlog-9999
 2005260027 metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
 2005260027 metadata/md5-cache/dev-libs/squareball-0.2.0
 2005260027 metadata/md5-cache/dev-libs/squareball-9999
@@ -41450,9 +41453,6 @@
 2005260027 metadata/md5-cache/dev-libs/utfcpp-9999
 2005260027 metadata/md5-cache/dev-libs/uthash-2.0.2
 2005260027 metadata/md5-cache/dev-libs/uulib-0.5.20-r1
-2005260027 metadata/md5-cache/dev-libs/vc-1.3.0
-2005260027 metadata/md5-cache/dev-libs/vc-1.3.3
-2005260027 metadata/md5-cache/dev-libs/vc-1.4.1
 2005260027 metadata/md5-cache/dev-libs/voikko-fi-2.3
 2005260027 metadata/md5-cache/dev-libs/volume_key-0.3.11
 2005260027 metadata/md5-cache/dev-libs/volume_key-0.3.12
@@ -41470,9 +41470,6 @@
 2005260027 metadata/md5-cache/dev-libs/xapian-bindings-1.4.15
 2005260027 metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
 2005260027 metadata/md5-cache/dev-libs/xmlsec-1.2.29
-2005260027 metadata/md5-cache/dev-libs/xxhash-0.6.5
-2005260027 metadata/md5-cache/dev-libs/xxhash-0.7.1
-2005260027 metadata/md5-cache/dev-libs/xxhash-0.7.3
 2005260027 metadata/md5-cache/dev-libs/yajl-2.1.0-r1
 2005260027 metadata/md5-cache/dev-libs/yajl-2.1.0-r2
 2005260027 metadata/md5-cache/dev-libs/yaz-3.0.53
@@ -41496,13 +41493,11 @@
 2005281509 metadata/md5-cache/dev-libs/opencl-clang-9.0.1
 2005291109 metadata/md5-cache/dev-libs/libbson-1.16.2
 2005291109 metadata/md5-cache/dev-libs/mongo-c-driver-1.16.2
-2005291109 metadata/md5-cache/dev-libs/qcustomplot-2.0.1
 2005291209 metadata/md5-cache/dev-libs/libg15-9999
 2005291209 metadata/md5-cache/dev-libs/xerces-c-9999
 2005301039 metadata/md5-cache/dev-libs/jsoncpp-1.9.3
 2005301139 metadata/md5-cache/dev-libs/libgpg-error-1.38
 2005292209 metadata/md5-cache/dev-libs/openssl-1.1.1g
-2006011009 metadata/md5-cache/dev-libs/Manifest.gz
 2005310539 metadata/md5-cache/dev-libs/argtable-2.13-r1
 2005302239 metadata/md5-cache/dev-libs/botan-2.14.0-r1
 2006010910 metadata/md5-cache/dev-libs/capstone-4.0.2-r1
@@ -41542,6 +41537,46 @@
 2005311939 metadata/md5-cache/dev-libs/ptexenc-1.3.8_p20200406
 2006010738 metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
 2005311909 metadata/md5-cache/dev-libs/uriparser-0.9.4
+2006041239 metadata/md5-cache/dev-libs/Manifest.gz
+2006041239 metadata/md5-cache/dev-libs/antlr-c-3.5.2
+2006041239 metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
+2006031839 metadata/md5-cache/dev-libs/atk-2.34.1
+2006041239 metadata/md5-cache/dev-libs/cgilib-0.7-r1
+2006021639 metadata/md5-cache/dev-libs/double-conversion-3.1.5
+2006030139 metadata/md5-cache/dev-libs/flatbuffers-1.12.0
+2006031839 metadata/md5-cache/dev-libs/fribidi-1.0.9
+2006030139 metadata/md5-cache/dev-libs/gdl-3.28.0
+2006030139 metadata/md5-cache/dev-libs/gjs-1.58.8
+2006031839 metadata/md5-cache/dev-libs/glib-2.62.6
+2006031839 metadata/md5-cache/dev-libs/gobject-introspection-1.62.0
+2006031839 metadata/md5-cache/dev-libs/gobject-introspection-common-1.62.0
+2006041239 metadata/md5-cache/dev-libs/jthread-1.3.3
+2006040939 metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
+2006041239 metadata/md5-cache/dev-libs/libgit2-1.0.1
+2006040939 metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r1
+2006041239 metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
+2006040239 metadata/md5-cache/dev-libs/libressl-3.2.0
+2006032238 metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
+2006041239 metadata/md5-cache/dev-libs/libtommath-1.1.0
+2006032238 metadata/md5-cache/dev-libs/libudfread-1.0.0-r1
+2006032238 metadata/md5-cache/dev-libs/libudfread-9999
+2006020339 metadata/md5-cache/dev-libs/libyaml-0.2.5
+2006041239 metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
+2006020009 metadata/md5-cache/dev-libs/pegtl-2.8.3
+2006040939 metadata/md5-cache/dev-libs/qcustomplot-2.0.1
+2006031339 metadata/md5-cache/dev-libs/re2-0.2020.05.01
+2006040109 metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
+2006040109 metadata/md5-cache/dev-libs/spdlog-1.6.0
+2006040109 metadata/md5-cache/dev-libs/spdlog-9999
+2006030109 metadata/md5-cache/dev-libs/vala-common-0.46.10
+2006031839 metadata/md5-cache/dev-libs/vala-common-0.46.7
+2006030109 metadata/md5-cache/dev-libs/vala-common-0.48.6
+2006021209 metadata/md5-cache/dev-libs/vc-1.3.0
+2006021209 metadata/md5-cache/dev-libs/vc-1.3.3
+2006021209 metadata/md5-cache/dev-libs/vc-1.4.1
+2006031109 metadata/md5-cache/dev-libs/xxhash-0.6.5
+2006031109 metadata/md5-cache/dev-libs/xxhash-0.7.1
+2006031109 metadata/md5-cache/dev-libs/xxhash-0.7.3
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2005260027 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2005260027 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -41687,10 +41722,8 @@
 1702282313 metadata/md5-cache/dev-ml/ocaml-doc-4.04
 1707021908 metadata/md5-cache/dev-ml/ocaml-doc-4.05
 1706211938 metadata/md5-cache/dev-ml/ocaml-magic-mime-1.1.0
-1912110241 metadata/md5-cache/dev-ml/bos-0.1.6
 1912131839 metadata/md5-cache/dev-ml/alcotest-0.8.1
 1912131839 metadata/md5-cache/dev-ml/alcotest-0.8.2
-1912131839 metadata/md5-cache/dev-ml/astring-0.8.3
 1912131839 metadata/md5-cache/dev-ml/async-0.9.0
 1912131839 metadata/md5-cache/dev-ml/biniou-1.0.12
 1912131839 metadata/md5-cache/dev-ml/biniou-1.0.13
@@ -41698,9 +41731,6 @@
 1912131839 metadata/md5-cache/dev-ml/biniou-1.2.0
 1912131839 metadata/md5-cache/dev-ml/camlbz2-0.6.0
 1912131839 metadata/md5-cache/dev-ml/camlpdf-2.3
-1912131839 metadata/md5-cache/dev-ml/cmdliner-1.0.0
-1912131839 metadata/md5-cache/dev-ml/cmdliner-1.0.1
-1912131839 metadata/md5-cache/dev-ml/cmdliner-1.0.2
 1912131839 metadata/md5-cache/dev-ml/core-0.9.1-r1
 1912131839 metadata/md5-cache/dev-ml/core-0.9.2
 1912131839 metadata/md5-cache/dev-ml/cppo-1.4.1
@@ -41708,14 +41738,10 @@
 1912131839 metadata/md5-cache/dev-ml/dns-1.0.0
 1912131839 metadata/md5-cache/dev-ml/easy-format-1.0.2
 1912131839 metadata/md5-cache/dev-ml/easy-format-1.2.0
-1912131839 metadata/md5-cache/dev-ml/fmt-0.8.4
-1912131839 metadata/md5-cache/dev-ml/fpath-0.7.2
 1912131839 metadata/md5-cache/dev-ml/iTeML-2.5
 1912131839 metadata/md5-cache/dev-ml/iTeML-2.6
 1912131839 metadata/md5-cache/dev-ml/iTeML-2.7
 1912131839 metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
-1912131839 metadata/md5-cache/dev-ml/jsonm-1.0.1
-1912131839 metadata/md5-cache/dev-ml/logs-0.6.2
 1912131839 metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
 1912131839 metadata/md5-cache/dev-ml/menhir-20181006
 1912131839 metadata/md5-cache/dev-ml/menhir-20190924
@@ -41778,10 +41804,8 @@
 1912131839 metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
 1912131839 metadata/md5-cache/dev-ml/re2-0.9.0
 1912131839 metadata/md5-cache/dev-ml/re2-0.9.1
-1912131839 metadata/md5-cache/dev-ml/react-1.2.1
 1912131839 metadata/md5-cache/dev-ml/reactiveData-0.2.1
 1912131839 metadata/md5-cache/dev-ml/result-1.2
-1912131839 metadata/md5-cache/dev-ml/rresult-0.5.0
 1912131839 metadata/md5-cache/dev-ml/sexplib-0.9.2
 1912131839 metadata/md5-cache/dev-ml/sexplib-0.9.3
 1912131839 metadata/md5-cache/dev-ml/spawn-0.9.0
@@ -41789,11 +41813,8 @@
 1912131839 metadata/md5-cache/dev-ml/stdio-0.9.1
 1912131839 metadata/md5-cache/dev-ml/stringext-1.5.0
 1912131839 metadata/md5-cache/dev-ml/textutils-0.9.0
-1912131839 metadata/md5-cache/dev-ml/topkg-0.9.0
-1912131839 metadata/md5-cache/dev-ml/topkg-0.9.1
 1912131839 metadata/md5-cache/dev-ml/typerep-0.9.0
 1912131839 metadata/md5-cache/dev-ml/uchar-0.0.2
-1912131839 metadata/md5-cache/dev-ml/uutf-1.0.1
 1912131839 metadata/md5-cache/dev-ml/variantslib-0.9.0
 1912131839 metadata/md5-cache/dev-ml/yojson-1.4.0
 1912170839 metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -41804,7 +41825,6 @@
 2002100139 metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0
 2002112051 metadata/md5-cache/dev-ml/patience_diff-0.9.0
 2002112051 metadata/md5-cache/dev-ml/reactiveData-9999
-2002141709 metadata/md5-cache/dev-ml/ocamlweb-1.39
 2002230040 metadata/md5-cache/dev-ml/extlib-1.7.6
 2003202339 metadata/md5-cache/dev-ml/lablgtk-2.18.8-r1
 2003271609 metadata/md5-cache/dev-ml/camlzip-1.10
@@ -41857,7 +41877,6 @@
 2005260027 metadata/md5-cache/dev-ml/markup-0.7.5
 2005260027 metadata/md5-cache/dev-ml/menhir-20170712
 2005260027 metadata/md5-cache/dev-ml/menhir-20171013
-2005260027 metadata/md5-cache/dev-ml/mtime-1.1.0
 2005260027 metadata/md5-cache/dev-ml/num-1.3
 2005260027 metadata/md5-cache/dev-ml/oasis-0.4.10
 2005260027 metadata/md5-cache/dev-ml/oasis-0.4.8
@@ -41897,8 +41916,6 @@
 2005260027 metadata/md5-cache/dev-ml/ounit-2.0.0
 2005260027 metadata/md5-cache/dev-ml/ounit-2.0.5
 2005260027 metadata/md5-cache/dev-ml/ounit-2.0.6
-2005260027 metadata/md5-cache/dev-ml/parmap-1.0_rc7-r1
-2005260027 metadata/md5-cache/dev-ml/parmap-1.0_rc8
 2005260027 metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
 2005260027 metadata/md5-cache/dev-ml/pgocaml-2.3
 2005260027 metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
@@ -41912,13 +41929,31 @@
 2005260027 metadata/md5-cache/dev-ml/xml-light-2.2-r3
 2005260027 metadata/md5-cache/dev-ml/zarith-1.7
 2005260027 metadata/md5-cache/dev-ml/zarith-1.9.1
-2005281509 metadata/md5-cache/dev-ml/Manifest.gz
 2005281509 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0
 2005281509 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1.9999
 2005281509 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1_rc1
 2005281509 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
 2005281509 metadata/md5-cache/dev-ml/llvm-ocaml-8.0.1
 2005281509 metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
+2006041239 metadata/md5-cache/dev-ml/Manifest.gz
+2006041239 metadata/md5-cache/dev-ml/astring-0.8.3
+2006041239 metadata/md5-cache/dev-ml/bos-0.1.6
+2006041239 metadata/md5-cache/dev-ml/cmdliner-1.0.0
+2006041239 metadata/md5-cache/dev-ml/cmdliner-1.0.1
+2006041239 metadata/md5-cache/dev-ml/cmdliner-1.0.2
+2006041239 metadata/md5-cache/dev-ml/fmt-0.8.4
+2006041239 metadata/md5-cache/dev-ml/fpath-0.7.2
+2006041239 metadata/md5-cache/dev-ml/jsonm-1.0.1
+2006041239 metadata/md5-cache/dev-ml/logs-0.6.2
+2006041239 metadata/md5-cache/dev-ml/mtime-1.1.0
+2006041239 metadata/md5-cache/dev-ml/ocamlweb-1.39
+2006041239 metadata/md5-cache/dev-ml/parmap-1.0_rc7-r1
+2006041239 metadata/md5-cache/dev-ml/parmap-1.0_rc8
+2006041239 metadata/md5-cache/dev-ml/react-1.2.1
+2006041239 metadata/md5-cache/dev-ml/rresult-0.5.0
+2006041239 metadata/md5-cache/dev-ml/topkg-0.9.0
+2006041239 metadata/md5-cache/dev-ml/topkg-0.9.1
+2006041239 metadata/md5-cache/dev-ml/uutf-1.0.1
 1910170740 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0
 1910170740 metadata/md5-cache/dev-perl/Alien-LibGumbo-0.50.0
 1910170740 metadata/md5-cache/dev-perl/AnyEvent-HTTP-2.240.0
@@ -43251,7 +43286,6 @@
 2005201839 metadata/md5-cache/dev-perl/Alien-Build-2.230.0
 2005201639 metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0
 2005201639 metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
-2005201639 metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
 2005212339 metadata/md5-cache/dev-perl/Canary-Stability-2013.0.0
 2005220209 metadata/md5-cache/dev-perl/Carp-Always-0.160.0
 2005220209 metadata/md5-cache/dev-perl/Carp-Assert-0.210.0-r1
@@ -43818,11 +43852,12 @@
 2005260027 metadata/md5-cache/dev-perl/prefork-1.40.0-r2
 2005260027 metadata/md5-cache/dev-perl/rename-1.900.0
 2005260027 metadata/md5-cache/dev-perl/txt2html-2.520.100
-2005311939 metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
-2005311939 metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
-2005311939 metadata/md5-cache/dev-perl/MIME-Charset-1.12.2
-2005311939 metadata/md5-cache/dev-perl/Manifest.gz
-2005311939 metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
+2006031839 metadata/md5-cache/dev-perl/Encode-EUCJPASCII-0.30.0
+2006031839 metadata/md5-cache/dev-perl/Encode-HanExtra-0.230.0-r2
+2006031839 metadata/md5-cache/dev-perl/MIME-Charset-1.12.2
+2006031839 metadata/md5-cache/dev-perl/Manifest.gz
+2006031839 metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
+2006031839 metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -43865,7 +43900,6 @@
 1803201638 metadata/md5-cache/dev-php/jpgraph-4.2.0
 1908161739 metadata/md5-cache/dev-php/json-schema-5.2.8
 1908161739 metadata/md5-cache/dev-php/jsonlint-1.7.1
-1702282315 metadata/md5-cache/dev-php/libchart-1.3
 1707101839 metadata/md5-cache/dev-php/mmslib-0.97
 1811020409 metadata/md5-cache/dev-php/mockery-0.9.0-r1
 1907271310 metadata/md5-cache/dev-php/onphp-1.0.11_pre20141124
@@ -43983,9 +44017,7 @@
 2003261841 metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0
 2003261841 metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.3
 2003261841 metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.4
-2003261841 metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1
 2003261841 metadata/md5-cache/dev-php/PHP_Timer-2.1.2-r1
-2003261841 metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
 2003261841 metadata/md5-cache/dev-php/doctrine-instantiator-1.1.0
 2003261841 metadata/md5-cache/dev-php/doctrine-instantiator-1.3.0
 2003261841 metadata/md5-cache/dev-php/fedora-autoloader-1.0.0
@@ -43999,20 +44031,6 @@
 2003261841 metadata/md5-cache/dev-php/phpspec-prophecy-1.10.1
 2003261841 metadata/md5-cache/dev-php/phpspec-prophecy-1.8.0
 2003261841 metadata/md5-cache/dev-php/phpspec-prophecy-1.9.0
-2003261841 metadata/md5-cache/dev-php/phpunit-8.5.0
-2003261841 metadata/md5-cache/dev-php/phpunit-8.5.1
-2003261841 metadata/md5-cache/dev-php/phpunit-8.5.2
-2003261841 metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
-2003261841 metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
-2003261841 metadata/md5-cache/dev-php/sebastian-diff-3.0.2
-2003261841 metadata/md5-cache/dev-php/sebastian-environment-4.2.3
-2003261841 metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
-2003261841 metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
-2003261841 metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
-2003261841 metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
-2003261841 metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
-2003261841 metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
-2003261841 metadata/md5-cache/dev-php/sebastian-type-1.1.3
 2003261841 metadata/md5-cache/dev-php/theseer-tokenizer-1.1.0
 2003261841 metadata/md5-cache/dev-php/theseer-tokenizer-1.1.3
 2003261841 metadata/md5-cache/dev-php/webmozart-assert-1.4.0
@@ -44072,8 +44090,6 @@
 2004032241 metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
 2004032241 metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.2
 2004032241 metadata/md5-cache/dev-php/PHP_Timer-1.0.9
-2004032241 metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
-2004032241 metadata/md5-cache/dev-php/Text_Template-1.2.1
 2004032241 metadata/md5-cache/dev-php/adodb-5.20.14
 2004032241 metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
 2004032241 metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
@@ -44083,28 +44099,14 @@
 2004032241 metadata/md5-cache/dev-php/phpdocumentor-reflection-docblock-3.1.1
 2004032241 metadata/md5-cache/dev-php/phpdocumentor-type-resolver-0.2.1
 2004032241 metadata/md5-cache/dev-php/phpspec-prophecy-1.7.0
-2004032241 metadata/md5-cache/dev-php/phpunit-5.7.15-r3
-2004032241 metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
-2004032241 metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
-2004032241 metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
-2004032241 metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
-2004032241 metadata/md5-cache/dev-php/sebastian-environment-2.0.0
-2004032241 metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
-2004032241 metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
-2004032241 metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
-2004032241 metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
-2004032241 metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
-2004032241 metadata/md5-cache/dev-php/sebastian-version-2.0.1
 2004032241 metadata/md5-cache/dev-php/smarty-3.1.33
 2004032241 metadata/md5-cache/dev-php/symfony-yaml-2.1.0
 2004032241 metadata/md5-cache/dev-php/webmozart-assert-1.2.0
 2004101309 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.5
 2004101309 metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
-2004110209 metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
 2004211709 metadata/md5-cache/dev-php/awl-0.61
 2004211439 metadata/md5-cache/dev-php/composer-1.10.5
 2004300039 metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.7
-2004300039 metadata/md5-cache/dev-php/phpunit-8.5.4
 2004300039 metadata/md5-cache/dev-php/psr-log-1.1.3
 2005140209 metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
 2005140209 metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
@@ -44186,8 +44188,44 @@
 2005260027 metadata/md5-cache/dev-php/xdebug-client-2.9.5
 2005260027 metadata/md5-cache/dev-php/xhprof-0.9.10
 2005260027 metadata/md5-cache/dev-php/xhprof-2.1.4
-2005291109 metadata/md5-cache/dev-php/Manifest.gz
 2005291109 metadata/md5-cache/dev-php/pecl-mongodb-1.7.4
+2006041239 metadata/md5-cache/dev-php/Manifest.gz
+2006021709 metadata/md5-cache/dev-php/PEAR-DB-1.10.0
+2006021709 metadata/md5-cache/dev-php/PEAR-PEAR-1.10.12
+2006021709 metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.5
+2006041239 metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
+2006041239 metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.10-r1
+2006041239 metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
+2006041239 metadata/md5-cache/dev-php/PHP_TokenStream-3.1.1
+2006041239 metadata/md5-cache/dev-php/Text_Template-1.2.1
+2006041239 metadata/md5-cache/dev-php/libchart-1.3
+2006041239 metadata/md5-cache/dev-php/phpunit-5.7.15-r3
+2006041239 metadata/md5-cache/dev-php/phpunit-8.5.0
+2006041239 metadata/md5-cache/dev-php/phpunit-8.5.1
+2006041239 metadata/md5-cache/dev-php/phpunit-8.5.2
+2006041239 metadata/md5-cache/dev-php/phpunit-8.5.4
+2006041239 metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
+2006041239 metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3-r1
+2006041239 metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
+2006041239 metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
+2006041239 metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
+2006041239 metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
+2006041239 metadata/md5-cache/dev-php/sebastian-diff-3.0.2
+2006041239 metadata/md5-cache/dev-php/sebastian-environment-2.0.0
+2006041239 metadata/md5-cache/dev-php/sebastian-environment-4.2.3
+2006041239 metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
+2006041239 metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
+2006041239 metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
+2006041239 metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
+2006041239 metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
+2006041239 metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
+2006041239 metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
+2006041239 metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
+2006041239 metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
+2006041239 metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
+2006041239 metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
+2006041239 metadata/md5-cache/dev-php/sebastian-type-1.1.3
+2006041239 metadata/md5-cache/dev-php/sebastian-version-2.0.1
 2003261841 metadata/md5-cache/dev-python/python-docs-3.7.7
 2003261841 metadata/md5-cache/dev-python/python-docs-3.8.2
 2004111109 metadata/md5-cache/dev-python/pypy-exe-bin-7.3.0_p1
@@ -44210,7 +44248,6 @@
 2005260027 metadata/md5-cache/dev-python/PythonQt-9999
 2005260027 metadata/md5-cache/dev-python/brython-3.7.2
 2005260027 metadata/md5-cache/dev-python/cangjie-1.2-r1
-2005260027 metadata/md5-cache/dev-python/cangjie-1.3
 2005260027 metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
 2005260027 metadata/md5-cache/dev-python/clang-python-10.0.0
 2005260027 metadata/md5-cache/dev-python/clang-python-10.0.1.9999
@@ -44236,9 +44273,7 @@
 2005260027 metadata/md5-cache/dev-python/pyatspi-2.36.0
 2005260027 metadata/md5-cache/dev-python/pygobject-2.28.6-r55
 2005260027 metadata/md5-cache/dev-python/pygobject-3.32.1
-2005260027 metadata/md5-cache/dev-python/pygobject-3.34.0
 2005260027 metadata/md5-cache/dev-python/pygtk-2.24.0-r4
-2005260027 metadata/md5-cache/dev-python/pygtk-2.24.0-r5
 2005260027 metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1
 2005260027 metadata/md5-cache/dev-python/pyilmbase-2.3.0-r2
 2005260027 metadata/md5-cache/dev-python/pyotherside-1.5.9
@@ -44253,8 +44288,6 @@
 2005260027 metadata/md5-cache/dev-python/pyside2-5.14.1-r2
 2005260027 metadata/md5-cache/dev-python/pyside2-5.14.2
 2005260027 metadata/md5-cache/dev-python/python-caja-1.24.0
-2005260027 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
-2005260027 metadata/md5-cache/dev-python/python_orocos_kdl-9999
 2005260027 metadata/md5-cache/dev-python/qscintilla-python-2.11.4
 2005260027 metadata/md5-cache/dev-python/quex-0.65.4
 2005260027 metadata/md5-cache/dev-python/sip-4.19.19
@@ -44340,8 +44373,6 @@
 2006010910 metadata/md5-cache/dev-python/apsw-3.25.2_p1
 2006010910 metadata/md5-cache/dev-python/argcomplete-1.11.0
 2006010910 metadata/md5-cache/dev-python/argcomplete-1.11.1
-2006010910 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
-2006010910 metadata/md5-cache/dev-python/argh-0.26.2-r2
 2006010910 metadata/md5-cache/dev-python/argon2_cffi-19.1.0
 2006010910 metadata/md5-cache/dev-python/args-0.1.0-r1
 2006010910 metadata/md5-cache/dev-python/arpeggio-1.9.0
@@ -44356,7 +44387,6 @@
 2006010910 metadata/md5-cache/dev-python/astroid-2.3.3-r2
 2006010910 metadata/md5-cache/dev-python/astunparse-1.6.2
 2006010910 metadata/md5-cache/dev-python/astunparse-1.6.3
-2006010910 metadata/md5-cache/dev-python/async_generator-1.10
 2006010910 metadata/md5-cache/dev-python/async_timeout-3.0.1
 2006010910 metadata/md5-cache/dev-python/atomicwrites-1.3.0
 2006010910 metadata/md5-cache/dev-python/atomicwrites-1.4.0
@@ -44368,7 +44398,6 @@
 2006010910 metadata/md5-cache/dev-python/authres-1.2.0
 2006010910 metadata/md5-cache/dev-python/autobahn-17.5.1-r2
 2006010910 metadata/md5-cache/dev-python/autobahn-18.3.1
-2006010910 metadata/md5-cache/dev-python/autobahn-20.4.3
 2006010910 metadata/md5-cache/dev-python/automat-0.8.0-r1
 2006010910 metadata/md5-cache/dev-python/automat-20.2.0
 2006010910 metadata/md5-cache/dev-python/automaton-1.12.1
@@ -44379,7 +44408,6 @@
 2006010910 metadata/md5-cache/dev-python/aws-sam-translator-1.22.0
 2006010910 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.4.2
 2006010910 metadata/md5-cache/dev-python/awscli-1.18.62
-2006010910 metadata/md5-cache/dev-python/awscli-1.18.69
 2006010910 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
 2006010910 metadata/md5-cache/dev-python/babelfish-9999
 2006010910 metadata/md5-cache/dev-python/backcall-0.1.0-r1
@@ -44414,14 +44442,12 @@
 2006010910 metadata/md5-cache/dev-python/bleach-3.1.4-r1
 2006010910 metadata/md5-cache/dev-python/bleach-3.1.5
 2006010910 metadata/md5-cache/dev-python/blessed-1.17.5
-2006010910 metadata/md5-cache/dev-python/blessings-1.7-r1
 2006010910 metadata/md5-cache/dev-python/blinker-1.4-r1
 2006010910 metadata/md5-cache/dev-python/blockdiag-1.5.4
 2006010910 metadata/md5-cache/dev-python/blosc-1.5.1
 2006010910 metadata/md5-cache/dev-python/blurb-1.0.7
 2006010910 metadata/md5-cache/dev-python/bokeh-0.12.6
 2006010910 metadata/md5-cache/dev-python/booleanOperations-0.8.2
-2006010910 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
 2006010910 metadata/md5-cache/dev-python/boto-2.49.0
 2006010910 metadata/md5-cache/dev-python/boto-2.49.0-r2
 2006010910 metadata/md5-cache/dev-python/boto3-1.10.2
@@ -44438,11 +44464,9 @@
 2006010910 metadata/md5-cache/dev-python/botocore-9999
 2006010910 metadata/md5-cache/dev-python/bottle-0.12.18
 2006010910 metadata/md5-cache/dev-python/bottleneck-1.2.1-r1
-2006010910 metadata/md5-cache/dev-python/bpython-0.19
 2006010910 metadata/md5-cache/dev-python/breathe-4.14.1
 2006010910 metadata/md5-cache/dev-python/brotlipy-0.7.0-r2
 2006010910 metadata/md5-cache/dev-python/bsddb3-6.2.4
-2006010910 metadata/md5-cache/dev-python/bsddb3-6.2.7
 2006010910 metadata/md5-cache/dev-python/bytecodeassembler-0.6
 2006010910 metadata/md5-cache/dev-python/bz2file-0.98
 2006010910 metadata/md5-cache/dev-python/cached-property-1.5.1
@@ -44471,7 +44495,6 @@
 2006010910 metadata/md5-cache/dev-python/cfn-python-lint-0.30.1
 2006010910 metadata/md5-cache/dev-python/cgroup-utils-0.8
 2006010910 metadata/md5-cache/dev-python/chai-1.1.1
-2006010910 metadata/md5-cache/dev-python/chai-1.1.2
 2006010910 metadata/md5-cache/dev-python/chainmap-1.0.3
 2006010910 metadata/md5-cache/dev-python/chameleon-3.7.0
 2006010910 metadata/md5-cache/dev-python/chameleon-3.7.1
@@ -44497,10 +44520,8 @@
 2006010910 metadata/md5-cache/dev-python/click-6.7-r1
 2006010910 metadata/md5-cache/dev-python/click-7.0-r1
 2006010910 metadata/md5-cache/dev-python/click-7.1.2
-2006010910 metadata/md5-cache/dev-python/click-default-group-1.2.2
 2006010910 metadata/md5-cache/dev-python/click-log-0.2.1
 2006010910 metadata/md5-cache/dev-python/click-log-0.3.2
-2006010910 metadata/md5-cache/dev-python/click-plugins-1.0.3
 2006010910 metadata/md5-cache/dev-python/click-threading-0.4.4
 2006010910 metadata/md5-cache/dev-python/cliff-2.18.0-r1
 2006010910 metadata/md5-cache/dev-python/cliff-3.1.0
@@ -44533,7 +44554,6 @@
 2006010910 metadata/md5-cache/dev-python/construct-2.10.56
 2006010910 metadata/md5-cache/dev-python/contextlib2-0.6.0
 2006010910 metadata/md5-cache/dev-python/contextlib2-0.6.0_p1
-2006010910 metadata/md5-cache/dev-python/contextvars-2.4
 2006010910 metadata/md5-cache/dev-python/cookies-2.2.1-r1
 2006010910 metadata/md5-cache/dev-python/coreapi-2.3.3-r1
 2006010910 metadata/md5-cache/dev-python/coreschema-0.0.4
@@ -44542,11 +44562,7 @@
 2006010910 metadata/md5-cache/dev-python/cov-core-1.15.0
 2006010910 metadata/md5-cache/dev-python/cov-core-1.15.0-r1
 2006010910 metadata/md5-cache/dev-python/coverage-4.5.2
-2006010910 metadata/md5-cache/dev-python/coverage-4.5.4
-2006010910 metadata/md5-cache/dev-python/coverage-5.0.3
-2006010910 metadata/md5-cache/dev-python/coverage-5.1
 2006010910 metadata/md5-cache/dev-python/coverage-test-runner-1.15
-2006010910 metadata/md5-cache/dev-python/cppy-1.1.0
 2006010910 metadata/md5-cache/dev-python/crcmod-1.7-r3
 2006010910 metadata/md5-cache/dev-python/croniter-0.3.29
 2006010910 metadata/md5-cache/dev-python/croniter-0.3.30
@@ -44556,12 +44572,10 @@
 2006010910 metadata/md5-cache/dev-python/cssselect-1.1.0
 2006010910 metadata/md5-cache/dev-python/cssselect2-0.3.0
 2006010910 metadata/md5-cache/dev-python/cssutils-1.0.2-r2
-2006010910 metadata/md5-cache/dev-python/csv23-0.3.2
 2006010910 metadata/md5-cache/dev-python/ctypescrypto-0.5
 2006010910 metadata/md5-cache/dev-python/ctypescrypto-9999
 2006010910 metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
 2006010910 metadata/md5-cache/dev-python/cursive-0.2.2
-2006010910 metadata/md5-cache/dev-python/curtsies-0.3.0-r2
 2006010910 metadata/md5-cache/dev-python/cvxopt-1.2.5
 2006010910 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
 2006010910 metadata/md5-cache/dev-python/cx_Freeze-6.1
@@ -44583,7 +44597,6 @@
 2006010910 metadata/md5-cache/dev-python/decorator-4.4.2
 2006010910 metadata/md5-cache/dev-python/decoratortools-1.8-r1
 2006010910 metadata/md5-cache/dev-python/defcon-0.6.0
-2006010910 metadata/md5-cache/dev-python/defcon-0.6.0-r1
 2006010910 metadata/md5-cache/dev-python/defusedxml-0.6.0
 2006010910 metadata/md5-cache/dev-python/denonavr-0.8.1
 2006010910 metadata/md5-cache/dev-python/denonavr-0.9.2
@@ -44599,7 +44612,6 @@
 2006010910 metadata/md5-cache/dev-python/discogs-client-2.2.2
 2006010910 metadata/md5-cache/dev-python/diskcache-4.1.0
 2006010910 metadata/md5-cache/dev-python/dissononce-0.34.3
-2006010910 metadata/md5-cache/dev-python/distlib-0.3.0
 2006010910 metadata/md5-cache/dev-python/distributed-1.18.0-r1
 2006010910 metadata/md5-cache/dev-python/distro-1.0.4-r1
 2006010910 metadata/md5-cache/dev-python/distro-1.3.0
@@ -44696,7 +44708,6 @@
 2006010910 metadata/md5-cache/dev-python/expects-0.8.0-r1
 2006010910 metadata/md5-cache/dev-python/extras-1.0.0
 2006010910 metadata/md5-cache/dev-python/extremes-1.1.1
-2006010910 metadata/md5-cache/dev-python/eyeD3-0.8.11
 2006010910 metadata/md5-cache/dev-python/falcon-1.3.0
 2006010910 metadata/md5-cache/dev-python/falcon-2.0.0
 2006010910 metadata/md5-cache/dev-python/fasteners-0.14.1-r1
@@ -44751,7 +44762,6 @@
 2006010910 metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
 2006010910 metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
 2006010910 metadata/md5-cache/dev-python/flask-wtf-0.14.3
-2006010910 metadata/md5-cache/dev-python/flatbuffers-1.12
 2006010910 metadata/md5-cache/dev-python/fleep-1.0.1
 2006010910 metadata/md5-cache/dev-python/fleep-9999
 2006010910 metadata/md5-cache/dev-python/flexmock-0.10.4
@@ -44768,7 +44778,6 @@
 2006010910 metadata/md5-cache/dev-python/frozen-flask-0.15
 2006010910 metadata/md5-cache/dev-python/frozendict-1.2
 2006010910 metadata/md5-cache/dev-python/fs-2.4.9
-2006010910 metadata/md5-cache/dev-python/fs-2.4.9-r1
 2006010910 metadata/md5-cache/dev-python/fudge-1.1.1
 2006010910 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
 2006010910 metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
@@ -44829,7 +44838,6 @@
 2006010910 metadata/md5-cache/dev-python/graphql-core-2.0.0
 2006010910 metadata/md5-cache/dev-python/graphviz-0.13
 2006010910 metadata/md5-cache/dev-python/greenlet-0.4.15
-2006010910 metadata/md5-cache/dev-python/greenlet-0.4.15-r1
 2006010910 metadata/md5-cache/dev-python/greenstalk-1.0.1
 2006010910 metadata/md5-cache/dev-python/grpcio-1.26.0-r1
 2006010910 metadata/md5-cache/dev-python/grpcio-1.28.1
@@ -44865,7 +44873,6 @@
 2006010910 metadata/md5-cache/dev-python/httpbin-0.7.0
 2006010910 metadata/md5-cache/dev-python/httplib2-0.13.0
 2006010910 metadata/md5-cache/dev-python/httplib2-0.17.0
-2006010910 metadata/md5-cache/dev-python/httplib2-0.18.1
 2006010910 metadata/md5-cache/dev-python/httpretty-0.9.6
 2006010910 metadata/md5-cache/dev-python/httpretty-1.0.2
 2006010910 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
@@ -44896,7 +44903,6 @@
 2006010910 metadata/md5-cache/dev-python/imagesize-1.1.0
 2006010910 metadata/md5-cache/dev-python/imapclient-2.1.0
 2006010910 metadata/md5-cache/dev-python/iminuit-1.3.8
-2006010910 metadata/md5-cache/dev-python/immutables-0.11
 2006010910 metadata/md5-cache/dev-python/importing-1.10
 2006010910 metadata/md5-cache/dev-python/importlib_metadata-1.4.0
 2006010910 metadata/md5-cache/dev-python/importlib_metadata-1.5.0
@@ -44913,7 +44919,6 @@
 2006010910 metadata/md5-cache/dev-python/intelhex-2.2.1-r1
 2006010910 metadata/md5-cache/dev-python/intervaltree-3.0.2
 2006010910 metadata/md5-cache/dev-python/intreehooks-1.0
-2006010910 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
 2006010910 metadata/md5-cache/dev-python/ioflo-1.7.5
 2006010910 metadata/md5-cache/dev-python/ioflo-2.0.0
 2006010910 metadata/md5-cache/dev-python/ipaddr-2.2.0
@@ -44933,7 +44938,6 @@
 2006010910 metadata/md5-cache/dev-python/iso8601-0.1.12
 2006010910 metadata/md5-cache/dev-python/isodate-0.6.0-r1
 2006010910 metadata/md5-cache/dev-python/isort-4.3.15
-2006010910 metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
 2006010910 metadata/md5-cache/dev-python/itsdangerous-1.1.0
 2006010910 metadata/md5-cache/dev-python/itypes-1.1.0
 2006010910 metadata/md5-cache/dev-python/jaraco-classes-2.0-r1
@@ -44941,7 +44945,6 @@
 2006010910 metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
 2006010910 metadata/md5-cache/dev-python/jaraco-collections-2.1
 2006010910 metadata/md5-cache/dev-python/jaraco-collections-3.0.0
-2006010910 metadata/md5-cache/dev-python/jaraco-envs-1.0.1
 2006010910 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
 2006010910 metadata/md5-cache/dev-python/jaraco-functools-3.0.0
 2006010910 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
@@ -44962,7 +44965,6 @@
 2006010910 metadata/md5-cache/dev-python/jdcal-1.4
 2006010910 metadata/md5-cache/dev-python/jedi-0.14.1
 2006010910 metadata/md5-cache/dev-python/jedi-0.15.2
-2006010910 metadata/md5-cache/dev-python/jedi-0.17.0
 2006010910 metadata/md5-cache/dev-python/jeepney-0.4.3
 2006010910 metadata/md5-cache/dev-python/jellyfish-0.7.2
 2006010910 metadata/md5-cache/dev-python/jellyfish-0.8.2
@@ -44985,16 +44987,13 @@
 2006010910 metadata/md5-cache/dev-python/jsonmerge-1.6.0
 2006010910 metadata/md5-cache/dev-python/jsonpatch-1.25
 2006010910 metadata/md5-cache/dev-python/jsonpickle-1.3
-2006010910 metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
 2006010910 metadata/md5-cache/dev-python/jsonpointer-2.0
-2006010910 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
 2006010910 metadata/md5-cache/dev-python/jsonref-0.1
 2006010910 metadata/md5-cache/dev-python/jsonrpclib-0.4.0
 2006010910 metadata/md5-cache/dev-python/jsonrpclib-0.4.1
 2006010910 metadata/md5-cache/dev-python/jsonrpclib-9999
 2006010910 metadata/md5-cache/dev-python/jsonschema-2.6.0
 2006010910 metadata/md5-cache/dev-python/jsonschema-3.0.1
-2006010910 metadata/md5-cache/dev-python/jsonschema-3.2.0
 2006010910 metadata/md5-cache/dev-python/jsonxs-0.6
 2006010910 metadata/md5-cache/dev-python/jupyter-1.0.0-r2
 2006010910 metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
@@ -45003,20 +45002,17 @@
 2006010910 metadata/md5-cache/dev-python/jupyter_core-4.6.1-r1
 2006010910 metadata/md5-cache/dev-python/jwcrypto-0.7.0
 2006010910 metadata/md5-cache/dev-python/kafka-python-1.4.7
-2006010910 metadata/md5-cache/dev-python/kaitaistruct-0.8
 2006010910 metadata/md5-cache/dev-python/kaptan-0.5.12-r1
 2006010910 metadata/md5-cache/dev-python/kazoo-2.6.1
 2006010910 metadata/md5-cache/dev-python/kazoo-2.7.0
 2006010910 metadata/md5-cache/dev-python/kconfiglib-14.1.0
 2006010910 metadata/md5-cache/dev-python/keyring-19.3.0
-2006010910 metadata/md5-cache/dev-python/keyring-21.2.1
 2006010910 metadata/md5-cache/dev-python/keystoneauth-3.17.2
 2006010910 metadata/md5-cache/dev-python/keystoneauth-4.0.0
 2006010910 metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
 2006010910 metadata/md5-cache/dev-python/kid-0.9.6-r1
 2006010910 metadata/md5-cache/dev-python/kiwisolver-1.0.1
 2006010910 metadata/md5-cache/dev-python/kiwisolver-1.1.0
-2006010910 metadata/md5-cache/dev-python/kiwisolver-1.2.0
 2006010910 metadata/md5-cache/dev-python/kombu-4.6.3
 2006010910 metadata/md5-cache/dev-python/kombu-4.6.8
 2006010910 metadata/md5-cache/dev-python/lark-parser-0.7.8
@@ -45066,7 +45062,6 @@
 2006010910 metadata/md5-cache/dev-python/logfury-0.1.2-r1
 2006010910 metadata/md5-cache/dev-python/loguru-0.4.1
 2006010910 metadata/md5-cache/dev-python/logutils-0.3.3-r1
-2006010910 metadata/md5-cache/dev-python/logutils-0.3.5
 2006010910 metadata/md5-cache/dev-python/lunr-0.5.6
 2006010910 metadata/md5-cache/dev-python/lxml-4.5.0
 2006010910 metadata/md5-cache/dev-python/lxml-4.5.1
@@ -45079,7 +45074,6 @@
 2006010910 metadata/md5-cache/dev-python/maintboot-0.1.0
 2006010910 metadata/md5-cache/dev-python/mako-1.1.2
 2006010910 metadata/md5-cache/dev-python/mako-1.1.3
-2006010910 metadata/md5-cache/dev-python/mamba-0.11.0
 2006010910 metadata/md5-cache/dev-python/mamba-0.8.6-r1
 2006010910 metadata/md5-cache/dev-python/mando-0.6.4
 2006010910 metadata/md5-cache/dev-python/manuel-1.9.0
@@ -45098,7 +45092,6 @@
 2006010910 metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
 2006010910 metadata/md5-cache/dev-python/matplotlib-2.2.4
 2006010910 metadata/md5-cache/dev-python/matplotlib-3.1.2
-2006010910 metadata/md5-cache/dev-python/matplotlib-3.2.1
 2006010910 metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
 2006010910 metadata/md5-cache/dev-python/matterhook-0.1
 2006010910 metadata/md5-cache/dev-python/matterhook-0.1-r1
@@ -45118,11 +45111,9 @@
 2006010910 metadata/md5-cache/dev-python/mimerender-0.6.0
 2006010910 metadata/md5-cache/dev-python/mini-amf-0.9.1-r1
 2006010910 metadata/md5-cache/dev-python/minidb-2.0.2-r1
-2006010910 metadata/md5-cache/dev-python/minidb-2.0.3
 2006010910 metadata/md5-cache/dev-python/minidb-2.0.4
 2006010910 metadata/md5-cache/dev-python/minimock-1.2.8-r1
 2006010910 metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
-2006010910 metadata/md5-cache/dev-python/misaka-1.0.2
 2006010910 metadata/md5-cache/dev-python/mistune-0.8.4
 2006010910 metadata/md5-cache/dev-python/mkautodoc-0.1.0
 2006010910 metadata/md5-cache/dev-python/mkdocs-0.15.3
@@ -45153,9 +45144,7 @@
 2006010910 metadata/md5-cache/dev-python/msgpack-0.5.6
 2006010910 metadata/md5-cache/dev-python/msgpack-0.6.2
 2006010910 metadata/md5-cache/dev-python/multidict-4.5.2
-2006011009 metadata/md5-cache/dev-python/multidict-4.7.6
 2006010910 metadata/md5-cache/dev-python/munch-2.3.2
-2006010910 metadata/md5-cache/dev-python/munch-2.5.0-r1
 2006010910 metadata/md5-cache/dev-python/munkres-1.1.2
 2006010910 metadata/md5-cache/dev-python/mygpoclient-1.8
 2006010910 metadata/md5-cache/dev-python/mypy-0.760
@@ -45187,7 +45176,6 @@
 2006010910 metadata/md5-cache/dev-python/networkx-2.4-r1
 2006010910 metadata/md5-cache/dev-python/neutron-lib-1.29.2
 2006010910 metadata/md5-cache/dev-python/neutron-lib-2.3.0
-2006010910 metadata/md5-cache/dev-python/nltk-3.5
 2006010910 metadata/md5-cache/dev-python/nnpy-1.4.2
 2006010910 metadata/md5-cache/dev-python/node-semver-0.7.0
 2006010910 metadata/md5-cache/dev-python/nodeenv-1.1.3-r1
@@ -45203,11 +45191,7 @@
 2006010910 metadata/md5-cache/dev-python/nose_fixes-1.3
 2006010910 metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
 2006010910 metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
-2006010910 metadata/md5-cache/dev-python/notebook-5.0.0
-2006010910 metadata/md5-cache/dev-python/notebook-5.2.1
-2006010910 metadata/md5-cache/dev-python/notebook-5.7.8
 2006010910 metadata/md5-cache/dev-python/notify2-0.3.1-r1
-2006010910 metadata/md5-cache/dev-python/nototools-0_pre20200207
 2006010910 metadata/md5-cache/dev-python/ntlm-auth-1.4.0-r1
 2006010910 metadata/md5-cache/dev-python/ntplib-0.3.3
 2006010910 metadata/md5-cache/dev-python/nuitka-0.6.6
@@ -45216,11 +45200,7 @@
 2006010910 metadata/md5-cache/dev-python/numba-0.39.0
 2006010910 metadata/md5-cache/dev-python/numexpr-2.6.9
 2006010910 metadata/md5-cache/dev-python/numpy-1.16.5-r1
-2006010910 metadata/md5-cache/dev-python/numpy-1.17.4-r3
-2006010910 metadata/md5-cache/dev-python/numpy-1.18.3
-2006010910 metadata/md5-cache/dev-python/numpy-python2-1.16.6
 2006010910 metadata/md5-cache/dev-python/numpydoc-0.9.1
-2006010910 metadata/md5-cache/dev-python/numpydoc-0.9.2
 2006010910 metadata/md5-cache/dev-python/oauth-1.0.1-r1
 2006010910 metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
 2006010910 metadata/md5-cache/dev-python/oauth2client-4.1.3
@@ -45308,7 +45288,6 @@
 2006010910 metadata/md5-cache/dev-python/parso-0.5.2
 2006010910 metadata/md5-cache/dev-python/parso-0.6.1
 2006010910 metadata/md5-cache/dev-python/parso-0.6.2
-2006010910 metadata/md5-cache/dev-python/parso-0.7.0
 2006010910 metadata/md5-cache/dev-python/partd-0.3.8
 2006010910 metadata/md5-cache/dev-python/parver-0.3
 2006010910 metadata/md5-cache/dev-python/passlib-1.7.2
@@ -45326,7 +45305,6 @@
 2006010910 metadata/md5-cache/dev-python/pathlib2-2.3.5
 2006010910 metadata/md5-cache/dev-python/pathspec-0.7.0
 2006010910 metadata/md5-cache/dev-python/pathspec-0.8.0
-2006010910 metadata/md5-cache/dev-python/pathtools-0.1.2-r3
 2006010910 metadata/md5-cache/dev-python/patsy-0.5.1
 2006010910 metadata/md5-cache/dev-python/paver-1.3.4-r1
 2006010910 metadata/md5-cache/dev-python/pbkdf2-1.3
@@ -45335,7 +45313,6 @@
 2006010910 metadata/md5-cache/dev-python/pbr-4.1.1
 2006010910 metadata/md5-cache/dev-python/pbr-4.2.0-r1
 2006010910 metadata/md5-cache/dev-python/pbr-4.2.0-r3
-2006010910 metadata/md5-cache/dev-python/pbr-5.1.1
 2006010910 metadata/md5-cache/dev-python/pbr-5.4.5
 2006010910 metadata/md5-cache/dev-python/pcapy-0.11.2
 2006010910 metadata/md5-cache/dev-python/pdfrw-0.4
@@ -45352,10 +45329,8 @@
 2006010910 metadata/md5-cache/dev-python/pexpect-4.8.0
 2006010910 metadata/md5-cache/dev-python/pgspecial-1.11.9
 2006010910 metadata/md5-cache/dev-python/phonenumbers-8.10.22
-2006010910 metadata/md5-cache/dev-python/phonenumbers-8.12.2
 2006010910 metadata/md5-cache/dev-python/phonenumbers-8.12.4
 2006010910 metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
-2006010910 metadata/md5-cache/dev-python/pickleshare-0.7.5
 2006010910 metadata/md5-cache/dev-python/pid-2.2.5
 2006010910 metadata/md5-cache/dev-python/piexif-1.0.12
 2006010910 metadata/md5-cache/dev-python/piexif-1.1.3
@@ -45369,11 +45344,9 @@
 2006010910 metadata/md5-cache/dev-python/pip-19.3.1-r2
 2006010910 metadata/md5-cache/dev-python/pip-20.0.2
 2006010910 metadata/md5-cache/dev-python/pip-20.1
-2006010910 metadata/md5-cache/dev-python/pip-20.1.1
 2006010910 metadata/md5-cache/dev-python/pip-9.0.1-r2
 2006010910 metadata/md5-cache/dev-python/pipenv-2018.11.26
 2006010910 metadata/md5-cache/dev-python/pipenv-2020.4.1_beta1
-2006010910 metadata/md5-cache/dev-python/pipfile-0.0.2
 2006010910 metadata/md5-cache/dev-python/pkgconfig-1.5.1
 2006010910 metadata/md5-cache/dev-python/pkginfo-1.5.0.1
 2006010910 metadata/md5-cache/dev-python/plotly-1.9.6
@@ -45387,7 +45360,6 @@
 2006010910 metadata/md5-cache/dev-python/pmw-1.3.3-r3
 2006010910 metadata/md5-cache/dev-python/pmw-2.0.1-r2
 2006010910 metadata/md5-cache/dev-python/pocketlint-0.17
-2006010910 metadata/md5-cache/dev-python/pocketlint-0.20
 2006010910 metadata/md5-cache/dev-python/pockets-0.5.1
 2006010910 metadata/md5-cache/dev-python/pockets-0.9.1
 2006010910 metadata/md5-cache/dev-python/podcastparser-0.6.4
@@ -45465,7 +45437,6 @@
 2006010910 metadata/md5-cache/dev-python/pychroot-0.10.1
 2006010910 metadata/md5-cache/dev-python/pychroot-9999
 2006010910 metadata/md5-cache/dev-python/pyclipper-1.1.0
-2006010910 metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1
 2006010910 metadata/md5-cache/dev-python/pycodestyle-2.5.0-r1
 2006010910 metadata/md5-cache/dev-python/pycodestyle-2.6.0
 2006010910 metadata/md5-cache/dev-python/pycollada-0.7.1
@@ -45513,17 +45484,14 @@
 2006010910 metadata/md5-cache/dev-python/pygame-1.9.6-r1
 2006010910 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
 2006010910 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r3
-2006010910 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5
 2006010910 metadata/md5-cache/dev-python/pyghmi-1.5.5
 2006010910 metadata/md5-cache/dev-python/pygit2-1.0.3
-2006010910 metadata/md5-cache/dev-python/pygit2-1.2.1
 2006010910 metadata/md5-cache/dev-python/pyglet-1.2.4
 2006010910 metadata/md5-cache/dev-python/pyglet-1.5.3
 2006010910 metadata/md5-cache/dev-python/pygments-2.5.2
 2006010910 metadata/md5-cache/dev-python/pygments-2.6.1
 2006010910 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
 2006010910 metadata/md5-cache/dev-python/pygpgme-0.3-r1
-2006010910 metadata/md5-cache/dev-python/pygpgme-0.3-r2
 2006010910 metadata/md5-cache/dev-python/pygpu-0.6.7
 2006010910 metadata/md5-cache/dev-python/pygraphviz-1.5
 2006010910 metadata/md5-cache/dev-python/pygresql-5.0.6
@@ -45596,13 +45564,11 @@
 2006010910 metadata/md5-cache/dev-python/pyperclip-1.7.0
 2006010910 metadata/md5-cache/dev-python/pyphen-0.9.4
 2006010910 metadata/md5-cache/dev-python/pyphen-0.9.5
-2006010910 metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
 2006010910 metadata/md5-cache/dev-python/pypiserver-1.3.2
 2006010910 metadata/md5-cache/dev-python/pypng-0.0.20
 2006010910 metadata/md5-cache/dev-python/pypowervm-1.1.20
 2006010910 metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
 2006010910 metadata/md5-cache/dev-python/pyproj-2.4.2-r1
-2006010910 metadata/md5-cache/dev-python/pyproject2setuppy-4
 2006010910 metadata/md5-cache/dev-python/pyproject2setuppy-5
 2006010910 metadata/md5-cache/dev-python/pyproject2setuppy-7
 2006010910 metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
@@ -45610,7 +45576,6 @@
 2006010910 metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
 2006010910 metadata/md5-cache/dev-python/pyqt-distutils-0.3.0
 2006010910 metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r2
-2006010910 metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
 2006010910 metadata/md5-cache/dev-python/pyquery-1.4.1-r1
 2006010910 metadata/md5-cache/dev-python/pyrex-0.9.9-r1
 2006010910 metadata/md5-cache/dev-python/pyrfc3339-1.1
@@ -45644,7 +45609,6 @@
 2006010910 metadata/md5-cache/dev-python/pysvn-1.8.0
 2006010910 metadata/md5-cache/dev-python/pysvn-1.9.11
 2006010910 metadata/md5-cache/dev-python/pytables-3.4.4
-2006010910 metadata/md5-cache/dev-python/pyte-0.8.0-r1
 2006010910 metadata/md5-cache/dev-python/pytest-3.10.1
 2006010910 metadata/md5-cache/dev-python/pytest-4.5.0
 2006010910 metadata/md5-cache/dev-python/pytest-4.6.10
@@ -45655,7 +45619,6 @@
 2006010910 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
 2006010910 metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
 2006010910 metadata/md5-cache/dev-python/pytest-asyncio-0.11.0
-2006010910 metadata/md5-cache/dev-python/pytest-asyncio-0.12.0
 2006010910 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
 2006010910 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
 2006010910 metadata/md5-cache/dev-python/pytest-cov-2.8.1
@@ -45663,7 +45626,6 @@
 2006010910 metadata/md5-cache/dev-python/pytest-django-3.8.0
 2006010910 metadata/md5-cache/dev-python/pytest-django-3.9.0
 2006010910 metadata/md5-cache/dev-python/pytest-expect-1.1.0
-2006010910 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
 2006010910 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0
 2006010910 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
 2006010910 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
@@ -45678,7 +45640,6 @@
 2006010910 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
 2006010910 metadata/md5-cache/dev-python/pytest-mock-1.11.2
 2006010910 metadata/md5-cache/dev-python/pytest-mock-2.0.0
-2006010910 metadata/md5-cache/dev-python/pytest-mock-3.1.0
 2006010910 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
 2006010910 metadata/md5-cache/dev-python/pytest-pylint-0.14.1
 2006010910 metadata/md5-cache/dev-python/pytest-qt-3.3.0
@@ -45688,7 +45649,6 @@
 2006010910 metadata/md5-cache/dev-python/pytest-salt-2020.1.27
 2006010910 metadata/md5-cache/dev-python/pytest-services-2.0.1
 2006010910 metadata/md5-cache/dev-python/pytest-shutil-1.2.11
-2006010910 metadata/md5-cache/dev-python/pytest-shutil-1.7.0
 2006010910 metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
 2006010910 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
 2006010910 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
@@ -45696,7 +45656,6 @@
 2006010910 metadata/md5-cache/dev-python/pytest-timeout-1.3.3
 2006010910 metadata/md5-cache/dev-python/pytest-timeout-1.3.4
 2006010910 metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
-2006010910 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
 2006010910 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
 2006010910 metadata/md5-cache/dev-python/pytest-xdist-1.23.2
 2006010910 metadata/md5-cache/dev-python/pytest-xdist-1.28.0
@@ -45759,7 +45718,6 @@
 2006010910 metadata/md5-cache/dev-python/python-libevdev-0.8
 2006010910 metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
 2006010910 metadata/md5-cache/dev-python/python-ly-0.9.6
-2006010910 metadata/md5-cache/dev-python/python-lzo-1.12-r1
 2006010910 metadata/md5-cache/dev-python/python-magic-0.4.15-r1
 2006010910 metadata/md5-cache/dev-python/python-magic-0.4.18
 2006010910 metadata/md5-cache/dev-python/python-magnumclient-2.12.0
@@ -45792,7 +45750,6 @@
 2006010910 metadata/md5-cache/dev-python/python-slugify-1.2.6
 2006010910 metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
 2006010910 metadata/md5-cache/dev-python/python-stdnum-1.12
-2006010910 metadata/md5-cache/dev-python/python-stdnum-1.13
 2006010910 metadata/md5-cache/dev-python/python-swiftclient-3.7.0
 2006010910 metadata/md5-cache/dev-python/python-systemd-233
 2006010910 metadata/md5-cache/dev-python/python-systemd-234
@@ -45862,7 +45819,6 @@
 2006010910 metadata/md5-cache/dev-python/ratelimit-1.4.1
 2006010910 metadata/md5-cache/dev-python/raven-5.33.0
 2006010910 metadata/md5-cache/dev-python/rdflib-4.2.2-r1
-2006010910 metadata/md5-cache/dev-python/readme_renderer-25.0
 2006010910 metadata/md5-cache/dev-python/readme_renderer-26.0
 2006010910 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-1.0.3
 2006010910 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-1.0.4
@@ -45910,10 +45866,8 @@
 2006010910 metadata/md5-cache/dev-python/retry-decorator-1.0.0-r1
 2006010910 metadata/md5-cache/dev-python/retry-decorator-1.1.1
 2006010910 metadata/md5-cache/dev-python/retrying-1.3.3
-2006010910 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
 2006010910 metadata/md5-cache/dev-python/rfc3986-1.2.0
 2006010910 metadata/md5-cache/dev-python/rfc3986-1.3.2
-2006010910 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
 2006010910 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
 2006010910 metadata/md5-cache/dev-python/robotbackgroundlogger-1.2
 2006010910 metadata/md5-cache/dev-python/robotframework-3.0.4
@@ -45960,7 +45914,6 @@
 2006010910 metadata/md5-cache/dev-python/seaborn-0.10.0
 2006010910 metadata/md5-cache/dev-python/secretstorage-3.1.1
 2006010910 metadata/md5-cache/dev-python/secretstorage-3.1.1-r1
-2006010910 metadata/md5-cache/dev-python/secretstorage-3.1.2
 2006010910 metadata/md5-cache/dev-python/selectors34-1.2
 2006010910 metadata/md5-cache/dev-python/selenium-3.141.0-r1
 2006010910 metadata/md5-cache/dev-python/semantic_version-2.8.4
@@ -46038,7 +45991,6 @@
 2006010910 metadata/md5-cache/dev-python/sphinx-3.0.3
 2006010910 metadata/md5-cache/dev-python/sphinx-3.0.4
 2006010910 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.5
-2006010910 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
 2006010910 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
 2006010910 metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
 2006010910 metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
@@ -46120,7 +46072,6 @@
 2006010910 metadata/md5-cache/dev-python/stomper-0.3.0
 2006010910 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
 2006010910 metadata/md5-cache/dev-python/stripe-2.43.0
-2006010910 metadata/md5-cache/dev-python/stripe-2.46.0
 2006010910 metadata/md5-cache/dev-python/subprocess32-3.5.4
 2006010910 metadata/md5-cache/dev-python/subunit-1.2.0-r1
 2006010910 metadata/md5-cache/dev-python/subunit-1.4.0
@@ -46149,7 +46100,6 @@
 2006010910 metadata/md5-cache/dev-python/tenacity-4.8.0
 2006010910 metadata/md5-cache/dev-python/tenacity-6.1.0
 2006010910 metadata/md5-cache/dev-python/termcolor-1.1.0-r1
-2006010910 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
 2006010910 metadata/md5-cache/dev-python/terminado-0.8.1
 2006010910 metadata/md5-cache/dev-python/terminado-0.8.3
 2006010910 metadata/md5-cache/dev-python/terminaltables-3.1.0
@@ -46183,7 +46133,6 @@
 2006010910 metadata/md5-cache/dev-python/toolz-0.9.0
 2006010910 metadata/md5-cache/dev-python/tooz-1.60.1
 2006010910 metadata/md5-cache/dev-python/toro-1.0.1
-2006010910 metadata/md5-cache/dev-python/towncrier-19.2.0
 2006010910 metadata/md5-cache/dev-python/tox-2.9.1
 2006010910 metadata/md5-cache/dev-python/tox-3.12.1
 2006010910 metadata/md5-cache/dev-python/tox-3.14.4
@@ -46194,7 +46143,6 @@
 2006010910 metadata/md5-cache/dev-python/tqdm-4.23.3
 2006010910 metadata/md5-cache/dev-python/tqdm-4.33.0
 2006010910 metadata/md5-cache/dev-python/tqdm-4.40.0
-2006010910 metadata/md5-cache/dev-python/tqdm-4.45.0
 2006010910 metadata/md5-cache/dev-python/tqdm-4.46.0
 2006010910 metadata/md5-cache/dev-python/tqdm-9999
 2006010910 metadata/md5-cache/dev-python/traceback2-1.4.0
@@ -46211,12 +46159,6 @@
 2006010910 metadata/md5-cache/dev-python/tvdb_api-1.10_pre20150406-r1
 2006010910 metadata/md5-cache/dev-python/tvdb_api-2.0
 2006010910 metadata/md5-cache/dev-python/tvdb_api-2.0-r1
-2006010910 metadata/md5-cache/dev-python/twine-1.15.0
-2006010910 metadata/md5-cache/dev-python/twine-3.1.1
-2006010910 metadata/md5-cache/dev-python/twisted-16.6.0-r3
-2006010910 metadata/md5-cache/dev-python/twisted-18.4.0
-2006010910 metadata/md5-cache/dev-python/twisted-19.10.0
-2006011209 metadata/md5-cache/dev-python/twisted-20.3.0
 2006010910 metadata/md5-cache/dev-python/twython-3.7.0
 2006010910 metadata/md5-cache/dev-python/txAMQP-0.8.2
 2006010910 metadata/md5-cache/dev-python/txaio-2.9.0
@@ -46240,7 +46182,6 @@
 2006010910 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
 2006010910 metadata/md5-cache/dev-python/unidecode-0.04.21
 2006010910 metadata/md5-cache/dev-python/unidecode-1.1.1
-2006010910 metadata/md5-cache/dev-python/unittest-mixins-1.6
 2006010910 metadata/md5-cache/dev-python/unittest2-1.1.0
 2006010910 metadata/md5-cache/dev-python/urdf_parser_py-0.4.1
 2006010910 metadata/md5-cache/dev-python/urdf_parser_py-0.4.3
@@ -46250,7 +46191,6 @@
 2006010910 metadata/md5-cache/dev-python/urllib3-1.24.2
 2006010910 metadata/md5-cache/dev-python/urllib3-1.25.8
 2006010910 metadata/md5-cache/dev-python/urllib3-1.25.9
-2006010910 metadata/md5-cache/dev-python/urwid-2.1.0
 2006010910 metadata/md5-cache/dev-python/urwidtrees-1.0.2-r1
 2006010910 metadata/md5-cache/dev-python/utidylib-0.6
 2006010910 metadata/md5-cache/dev-python/uvloop-0.14.0
@@ -46265,10 +46205,8 @@
 2006010910 metadata/md5-cache/dev-python/versioneer-0.18-r1
 2006010910 metadata/md5-cache/dev-python/vine-1.3.0
 2006010910 metadata/md5-cache/dev-python/virtualenv-16.0.0
-2006010910 metadata/md5-cache/dev-python/virtualenv-16.7.10
 2006010910 metadata/md5-cache/dev-python/virtualenv-16.7.9-r1
 2006010910 metadata/md5-cache/dev-python/virtualenv-20.0.18
-2006010910 metadata/md5-cache/dev-python/virtualenv-20.0.21
 2006010910 metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
 2006010910 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
 2006010910 metadata/md5-cache/dev-python/visitor-0.1.3
@@ -46283,7 +46221,6 @@
 2006010910 metadata/md5-cache/dev-python/watchdog-0.8.3-r2
 2006010910 metadata/md5-cache/dev-python/watchdog-0.9.0-r1
 2006010910 metadata/md5-cache/dev-python/wcwidth-0.1.8
-2006010910 metadata/md5-cache/dev-python/wcwidth-0.1.9
 2006010910 metadata/md5-cache/dev-python/weasyprint-51
 2006010910 metadata/md5-cache/dev-python/webassets-2.0
 2006010910 metadata/md5-cache/dev-python/webcolors-1.10
@@ -46307,7 +46244,6 @@
 2006010910 metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
 2006010910 metadata/md5-cache/dev-python/widgetsnbextension-3.4.2
 2006010910 metadata/md5-cache/dev-python/wrapt-1.11.2-r1
-2006010910 metadata/md5-cache/dev-python/wrapt-1.12.1
 2006010910 metadata/md5-cache/dev-python/ws4py-0.3.4-r1
 2006010910 metadata/md5-cache/dev-python/ws4py-0.5.1
 2006010910 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
@@ -46321,7 +46257,6 @@
 2006010910 metadata/md5-cache/dev-python/wurlitzer-2.0.0
 2006010910 metadata/md5-cache/dev-python/www-authenticate-0.9.2
 2006010910 metadata/md5-cache/dev-python/wxpython-3.0.2.0
-2006010910 metadata/md5-cache/dev-python/wxpython-4.0.7
 2006010910 metadata/md5-cache/dev-python/xapp-2.0.1
 2006010910 metadata/md5-cache/dev-python/xarray-0.12.1
 2006010910 metadata/md5-cache/dev-python/xcffib-0.9.0
@@ -46339,11 +46274,9 @@
 2006010910 metadata/md5-cache/dev-python/yapf-0.28.0
 2006010910 metadata/md5-cache/dev-python/yapf-0.30.0
 2006010910 metadata/md5-cache/dev-python/yappi-1.0
-2006010910 metadata/md5-cache/dev-python/yappi-1.2.5
 2006010910 metadata/md5-cache/dev-python/yapsy-1.12.2
 2006010910 metadata/md5-cache/dev-python/yaql-1.1.3
 2006010910 metadata/md5-cache/dev-python/yarl-1.3.0
-2006011009 metadata/md5-cache/dev-python/yarl-1.4.2
 2006010910 metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
 2006010910 metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
 2006010910 metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -46368,10 +46301,143 @@
 2006010910 metadata/md5-cache/dev-python/zstandard-0.12.0
 2006010910 metadata/md5-cache/dev-python/zstandard-0.13.0
 2006010910 metadata/md5-cache/dev-python/zstandard-0.8.1
-2006011639 metadata/md5-cache/dev-python/Manifest.gz
 2006011639 metadata/md5-cache/dev-python/bluelet-0.2.0
 2006011639 metadata/md5-cache/dev-python/python-mpd-1.0.0
-2006011438 metadata/md5-cache/dev-python/testpath-0.4.4-r1
+2006041239 metadata/md5-cache/dev-python/Manifest.gz
+2006021039 metadata/md5-cache/dev-python/Rx-3.1.0
+2006012009 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
+2006031009 metadata/md5-cache/dev-python/argh-0.26.2-r2
+2006012238 metadata/md5-cache/dev-python/async_generator-1.10
+2006030139 metadata/md5-cache/dev-python/autobahn-20.4.3
+2006012238 metadata/md5-cache/dev-python/awscli-1.18.70
+2006030139 metadata/md5-cache/dev-python/black-19.10_beta0
+2006021508 metadata/md5-cache/dev-python/blessings-1.7-r1
+2006012238 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
+2006012238 metadata/md5-cache/dev-python/botocore-1.16.20
+2006032039 metadata/md5-cache/dev-python/bpython-0.19
+2006040939 metadata/md5-cache/dev-python/bsddb3-6.2.7
+2006040939 metadata/md5-cache/dev-python/cangjie-1.3
+2006040939 metadata/md5-cache/dev-python/chai-1.1.2
+2006012338 metadata/md5-cache/dev-python/click-default-group-1.2.2
+2006020009 metadata/md5-cache/dev-python/click-plugins-1.0.3
+2006040939 metadata/md5-cache/dev-python/contextvars-2.4
+2006040939 metadata/md5-cache/dev-python/coverage-4.5.4
+2006031039 metadata/md5-cache/dev-python/coverage-5.0.3
+2006031039 metadata/md5-cache/dev-python/coverage-5.1
+2006012338 metadata/md5-cache/dev-python/cppy-1.1.0
+2006012338 metadata/md5-cache/dev-python/csv23-0.3.2
+2006021508 metadata/md5-cache/dev-python/curtsies-0.3.0-r2
+2006032309 metadata/md5-cache/dev-python/defcon-0.6.0-r1
+2006040039 metadata/md5-cache/dev-python/distlib-0.3.0
+2006031839 metadata/md5-cache/dev-python/distro-1.5.0
+2006040939 metadata/md5-cache/dev-python/django-2.2.13
+2006040939 metadata/md5-cache/dev-python/django-3.0.7
+2006041239 metadata/md5-cache/dev-python/eyeD3-0.8.11
+2006030139 metadata/md5-cache/dev-python/flatbuffers-1.12
+2006040939 metadata/md5-cache/dev-python/fs-2.4.9-r1
+2006040939 metadata/md5-cache/dev-python/greenlet-0.4.15-r1
+2006032338 metadata/md5-cache/dev-python/httplib2-0.18.1
+2006040939 metadata/md5-cache/dev-python/immutables-0.11
+2006031009 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+2006031009 metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
+2006012338 metadata/md5-cache/dev-python/jaraco-envs-1.0.1
+2006032039 metadata/md5-cache/dev-python/jedi-0.17.0
+2006040939 metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
+2006040939 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+2006040939 metadata/md5-cache/dev-python/jsonschema-3.2.0
+2006041108 metadata/md5-cache/dev-python/kaitaistruct-0.8
+2006012009 metadata/md5-cache/dev-python/keyring-21.2.1
+2006012338 metadata/md5-cache/dev-python/kiwisolver-1.2.0
+2006020209 metadata/md5-cache/dev-python/klein-19.6.0
+2006040939 metadata/md5-cache/dev-python/logutils-0.3.5
+2006040939 metadata/md5-cache/dev-python/mamba-0.11.0
+2006012338 metadata/md5-cache/dev-python/matplotlib-3.2.1
+2006031839 metadata/md5-cache/dev-python/minidb-2.0.3
+2006041239 metadata/md5-cache/dev-python/misaka-1.0.2
+2006040039 metadata/md5-cache/dev-python/multidict-4.7.6
+2006032309 metadata/md5-cache/dev-python/munch-2.5.0-r1
+2006040639 metadata/md5-cache/dev-python/nautilus-python-1.2.3
+2006021438 metadata/md5-cache/dev-python/nltk-3.5
+2006041239 metadata/md5-cache/dev-python/notebook-5.0.0
+2006041239 metadata/md5-cache/dev-python/notebook-5.2.1
+2006041239 metadata/md5-cache/dev-python/notebook-5.7.8
+2006012238 metadata/md5-cache/dev-python/nototools-0_pre20200207
+2006031839 metadata/md5-cache/dev-python/numpy-1.17.4-r3
+2006040939 metadata/md5-cache/dev-python/numpy-1.18.3
+2006040939 metadata/md5-cache/dev-python/numpy-1.18.5
+2006031839 metadata/md5-cache/dev-python/numpy-python2-1.16.6
+2006012338 metadata/md5-cache/dev-python/numpydoc-0.9.2
+2006022209 metadata/md5-cache/dev-python/oslo-cache-2.3.0
+2006022209 metadata/md5-cache/dev-python/oslo-concurrency-4.0.2
+2006022209 metadata/md5-cache/dev-python/oslo-config-8.0.2
+2006022209 metadata/md5-cache/dev-python/oslo-db-8.1.0
+2006022209 metadata/md5-cache/dev-python/oslo-log-4.1.2
+2006022209 metadata/md5-cache/dev-python/oslo-middleware-4.0.2
+2006022209 metadata/md5-cache/dev-python/oslo-serialization-3.1.1
+2006022209 metadata/md5-cache/dev-python/oslo-service-2.1.1
+2006022209 metadata/md5-cache/dev-python/oslo-upgradecheck-1.0.1
+2006022209 metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2
+2006031839 metadata/md5-cache/dev-python/parso-0.7.0
+2006031009 metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+2006040939 metadata/md5-cache/dev-python/pbr-5.1.1
+2006040939 metadata/md5-cache/dev-python/phonenumbers-8.12.2
+2006040939 metadata/md5-cache/dev-python/pickleshare-0.7.5
+2006012338 metadata/md5-cache/dev-python/pip-20.1.1
+2006031009 metadata/md5-cache/dev-python/pipfile-0.0.2
+2006020009 metadata/md5-cache/dev-python/pluginbase-1.0.0
+2006040939 metadata/md5-cache/dev-python/pocketlint-0.20
+2006032239 metadata/md5-cache/dev-python/pybind11-2.5.0
+2006012238 metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1
+2006040939 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5
+2006040939 metadata/md5-cache/dev-python/pygit2-1.2.1
+2006031839 metadata/md5-cache/dev-python/pygobject-3.34.0
+2006032309 metadata/md5-cache/dev-python/pygpgme-0.3-r2
+2006040939 metadata/md5-cache/dev-python/pygtk-2.24.0-r5
+2006012338 metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
+2006031839 metadata/md5-cache/dev-python/pyproject2setuppy-4
+2006040939 metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
+2006021508 metadata/md5-cache/dev-python/pyte-0.8.0-r1
+2006031009 metadata/md5-cache/dev-python/pytest-5.4.3
+2006012238 metadata/md5-cache/dev-python/pytest-asyncio-0.12.0
+2006040939 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+2006031009 metadata/md5-cache/dev-python/pytest-mock-3.1.0
+2006032309 metadata/md5-cache/dev-python/pytest-shutil-1.7.0
+2006032309 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
+2006032009 metadata/md5-cache/dev-python/python-dotenv-0.13.0
+2006040939 metadata/md5-cache/dev-python/python-lzo-1.12-r1
+2006040939 metadata/md5-cache/dev-python/python-stdnum-1.13
+2006041239 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+2006041239 metadata/md5-cache/dev-python/python_orocos_kdl-9999
+2006012338 metadata/md5-cache/dev-python/readme_renderer-25.0
+2006022139 metadata/md5-cache/dev-python/responses-0.10.14
+2006040939 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+2006040939 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+2006012009 metadata/md5-cache/dev-python/secretstorage-3.1.2
+2006040939 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+2006040939 metadata/md5-cache/dev-python/stripe-2.46.0
+2006032309 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+2006040939 metadata/md5-cache/dev-python/testpath-0.4.4-r1
+2006012338 metadata/md5-cache/dev-python/towncrier-19.2.0
+2006012338 metadata/md5-cache/dev-python/tqdm-4.45.0
+2006031709 metadata/md5-cache/dev-python/tqdm-4.46.1
+2006020209 metadata/md5-cache/dev-python/tubes-0.2.0
+2006012338 metadata/md5-cache/dev-python/twine-1.15.0
+2006012338 metadata/md5-cache/dev-python/twine-3.1.1
+2006040939 metadata/md5-cache/dev-python/twisted-19.10.0
+2006031839 metadata/md5-cache/dev-python/twisted-20.3.0
+2006032009 metadata/md5-cache/dev-python/ujson-3.0.0
+2006040939 metadata/md5-cache/dev-python/unittest-mixins-1.6
+2006032039 metadata/md5-cache/dev-python/urwid-2.1.0
+2006012338 metadata/md5-cache/dev-python/virtualenv-16.7.10
+2006040039 metadata/md5-cache/dev-python/virtualenv-20.0.21
+2006021009 metadata/md5-cache/dev-python/waitress-1.4.4
+2006031009 metadata/md5-cache/dev-python/watchdog-0.10.2
+2006031839 metadata/md5-cache/dev-python/wcwidth-0.1.9
+2006031109 metadata/md5-cache/dev-python/wcwidth-0.2.2-r1
+2006040039 metadata/md5-cache/dev-python/wrapt-1.12.1
+2006030139 metadata/md5-cache/dev-python/wxpython-4.0.7
+2006040939 metadata/md5-cache/dev-python/yappi-1.2.5
+2006040039 metadata/md5-cache/dev-python/yarl-1.4.2
 2005201639 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239
 2005262139 metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
 2005260027 metadata/md5-cache/dev-qt/qtchooser-66
@@ -46382,7 +46448,6 @@
 2005281509 metadata/md5-cache/dev-qt/qt-creator-4.12.0
 2005281509 metadata/md5-cache/dev-qt/qt-creator-4.8.2
 2005281509 metadata/md5-cache/dev-qt/qt-creator-9999
-2005310009 metadata/md5-cache/dev-qt/Manifest.gz
 2005310009 metadata/md5-cache/dev-qt/assistant-5.14.2
 2005310009 metadata/md5-cache/dev-qt/assistant-5.15.0
 2005310009 metadata/md5-cache/dev-qt/designer-5.14.2
@@ -46413,8 +46478,6 @@
 2005310009 metadata/md5-cache/dev-qt/qtdatavis3d-5.15.0
 2005310009 metadata/md5-cache/dev-qt/qtdbus-5.14.2
 2005310009 metadata/md5-cache/dev-qt/qtdbus-5.15.0
-2005310009 metadata/md5-cache/dev-qt/qtdeclarative-5.14.2
-2005310009 metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
 2005310009 metadata/md5-cache/dev-qt/qtdeclarative-5.15.0
 2005310009 metadata/md5-cache/dev-qt/qtdiag-5.14.2
 2005310009 metadata/md5-cache/dev-qt/qtdiag-5.15.0
@@ -46490,6 +46553,8 @@
 2005310009 metadata/md5-cache/dev-qt/qtxml-5.15.0
 2005310009 metadata/md5-cache/dev-qt/qtxmlpatterns-5.14.2
 2005310009 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.0
+2006032209 metadata/md5-cache/dev-qt/Manifest.gz
+2006032209 metadata/md5-cache/dev-qt/qtdeclarative-5.14.2-r2
 2005260440 metadata/md5-cache/dev-ros/Manifest.gz
 2005260440 metadata/md5-cache/dev-ros/actionlib-1.11.13
 2005260440 metadata/md5-cache/dev-ros/actionlib-1.11.14
@@ -47842,8 +47907,6 @@
 2005260440 metadata/md5-cache/dev-ros/xacro-9999
 2005260440 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
 2005260440 metadata/md5-cache/dev-ros/xmlrpcpp-9999
-2005102009 metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
-2005102009 metadata/md5-cache/dev-ruby/puppetdb-termini-6.9.1
 2005260027 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 2005260027 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
 2005260027 metadata/md5-cache/dev-ruby/acme-client-2.0.4
@@ -48214,9 +48277,6 @@
 2005260027 metadata/md5-cache/dev-ruby/flexmock-2.3.6
 2005260027 metadata/md5-cache/dev-ruby/flickraw-0.9.10
 2005260027 metadata/md5-cache/dev-ruby/flickraw-0.9.9
-2005260027 metadata/md5-cache/dev-ruby/flog-4.6.2
-2005260027 metadata/md5-cache/dev-ruby/flog-4.6.3
-2005260027 metadata/md5-cache/dev-ruby/flog-4.6.4
 2005260027 metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
 2005260027 metadata/md5-cache/dev-ruby/forgery-0.7.0
 2005260027 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
@@ -48981,7 +49041,6 @@
 2005260027 metadata/md5-cache/dev-ruby/spring-2.0.2
 2005260027 metadata/md5-cache/dev-ruby/spring-2.1.0
 2005260027 metadata/md5-cache/dev-ruby/sprockets-3.7.2
-2005260027 metadata/md5-cache/dev-ruby/sprockets-rails-3.2.1
 2005260027 metadata/md5-cache/dev-ruby/spy-1.0.0
 2005260027 metadata/md5-cache/dev-ruby/sqlite3-1.3.13
 2005260027 metadata/md5-cache/dev-ruby/sqlite3-1.4.1
@@ -49082,7 +49141,6 @@
 2005260027 metadata/md5-cache/dev-ruby/tzinfo-2.0.2
 2005260027 metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
 2005260027 metadata/md5-cache/dev-ruby/uglifier-4.1.20
-2005260027 metadata/md5-cache/dev-ruby/uglifier-4.2.0
 2005260027 metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
 2005260027 metadata/md5-cache/dev-ruby/unf-0.1.4
 2005260027 metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
@@ -49110,7 +49168,6 @@
 2005260027 metadata/md5-cache/dev-ruby/websocket-driver-0.7.0
 2005260027 metadata/md5-cache/dev-ruby/websocket-driver-0.7.1
 2005260027 metadata/md5-cache/dev-ruby/websocket-driver-0.7.2
-2005260027 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.3
 2005260027 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.4
 2005260027 metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2
 2005260027 metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
@@ -49142,7 +49199,6 @@
 2005260027 metadata/md5-cache/dev-ruby/zentest-4.12.0
 2005300809 metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
 2005300809 metadata/md5-cache/dev-ruby/hocon-1.3.1
-2006010838 metadata/md5-cache/dev-ruby/Manifest.gz
 2006010808 metadata/md5-cache/dev-ruby/actionview-6.0.3.1
 2005311139 metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
 2005302039 metadata/md5-cache/dev-ruby/facter-3.14.10
@@ -49161,6 +49217,18 @@
 2005302209 metadata/md5-cache/dev-ruby/rexml-3.2.4
 2006010808 metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
 2006010808 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
+2006041239 metadata/md5-cache/dev-ruby/Manifest.gz
+2006020809 metadata/md5-cache/dev-ruby/coderay-1.1.3
+2006030939 metadata/md5-cache/dev-ruby/connection_pool-2.2.3
+2006030939 metadata/md5-cache/dev-ruby/ffi-1.13.0
+2006041239 metadata/md5-cache/dev-ruby/flog-4.6.2
+2006041239 metadata/md5-cache/dev-ruby/flog-4.6.3
+2006041239 metadata/md5-cache/dev-ruby/flog-4.6.4
+2006040739 metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
+2006020339 metadata/md5-cache/dev-ruby/puppetdb-termini-6.10.0
+2006020809 metadata/md5-cache/dev-ruby/sprockets-rails-3.2.1
+2006020809 metadata/md5-cache/dev-ruby/uglifier-4.2.0
+2006040739 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -49453,7 +49521,6 @@
 1702282321 metadata/md5-cache/dev-util/complexity-1.10
 1910161209 metadata/md5-cache/dev-util/confix-wrapper-1
 1910071309 metadata/md5-cache/dev-util/cproto-4.7o
-1910210509 metadata/md5-cache/dev-util/crash-7.2.7
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.3.0
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.3.1
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.4.0
@@ -49469,7 +49536,6 @@
 1702282322 metadata/md5-cache/dev-util/linklint-2.3.5
 1911050009 metadata/md5-cache/dev-util/lsuio-0.2.0-r1
 1907310209 metadata/md5-cache/dev-util/makepp-2.0.99.2
-1702282322 metadata/md5-cache/dev-util/molecule-2
 1705260009 metadata/md5-cache/dev-util/open-vcdiff-0.8.4-r1
 1903190209 metadata/md5-cache/dev-util/packer-1.3.5
 1904162139 metadata/md5-cache/dev-util/packer-1.4.0
@@ -49516,7 +49582,6 @@
 2002112051 metadata/md5-cache/dev-util/makepp-2.0.99.1
 2002112051 metadata/md5-cache/dev-util/ostree-2018.9
 2002112051 metadata/md5-cache/dev-util/shadowman-9999
-2002161739 metadata/md5-cache/dev-util/crash-7.2.8
 2002182239 metadata/md5-cache/dev-util/appinventor-1.1
 2002182239 metadata/md5-cache/dev-util/bin_replace_string-0.2
 2002182239 metadata/md5-cache/dev-util/dmake-4.12.2
@@ -49571,14 +49636,7 @@
 2004032241 metadata/md5-cache/dev-util/treecc-0.3.10-r1
 2004032241 metadata/md5-cache/dev-util/xdelta-3.0.11
 2004032241 metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
-2004041909 metadata/md5-cache/dev-util/bingrep-0.8.2
-2004041909 metadata/md5-cache/dev-util/cargo-c-0.6.2
-2004041909 metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
-2004041909 metadata/md5-cache/dev-util/cargo-tree-0.28.0
 2004051009 metadata/md5-cache/dev-util/goland-2019.3.4
-2004041909 metadata/md5-cache/dev-util/sccache-0.2.12
-2004041909 metadata/md5-cache/dev-util/sccache-0.2.13
-2004041909 metadata/md5-cache/dev-util/wasmer-0.11.0
 2004060109 metadata/md5-cache/dev-util/sgb-20030623-r1
 2004060109 metadata/md5-cache/dev-util/sgb-20090810
 2004071339 metadata/md5-cache/dev-util/ccache-3.7.7-r1
@@ -49598,17 +49656,13 @@
 2004211339 metadata/md5-cache/dev-util/re2c-1.3-r1
 2004211009 metadata/md5-cache/dev-util/shadowman-2
 2004211009 metadata/md5-cache/dev-util/shflags-1.0.3
-2004251309 metadata/md5-cache/dev-util/stripe-mock-0.88.0
 2005011639 metadata/md5-cache/dev-util/byacc-20200330
 2005010209 metadata/md5-cache/dev-util/cloc-1.84
 2005011209 metadata/md5-cache/dev-util/lcov-1.14_p2
 2005012139 metadata/md5-cache/dev-util/checkbashisms-2.20.3
 2005042309 metadata/md5-cache/dev-util/abootimg-20150323
 2005060009 metadata/md5-cache/dev-util/byacc-20191125
-2005090009 metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
-2005090009 metadata/md5-cache/dev-util/cargo-tree-0.29.0
 2005131639 metadata/md5-cache/dev-util/clion-2020.1.1
-2005132039 metadata/md5-cache/dev-util/gtk-doc-am-1.32
 2005131809 metadata/md5-cache/dev-util/kubebuilder-2.3.1
 2005131639 metadata/md5-cache/dev-util/netsurf-buildsystem-1.8-r1
 2005150039 metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
@@ -49616,7 +49670,6 @@
 2005161339 metadata/md5-cache/dev-util/pkgdiff-9999
 2005210809 metadata/md5-cache/dev-util/webhook-2.7.0
 2005220239 metadata/md5-cache/dev-util/idea-community-2020.1.1.201.7223.91-r2
-2005240109 metadata/md5-cache/dev-util/cbindgen-0.14.2
 2005241109 metadata/md5-cache/dev-util/cpptest-2.0.0-r1
 2005260027 metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
 2005260027 metadata/md5-cache/dev-util/ald-0.1.7-r2
@@ -49683,7 +49736,6 @@
 2005260027 metadata/md5-cache/dev-util/bpftrace-0.9.4
 2005260027 metadata/md5-cache/dev-util/bpftrace-9999
 2005260027 metadata/md5-cache/dev-util/bsdiff-4.3-r4
-2005260027 metadata/md5-cache/dev-util/btyacc-3.0-r3
 2005260027 metadata/md5-cache/dev-util/bustle-0.4.2-r1
 2005260027 metadata/md5-cache/dev-util/bustle-0.4.7-r1
 2005260027 metadata/md5-cache/dev-util/bustle-0.5.4
@@ -49784,7 +49836,6 @@
 2005260027 metadata/md5-cache/dev-util/glade-3.22.2
 2005260027 metadata/md5-cache/dev-util/glib-utils-2.60.7
 2005260027 metadata/md5-cache/dev-util/glib-utils-2.62.5
-2005260027 metadata/md5-cache/dev-util/glib-utils-2.62.6
 2005260027 metadata/md5-cache/dev-util/glib-utils-2.64.3
 2005260027 metadata/md5-cache/dev-util/global-6.3.1
 2005260027 metadata/md5-cache/dev-util/global-6.5.7
@@ -49804,7 +49855,6 @@
 2005260027 metadata/md5-cache/dev-util/gprof2dot-2013.05.17
 2005260027 metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
 2005260027 metadata/md5-cache/dev-util/gtk-doc-1.25-r1
-2005260027 metadata/md5-cache/dev-util/gtk-doc-1.32-r1
 2005260027 metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.16
 2005260027 metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
 2005260027 metadata/md5-cache/dev-util/heaptrack-9999
@@ -49835,12 +49885,9 @@
 2005260027 metadata/md5-cache/dev-util/kcov-9999
 2005260027 metadata/md5-cache/dev-util/kdbg-3.0.1
 2005260027 metadata/md5-cache/dev-util/kdevelop-5.4.6
-2005260027 metadata/md5-cache/dev-util/kdevelop-5.5.1
 2005260027 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
 2005260027 metadata/md5-cache/dev-util/kdevelop-php-5.4.6
-2005260027 metadata/md5-cache/dev-util/kdevelop-php-5.5.1
 2005260027 metadata/md5-cache/dev-util/kdevelop-python-5.4.6
-2005260027 metadata/md5-cache/dev-util/kdevelop-python-5.5.1
 2005260027 metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
 2005260027 metadata/md5-cache/dev-util/kdstatemachineeditor-9999
 2005260027 metadata/md5-cache/dev-util/kernelshark-1.0
@@ -49870,8 +49917,6 @@
 2005260027 metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r3
 2005260027 metadata/md5-cache/dev-util/mingw64-runtime-7.0.0
 2005260027 metadata/md5-cache/dev-util/mingw64-runtime-7.0.0-r1
-2005260027 metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
-2005260027 metadata/md5-cache/dev-util/molecule-plugins-1.0.3
 2005260027 metadata/md5-cache/dev-util/mutrace-0.2-r1
 2005260027 metadata/md5-cache/dev-util/nemiver-0.9.6
 2005260027 metadata/md5-cache/dev-util/ninja-1.10.0
@@ -49925,7 +49970,6 @@
 2005260027 metadata/md5-cache/dev-util/pkgconfig-0.29.1
 2005260027 metadata/md5-cache/dev-util/pkgconfig-0.29.2
 2005260027 metadata/md5-cache/dev-util/pkgconfig-9999
-2005260027 metadata/md5-cache/dev-util/plan9port-20140306-r4
 2005260027 metadata/md5-cache/dev-util/ply-2.1.1
 2005260027 metadata/md5-cache/dev-util/premake-4.3-r1
 2005260027 metadata/md5-cache/dev-util/pscan-20000721-r1
@@ -50016,7 +50060,6 @@
 2005260027 metadata/md5-cache/dev-util/statifier-1.7.4
 2005260027 metadata/md5-cache/dev-util/strace-5.3
 2005260027 metadata/md5-cache/dev-util/strace-5.4
-2005260027 metadata/md5-cache/dev-util/strace-5.5
 2005260027 metadata/md5-cache/dev-util/strace-5.6
 2005260027 metadata/md5-cache/dev-util/strace-9999
 2005260027 metadata/md5-cache/dev-util/stressapptest-1.0.9
@@ -50107,45 +50150,17 @@
 2005281509 metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.0.1
 2005281509 metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.1.1
 2005290109 metadata/md5-cache/dev-util/valgrind-3.16.0
-2005291109 metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
 2005291209 metadata/md5-cache/dev-util/codeblocks-9999
 2005291209 metadata/md5-cache/dev-util/jenkins-bin-2.222.4
 2005291209 metadata/md5-cache/dev-util/kbuild-9999
 2005301139 metadata/md5-cache/dev-util/cmake-3.17.3
-2006011238 metadata/md5-cache/dev-util/Manifest.gz
-2006010910 metadata/md5-cache/dev-util/buildbot-0.9.12-r1
-2006010910 metadata/md5-cache/dev-util/buildbot-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-9999
-2006010910 metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
-2006010910 metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-console-view-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
-2006010910 metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
-2006010910 metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-pkg-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
-2006010910 metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-worker-0.9.12
-2006010910 metadata/md5-cache/dev-util/buildbot-worker-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-worker-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-worker-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-worker-9999
-2006010910 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
-2006010910 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0
-2006010910 metadata/md5-cache/dev-util/buildbot-www-0.9.12
-2006010910 metadata/md5-cache/dev-util/buildbot-www-1.1.2
-2006010910 metadata/md5-cache/dev-util/buildbot-www-1.3.0
 2006010910 metadata/md5-cache/dev-util/buildbot-www-2.7.0
 2006010910 metadata/md5-cache/dev-util/catalyst-3.0.12
 2006010910 metadata/md5-cache/dev-util/catalyst-3.0.9
@@ -50178,7 +50193,6 @@
 2006010910 metadata/md5-cache/dev-util/diffoscope-146
 2006010910 metadata/md5-cache/dev-util/distro-info-0.22
 2006010910 metadata/md5-cache/dev-util/dogtail-0.9.10
-2006010910 metadata/md5-cache/dev-util/dogtail-0.9.11
 2006010910 metadata/md5-cache/dev-util/dput-ng-1.28-r1
 2006010910 metadata/md5-cache/dev-util/flawfinder-2.0.10
 2006010910 metadata/md5-cache/dev-util/flawfinder-2.0.11
@@ -50187,7 +50201,6 @@
 2006010910 metadata/md5-cache/dev-util/gcovr-4.2
 2006010910 metadata/md5-cache/dev-util/gdbus-codegen-2.60.7
 2006010910 metadata/md5-cache/dev-util/gdbus-codegen-2.62.5
-2006010910 metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
 2006010910 metadata/md5-cache/dev-util/gdbus-codegen-2.64.3
 2006010910 metadata/md5-cache/dev-util/gertty-1.6.0-r1
 2006010910 metadata/md5-cache/dev-util/gertty-9999
@@ -50234,7 +50247,49 @@
 2006010910 metadata/md5-cache/dev-util/wstool-0.1.18
 2006010910 metadata/md5-cache/dev-util/wstool-9999
 2006010910 metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
-2006010910 metadata/md5-cache/dev-util/ydiff-1.1
+2006041239 metadata/md5-cache/dev-util/Manifest.gz
+2006021209 metadata/md5-cache/dev-util/bingrep-0.8.2
+2006041239 metadata/md5-cache/dev-util/btyacc-3.0-r3
+2006020209 metadata/md5-cache/dev-util/buildbot-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-9999
+2006020209 metadata/md5-cache/dev-util/buildbot-badges-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-console-view-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-pkg-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-worker-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-worker-9999
+2006020209 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.0
+2006020209 metadata/md5-cache/dev-util/buildbot-www-2.8.0
+2006021209 metadata/md5-cache/dev-util/cargo-c-0.6.2
+2006021209 metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
+2006021209 metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
+2006021209 metadata/md5-cache/dev-util/cargo-tree-0.28.0
+2006021209 metadata/md5-cache/dev-util/cargo-tree-0.29.0
+2006021209 metadata/md5-cache/dev-util/cbindgen-0.14.2
+2006030609 metadata/md5-cache/dev-util/crash-7.2.8-r1
+2006040939 metadata/md5-cache/dev-util/dogtail-0.9.11
+2006031839 metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
+2006031839 metadata/md5-cache/dev-util/glib-utils-2.62.6
+2006031839 metadata/md5-cache/dev-util/gtk-doc-1.32-r1
+2006031839 metadata/md5-cache/dev-util/gtk-doc-am-1.32
+2006021809 metadata/md5-cache/dev-util/kdevelop-5.5.2
+2006021809 metadata/md5-cache/dev-util/kdevelop-php-5.5.2
+2006021809 metadata/md5-cache/dev-util/kdevelop-python-5.5.2
+2006041239 metadata/md5-cache/dev-util/molecule-2
+2006041239 metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
+2006041239 metadata/md5-cache/dev-util/molecule-plugins-1.0.3
+2006031339 metadata/md5-cache/dev-util/perf-5.7
+2006021438 metadata/md5-cache/dev-util/plan9port-0_pre20200526
+2006021438 metadata/md5-cache/dev-util/plan9port-9999
+2006012108 metadata/md5-cache/dev-util/rebar-2.6.4-r1
+2006021209 metadata/md5-cache/dev-util/sccache-0.2.12
+2006021209 metadata/md5-cache/dev-util/sccache-0.2.13
+2006021238 metadata/md5-cache/dev-util/strace-5.7
+2006040939 metadata/md5-cache/dev-util/stripe-mock-0.88.0
+2006021209 metadata/md5-cache/dev-util/wasmer-0.11.0
+2006040939 metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
+2006040939 metadata/md5-cache/dev-util/ydiff-1.1
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -50353,8 +50408,6 @@
 2005260027 metadata/md5-cache/dev-vcs/tig-9999
 2005260027 metadata/md5-cache/dev-vcs/tkcvs-8.2.3
 2005260027 metadata/md5-cache/dev-vcs/topgit-0.9-r1
-2005271409 metadata/md5-cache/dev-vcs/git-2.27.0_rc2
-2006010910 metadata/md5-cache/dev-vcs/Manifest.gz
 2006010910 metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
 2006010910 metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
 2006010910 metadata/md5-cache/dev-vcs/git-cola-3.5-r1
@@ -50377,7 +50430,6 @@
 2006010910 metadata/md5-cache/dev-vcs/python-gitlab-2.2.0
 2006010910 metadata/md5-cache/dev-vcs/stgit-0.19
 2006010910 metadata/md5-cache/dev-vcs/stgit-0.20
-2006010910 metadata/md5-cache/dev-vcs/stgit-0.21
 2006010910 metadata/md5-cache/dev-vcs/stgit-0.22
 2006010910 metadata/md5-cache/dev-vcs/subversion-1.12.2
 2006010910 metadata/md5-cache/dev-vcs/subversion-1.13.0-r1
@@ -50388,6 +50440,10 @@
 2006010910 metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r2
 2006010910 metadata/md5-cache/dev-vcs/tortoisehg-5.3.2
 2006010910 metadata/md5-cache/dev-vcs/tortoisehg-9999
+2006032209 metadata/md5-cache/dev-vcs/Manifest.gz
+2006021508 metadata/md5-cache/dev-vcs/fossil-2.11
+2006021209 metadata/md5-cache/dev-vcs/git-2.27.0
+2006032209 metadata/md5-cache/dev-vcs/stgit-0.21
 1707090139 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
@@ -50488,7 +50544,6 @@
 2003311822 metadata/md5-cache/games-arcade/digger-20140423-r1
 2003311822 metadata/md5-cache/games-arcade/excido-0.1.5c-r3
 2003311822 metadata/md5-cache/games-arcade/insaneodyssey-000311-r1
-2003311822 metadata/md5-cache/games-arcade/jazz2-0.6.3_p20200327
 2003311822 metadata/md5-cache/games-arcade/kajaani-kombat-0.7-r1
 2003311822 metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r1
 2003311822 metadata/md5-cache/games-arcade/komi-1.04-r1
@@ -50602,8 +50657,9 @@
 2005260027 metadata/md5-cache/games-arcade/xgalaga-2.1.1.0
 2005260027 metadata/md5-cache/games-arcade/xjump-2.7.5
 2005260027 metadata/md5-cache/games-arcade/xscavenger-1.4.4-r1
-2005301639 metadata/md5-cache/games-arcade/Manifest.gz
 2005301639 metadata/md5-cache/games-arcade/ninvaders-0.1.2
+2006032338 metadata/md5-cache/games-arcade/Manifest.gz
+2006032338 metadata/md5-cache/games-arcade/jazz2-0.6.4
 1711182338 metadata/md5-cache/games-board/gnuchess-book-1.02-r1
 1907282009 metadata/md5-cache/games-board/gnugo-3.9.1-r2
 1702282322 metadata/md5-cache/games-board/maitretarot-0.1.98-r1
@@ -50628,8 +50684,6 @@
 2005260027 metadata/md5-cache/games-board/crafty-24.1-r1
 2005260027 metadata/md5-cache/games-board/domination-1.1.1.6-r1
 2005260027 metadata/md5-cache/games-board/eboard-1.1.1-r2
-2005260027 metadata/md5-cache/games-board/four-in-a-row-3.32.0
-2005260027 metadata/md5-cache/games-board/four-in-a-row-3.34.4
 2005260027 metadata/md5-cache/games-board/freedoko-0.7.16
 2005260027 metadata/md5-cache/games-board/freedoko-0.7.16-r1
 2005260027 metadata/md5-cache/games-board/gambit-1.0.4
@@ -50646,13 +50700,9 @@
 2005260027 metadata/md5-cache/games-board/gnushogi-1.4.1-r1
 2005260027 metadata/md5-cache/games-board/goatee-gtk-0.3.1
 2005260027 metadata/md5-cache/games-board/goatee-gtk-0.3.1.1
-2005260027 metadata/md5-cache/games-board/grhino-0.16.1-r1
 2005260027 metadata/md5-cache/games-board/grhino-0.16.1-r2
 2005260027 metadata/md5-cache/games-board/gtkatlantic-0.6.1-r1
-2005260027 metadata/md5-cache/games-board/gtkboard-0.11_pre0-r1
 2005260027 metadata/md5-cache/games-board/hexxagon-1.0.2-r1
-2005260027 metadata/md5-cache/games-board/iagno-3.32.0
-2005260027 metadata/md5-cache/games-board/iagno-3.34.5
 2005260027 metadata/md5-cache/games-board/mah-jong-1.14-r1
 2005260027 metadata/md5-cache/games-board/megamek-0.34.10-r1
 2005260027 metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
@@ -50671,7 +50721,6 @@
 2005260027 metadata/md5-cache/games-board/stockfish-10
 2005260027 metadata/md5-cache/games-board/stockfish-11
 2005260027 metadata/md5-cache/games-board/tali-3.32.1
-2005260027 metadata/md5-cache/games-board/teg-0.11.2
 2005260027 metadata/md5-cache/games-board/teg-0.11.2-r1
 2005260027 metadata/md5-cache/games-board/tetzle-2.1.3
 2005260027 metadata/md5-cache/games-board/xboard-4.9.1
@@ -50681,10 +50730,13 @@
 2005260027 metadata/md5-cache/games-board/xmille-2.0-r3
 2005260027 metadata/md5-cache/games-board/xscrabble-2.10-r2
 2005260027 metadata/md5-cache/games-board/xskat-4.0-r1
-2006010910 metadata/md5-cache/games-board/Manifest.gz
 2006010910 metadata/md5-cache/games-board/pychess-1.0.0
 2006010910 metadata/md5-cache/games-board/pychess-1.0.2
 2006010910 metadata/md5-cache/games-board/pysolfc-2.6.4-r1
+2006022139 metadata/md5-cache/games-board/Manifest.gz
+2006012339 metadata/md5-cache/games-board/four-in-a-row-3.34.4
+2006022139 metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
+2006012339 metadata/md5-cache/games-board/iagno-3.34.5
 1911021809 metadata/md5-cache/games-emulation/desmume-0.9.11-r2
 1804291439 metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1
 1911110109 metadata/md5-cache/games-emulation/emutos-0.9.12
@@ -50783,7 +50835,6 @@
 2005260027 metadata/md5-cache/games-engines/exult-9999
 2005260027 metadata/md5-cache/games-engines/frobtads-1.2.3-r1
 2005260027 metadata/md5-cache/games-engines/frobtads-1.2.4
-2005260027 metadata/md5-cache/games-engines/frotz-2.50_beta2
 2005260027 metadata/md5-cache/games-engines/gargoyle-2011.1-r1
 2005260027 metadata/md5-cache/games-engines/gemrb-0.8.3-r1
 2005260027 metadata/md5-cache/games-engines/love-0.10.2
@@ -50804,9 +50855,10 @@
 2005260027 metadata/md5-cache/games-engines/solarus-1.3.1-r1
 2005260027 metadata/md5-cache/games-engines/stratagus-2.4.1
 2005271309 metadata/md5-cache/games-engines/openmw-9999
-2006010910 metadata/md5-cache/games-engines/Manifest.gz
 2006010910 metadata/md5-cache/games-engines/renpy-6.99.12.4-r4
-2006010910 metadata/md5-cache/games-engines/renpy-7.3.5
+2006040939 metadata/md5-cache/games-engines/Manifest.gz
+2006020339 metadata/md5-cache/games-engines/frotz-2.52
+2006040939 metadata/md5-cache/games-engines/renpy-7.3.5
 1911080039 metadata/md5-cache/games-fps/freedoom-0.12.1
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
@@ -50986,7 +51038,6 @@
 2005102009 metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
 2005102009 metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
 2005172009 metadata/md5-cache/games-puzzle/textmaze-1.2-r1
-2005260027 metadata/md5-cache/games-puzzle/Manifest.gz
 2005260027 metadata/md5-cache/games-puzzle/amoebax-0.2.1-r1
 2005260027 metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
 2005260027 metadata/md5-cache/games-puzzle/atomix-3.22.0
@@ -51039,8 +51090,6 @@
 2005260027 metadata/md5-cache/games-puzzle/pingus-0.7.6-r2
 2005260027 metadata/md5-cache/games-puzzle/pingus-9999
 2005260027 metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r1
-2005260027 metadata/md5-cache/games-puzzle/quadrapassel-3.32.0
-2005260027 metadata/md5-cache/games-puzzle/quadrapassel-3.36.00
 2005260027 metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
 2005260027 metadata/md5-cache/games-puzzle/seatris-0.0.14
 2005260027 metadata/md5-cache/games-puzzle/sgt-puzzles-20190415
@@ -51061,6 +51110,8 @@
 2005260027 metadata/md5-cache/games-puzzle/xwelltris-1.0.1
 2005260027 metadata/md5-cache/games-puzzle/xye-0.12.2
 2005260027 metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
+2006021109 metadata/md5-cache/games-puzzle/Manifest.gz
+2006012339 metadata/md5-cache/games-puzzle/quadrapassel-3.36.00
 2003311822 metadata/md5-cache/games-roguelike/neon-chrome-1.1.12
 2005102009 metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
 2005260027 metadata/md5-cache/games-roguelike/FTL-1.5.13
@@ -51201,7 +51252,6 @@
 2005102009 metadata/md5-cache/games-strategy/spaz-1.605-r1
 2005260027 metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
 2005260027 metadata/md5-cache/games-strategy/0ad-0.0.23b_alpha
-2005260027 metadata/md5-cache/games-strategy/Manifest.gz
 2005260027 metadata/md5-cache/games-strategy/asc-2.6.0.0-r2
 2005260027 metadata/md5-cache/games-strategy/colobot-0.1.12
 2005260027 metadata/md5-cache/games-strategy/colobot-9999
@@ -51241,12 +51291,13 @@
 2005260027 metadata/md5-cache/games-strategy/warmux-11.04.1-r1
 2005260027 metadata/md5-cache/games-strategy/warzone2100-3.2.3
 2005260027 metadata/md5-cache/games-strategy/warzone2100-3.3.0
-2005260027 metadata/md5-cache/games-strategy/wesnoth-1.14.11
-2005260027 metadata/md5-cache/games-strategy/wesnoth-1.14.9
-2005260027 metadata/md5-cache/games-strategy/wesnoth-1.15.3
 2005260027 metadata/md5-cache/games-strategy/widelands-0.20-r1
 2005260027 metadata/md5-cache/games-strategy/widelands-9999
 2005260027 metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
+2006032338 metadata/md5-cache/games-strategy/Manifest.gz
+2006032338 metadata/md5-cache/games-strategy/wesnoth-1.14.11
+2006032338 metadata/md5-cache/games-strategy/wesnoth-1.14.9
+2006032338 metadata/md5-cache/games-strategy/wesnoth-1.15.3
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1806110509 metadata/md5-cache/games-util/etswitch-0.1.14-r1
 1702282323 metadata/md5-cache/games-util/gslist-0.8.11a-r1
@@ -51301,26 +51352,21 @@
 2005260027 metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
 2005260027 metadata/md5-cache/games-util/xqf-1.0.6.2
 2005291209 metadata/md5-cache/games-util/linux-wbfs-manager-9999
-2006010910 metadata/md5-cache/games-util/Manifest.gz
 2006010910 metadata/md5-cache/games-util/lutris-0.5.4-r1
 2006010910 metadata/md5-cache/games-util/lutris-0.5.6
 2006010910 metadata/md5-cache/games-util/lutris-9999
 2006010910 metadata/md5-cache/games-util/nml-0.4.5-r2
-2006010039 metadata/md5-cache/games-util/slade-3.1.12a
+2006020009 metadata/md5-cache/games-util/Manifest.gz
+2006020009 metadata/md5-cache/games-util/slade-3.1.12a
 2004202139 metadata/md5-cache/gnome-base/gnome-3.34.4
-2004202139 metadata/md5-cache/gnome-base/gnome-core-apps-3.34.4
 2004202139 metadata/md5-cache/gnome-base/gnome-core-libs-3.34.4
 2004202139 metadata/md5-cache/gnome-base/gnome-extra-apps-3.34.4
-2004202139 metadata/md5-cache/gnome-base/gnome-light-3.34.4
-2005260027 metadata/md5-cache/gnome-base/Manifest.gz
 2005260027 metadata/md5-cache/gnome-base/dconf-0.32.0-r2
-2005260027 metadata/md5-cache/gnome-base/dconf-0.34.0
 2005260027 metadata/md5-cache/gnome-base/dconf-editor-3.34.4
 2005260027 metadata/md5-cache/gnome-base/gconf-3.2.6-r4
 2005260027 metadata/md5-cache/gnome-base/gdm-3.34.1
 2005260027 metadata/md5-cache/gnome-base/gnome-applets-3.34.0
 2005260027 metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
-2005260027 metadata/md5-cache/gnome-base/gnome-control-center-3.34.5
 2005260027 metadata/md5-cache/gnome-base/gnome-desktop-3.32.2
 2005260027 metadata/md5-cache/gnome-base/gnome-desktop-3.34.5
 2005260027 metadata/md5-cache/gnome-base/gnome-desktop-3.34.6
@@ -51332,10 +51378,8 @@
 2005260027 metadata/md5-cache/gnome-base/gnome-panel-3.34.1
 2005260027 metadata/md5-cache/gnome-base/gnome-session-3.34.2
 2005260027 metadata/md5-cache/gnome-base/gnome-settings-daemon-3.34.2
-2005260027 metadata/md5-cache/gnome-base/gnome-shell-3.34.5
 2005260027 metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
 2005260027 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.32.0
-2005260027 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.34.0
 2005260027 metadata/md5-cache/gnome-base/gvfs-1.40.2
 2005260027 metadata/md5-cache/gnome-base/gvfs-1.42.2
 2005260027 metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1
@@ -51353,6 +51397,13 @@
 2005260027 metadata/md5-cache/gnome-base/nautilus-3.34.2
 2005260027 metadata/md5-cache/gnome-base/nautilus-3.34.3
 2005260027 metadata/md5-cache/gnome-base/orbit-2.14.19-r5
+2006031839 metadata/md5-cache/gnome-base/Manifest.gz
+2006031839 metadata/md5-cache/gnome-base/dconf-0.34.0
+2006012339 metadata/md5-cache/gnome-base/gnome-control-center-3.34.5
+2006012339 metadata/md5-cache/gnome-base/gnome-core-apps-3.34.4
+2006012339 metadata/md5-cache/gnome-base/gnome-light-3.34.4
+2006021109 metadata/md5-cache/gnome-base/gnome-shell-3.34.5
+2006031839 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.34.0
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2004032241 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2004202139 metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-22_p20190929
@@ -51381,7 +51432,6 @@
 2005260027 metadata/md5-cache/gnome-extra/gnome-commander-1.10.0
 2005260027 metadata/md5-cache/gnome-extra/gnome-commander-1.10.1
 2005260027 metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
-2005260027 metadata/md5-cache/gnome-extra/gnome-contacts-3.34.1
 2005260027 metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
 2005260027 metadata/md5-cache/gnome-extra/gnome-documents-3.34.0
 2005260027 metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90-r1
@@ -51395,8 +51445,6 @@
 2005260027 metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.34.2
 2005260027 metadata/md5-cache/gnome-extra/gnome-software-3.34.2
 2005260027 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.32.1
-2005260027 metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1
-2005260027 metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.0
 2005260027 metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.1
 2005260027 metadata/md5-cache/gnome-extra/gnome-user-docs-3.34.2
 2005260027 metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
@@ -51419,7 +51467,6 @@
 2005260027 metadata/md5-cache/gnome-extra/synapse-0.2.99.4
 2005260027 metadata/md5-cache/gnome-extra/yelp-3.34.0
 2005260027 metadata/md5-cache/gnome-extra/yelp-xsl-3.32.1
-2005260027 metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
 2005260027 metadata/md5-cache/gnome-extra/zenity-3.32.0
 2005290339 metadata/md5-cache/gnome-extra/cinnamon-4.4.8
 2005290339 metadata/md5-cache/gnome-extra/cinnamon-control-center-4.4.0
@@ -51431,10 +51478,13 @@
 2005290339 metadata/md5-cache/gnome-extra/cinnamon-translations-4.4.2
 2005290339 metadata/md5-cache/gnome-extra/cjs-4.4.0
 2005290339 metadata/md5-cache/gnome-extra/nemo-4.4.2
-2005312208 metadata/md5-cache/gnome-extra/Manifest.gz
 2005311609 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-37
 2005311609 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.04.0
 2005311609 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-33-r2
+2006031839 metadata/md5-cache/gnome-extra/Manifest.gz
+2006012339 metadata/md5-cache/gnome-extra/gnome-contacts-3.34.1
+2006012339 metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.0
+2006031839 metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
 2005260027 metadata/md5-cache/gnustep-apps/Manifest.gz
 2005260027 metadata/md5-cache/gnustep-apps/aclock-0.4.0
 2005260027 metadata/md5-cache/gnustep-apps/addresses-0.4.8
@@ -51560,18 +51610,18 @@
 2005260027 metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
 2005260027 metadata/md5-cache/gui-apps/wl-clipboard-2.0.0
 2005260027 metadata/md5-cache/gui-apps/wl-clipboard-9999
-2005260027 metadata/md5-cache/gui-libs/Manifest.gz
 2005260027 metadata/md5-cache/gui-libs/amtk-5.0.2
 2005260027 metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0-r1
-2005260027 metadata/md5-cache/gui-libs/libhandy-0.0.13
-2005260027 metadata/md5-cache/gui-libs/libwpe-1.4.0.1
 2005260027 metadata/md5-cache/gui-libs/tepl-4.2.1
 2005260027 metadata/md5-cache/gui-libs/wf-config-0.4.0
 2005260027 metadata/md5-cache/gui-libs/wf-config-9999
 2005260027 metadata/md5-cache/gui-libs/wlroots-0.10.0
 2005260027 metadata/md5-cache/gui-libs/wlroots-0.10.1
 2005260027 metadata/md5-cache/gui-libs/wlroots-9999
-2005260027 metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
+2006012339 metadata/md5-cache/gui-libs/Manifest.gz
+2006012339 metadata/md5-cache/gui-libs/libhandy-0.0.13
+2006012339 metadata/md5-cache/gui-libs/libwpe-1.4.0.1
+2006012339 metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
 2005260027 metadata/md5-cache/gui-wm/sway-1.4
 2005260027 metadata/md5-cache/gui-wm/wayfire-0.4.0
 2005260027 metadata/md5-cache/gui-wm/wayfire-9999
@@ -52173,13 +52223,13 @@
 2005260027 metadata/md5-cache/kde-misc/rsibreak-0.12.13
 2005260027 metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1
 2005260027 metadata/md5-cache/kde-misc/tellico-3.2.3
-2005260027 metadata/md5-cache/kde-misc/tellico-3.3
 2005260027 metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
 2005260027 metadata/md5-cache/kde-misc/wacomtablet-3.2.0
 2005260027 metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
-2005280309 metadata/md5-cache/kde-misc/Manifest.gz
-2005280309 metadata/md5-cache/kde-misc/kio-fuse-4.95.0
 2005280039 metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
+2006031609 metadata/md5-cache/kde-misc/Manifest.gz
+2006022139 metadata/md5-cache/kde-misc/kio-fuse-4.95.0
+2006031409 metadata/md5-cache/kde-misc/tellico-3.3.1
 2005211709 metadata/md5-cache/kde-plasma/breeze-grub-5.18.5
 2005211709 metadata/md5-cache/kde-plasma/plasma-meta-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/bluedevil-5.18.5
@@ -52211,14 +52261,12 @@
 2005260027 metadata/md5-cache/kde-plasma/milou-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/oxygen-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5
-2005260027 metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-integration-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1
 2005260027 metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
-2005260027 metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5
@@ -52228,10 +52276,10 @@
 2005260027 metadata/md5-cache/kde-plasma/user-manager-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
 2005260027 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
-2006011339 metadata/md5-cache/kde-plasma/Manifest.gz
 2006011339 metadata/md5-cache/kde-plasma/kwin-5.18.5-r2
 2005311909 metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1
 2005311909 metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1
+2006031609 metadata/md5-cache/kde-plasma/Manifest.gz
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1
 1804072008 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
@@ -52360,7 +52408,6 @@
 2006010910 metadata/md5-cache/mail-client/alot-0.8.1
 2006010910 metadata/md5-cache/mail-client/alot-0.9
 2006010910 metadata/md5-cache/mail-client/alot-9999
-1911101439 metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
 1911061339 metadata/md5-cache/mail-filter/libsieve-2.2.7
 1910111911 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 1906181439 metadata/md5-cache/mail-filter/postforward-1.1.1
@@ -52394,8 +52441,6 @@
 2005260027 metadata/md5-cache/mail-filter/imapfilter-2.6.16
 2005260027 metadata/md5-cache/mail-filter/libmilter-1.0.2
 2005260027 metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
-2005260027 metadata/md5-cache/mail-filter/libspf2-1.2.10
-2005260027 metadata/md5-cache/mail-filter/libsrs2-1.0.18
 2005260027 metadata/md5-cache/mail-filter/libsrs_alt-1.0-r1
 2005260027 metadata/md5-cache/mail-filter/mapson-3.3
 2005260027 metadata/md5-cache/mail-filter/milter-regex-2.6
@@ -52442,7 +52487,6 @@
 2005260027 metadata/md5-cache/mail-filter/tmda-1.1.12-r2
 2005271109 metadata/md5-cache/mail-filter/maildrop-3.0.0
 2005271639 metadata/md5-cache/mail-filter/scmail-1.3
-2006010910 metadata/md5-cache/mail-filter/Manifest.gz
 2006010910 metadata/md5-cache/mail-filter/afew-1.2.0
 2006010910 metadata/md5-cache/mail-filter/afew-1.3.0-r1
 2006010910 metadata/md5-cache/mail-filter/afew-2.0.0
@@ -52451,6 +52495,10 @@
 2006010910 metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
 2006010910 metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
 2006010910 metadata/md5-cache/mail-filter/spf-engine-2.9.2
+2006041239 metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
+2006041239 metadata/md5-cache/mail-filter/Manifest.gz
+2006041239 metadata/md5-cache/mail-filter/libspf2-1.2.10
+2006041239 metadata/md5-cache/mail-filter/libsrs2-1.0.18
 1910071309 metadata/md5-cache/mail-mta/esmtp-1.2-r1
 2004201739 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.6
 2005260027 metadata/md5-cache/mail-mta/courier-1.0.13
@@ -52460,7 +52508,6 @@
 2005260027 metadata/md5-cache/mail-mta/msmtp-1.8.7-r1
 2005260027 metadata/md5-cache/mail-mta/msmtp-1.8.8
 2005260027 metadata/md5-cache/mail-mta/netqmail-1.06-r12
-2005260027 metadata/md5-cache/mail-mta/netqmail-1.06-r13
 2005260027 metadata/md5-cache/mail-mta/nullmailer-2.2-r1
 2005260027 metadata/md5-cache/mail-mta/opensmtpd-6.7.1_p1
 2005260027 metadata/md5-cache/mail-mta/postfix-3.5.1
@@ -52471,8 +52518,10 @@
 2005260027 metadata/md5-cache/mail-mta/qpsmtpd-9999
 2005260027 metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
 2005260027 metadata/md5-cache/mail-mta/ssmtp-2.64-r3
-2005271539 metadata/md5-cache/mail-mta/Manifest.gz
 2005271539 metadata/md5-cache/mail-mta/postfix-3.6_pre20200523
+2006040939 metadata/md5-cache/mail-mta/Manifest.gz
+2006012108 metadata/md5-cache/mail-mta/exim-4.94
+2006040939 metadata/md5-cache/mail-mta/netqmail-1.06-r13
 2002221412 metadata/md5-cache/mate-base/mate-1.22
 2002221412 metadata/md5-cache/mate-base/mate-applets-meta-1.22.0
 2004062109 metadata/md5-cache/mate-base/mate-1.24
@@ -52929,7 +52978,6 @@
 2005260027 metadata/md5-cache/media-gfx/feh-3.3
 2005260027 metadata/md5-cache/media-gfx/feh-3.4
 2005260027 metadata/md5-cache/media-gfx/fim-0.5_rc3
-2005260027 metadata/md5-cache/media-gfx/flam3-3.1.1
 2005260027 metadata/md5-cache/media-gfx/fondu-20060102-r1
 2005260027 metadata/md5-cache/media-gfx/fontforge-20200314
 2005260027 metadata/md5-cache/media-gfx/fotowall-1.0
@@ -52987,7 +53035,6 @@
 2005260027 metadata/md5-cache/media-gfx/imv-4.1.0-r1
 2005260027 metadata/md5-cache/media-gfx/imv-9999
 2005260027 metadata/md5-cache/media-gfx/inkscape-0.92.4-r3
-2005260027 metadata/md5-cache/media-gfx/inkscape-1.0
 2005260027 metadata/md5-cache/media-gfx/inkscape-1.0_rc1
 2005260027 metadata/md5-cache/media-gfx/inkscape-9999
 2005260027 metadata/md5-cache/media-gfx/iscan-2.30.4.2
@@ -53067,7 +53114,6 @@
 2005260027 metadata/md5-cache/media-gfx/pngcrush-1.8.13
 2005260027 metadata/md5-cache/media-gfx/pngnq-1.1
 2005260027 metadata/md5-cache/media-gfx/pngquant-2.12.3
-2005260027 metadata/md5-cache/media-gfx/pngquant-2.12.6
 2005260027 metadata/md5-cache/media-gfx/pngrewrite-1.4.0
 2005260027 metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
 2005260027 metadata/md5-cache/media-gfx/pngtools-0.4-r2
@@ -53110,7 +53156,6 @@
 2005260027 metadata/md5-cache/media-gfx/tgif-4.2.5-r2
 2005260027 metadata/md5-cache/media-gfx/tif22pnm-0.14
 2005260027 metadata/md5-cache/media-gfx/tintii-2.10.0
-2005260027 metadata/md5-cache/media-gfx/transfig-3.2.5e
 2005260027 metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
 2005260027 metadata/md5-cache/media-gfx/ufraw-0.22-r3
 2005260027 metadata/md5-cache/media-gfx/valentina-0.6.1-r1
@@ -53136,9 +53181,7 @@
 2005260027 metadata/md5-cache/media-gfx/zbar-0.23-r1
 2005260027 metadata/md5-cache/media-gfx/zbar-0.23.1
 2005260027 metadata/md5-cache/media-gfx/zgv-5.9
-2005291109 metadata/md5-cache/media-gfx/librecad-2.1.3-r5
 2005300039 metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
-2006010910 metadata/md5-cache/media-gfx/Manifest.gz
 2006010910 metadata/md5-cache/media-gfx/cairosvg-1.0.22
 2006010910 metadata/md5-cache/media-gfx/cairosvg-2.4.2
 2006010910 metadata/md5-cache/media-gfx/displaycal-3.8.8.1-r1
@@ -53153,7 +53196,6 @@
 2006010910 metadata/md5-cache/media-gfx/printrun-20150310-r4
 2006010910 metadata/md5-cache/media-gfx/printrun-99999999
 2005310309 metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
-2006010910 metadata/md5-cache/media-gfx/scour-0.37
 2006010910 metadata/md5-cache/media-gfx/sigal-1.3.0
 2006010910 metadata/md5-cache/media-gfx/termtosvg-0.7.0
 2006010910 metadata/md5-cache/media-gfx/termtosvg-0.8.0
@@ -53163,6 +53205,16 @@
 2006010910 metadata/md5-cache/media-gfx/word_cloud-1.6.0
 2006010910 metadata/md5-cache/media-gfx/xdot-1.1
 2006010910 metadata/md5-cache/media-gfx/xdot-9999
+2006041239 metadata/md5-cache/media-gfx/Manifest.gz
+2006041239 metadata/md5-cache/media-gfx/flam3-3.1.1
+2006012339 metadata/md5-cache/media-gfx/imagemagick-6.9.11.16
+2006012339 metadata/md5-cache/media-gfx/imagemagick-7.0.10.16
+2006021639 metadata/md5-cache/media-gfx/imagemagick-7.0.10.16-r1
+2006021639 metadata/md5-cache/media-gfx/inkscape-1.0
+2006040939 metadata/md5-cache/media-gfx/librecad-2.1.3-r5
+2006012238 metadata/md5-cache/media-gfx/pngquant-2.12.6
+2006030139 metadata/md5-cache/media-gfx/scour-0.37
+2006041239 metadata/md5-cache/media-gfx/transfig-3.2.5e
 1906032239 metadata/md5-cache/media-libs/aldumb-0.9.3
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1806121239 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
@@ -53203,8 +53255,6 @@
 2002231739 metadata/md5-cache/media-libs/libmpd-11.8.17-r1
 2003111539 metadata/md5-cache/media-libs/SoXt-1.3.0-r1
 2003250139 metadata/md5-cache/media-libs/freeverb3-3.2.1-r2
-2004032241 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.1
-2004032241 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.1.2
 2004032241 metadata/md5-cache/media-libs/jbig2dec-0.14
 2004032241 metadata/md5-cache/media-libs/libcdaudio-0.99.12-r2
 2004032241 metadata/md5-cache/media-libs/libdiscid-0.6.2
@@ -53230,7 +53280,6 @@
 2005260027 metadata/md5-cache/media-libs/allegro-4.4.2-r2
 2005260027 metadata/md5-cache/media-libs/allegro-4.4.3.1
 2005260027 metadata/md5-cache/media-libs/allegro-5.2.5.0
-2005260027 metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
 2005260027 metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
 2005260027 metadata/md5-cache/media-libs/alsa-oss-1.1.8
 2005260027 metadata/md5-cache/media-libs/ampache_browser-1.0.1
@@ -53338,7 +53387,6 @@
 2005260027 metadata/md5-cache/media-libs/graphene-1.8.6
 2005260027 metadata/md5-cache/media-libs/grilo-0.3.11
 2005260027 metadata/md5-cache/media-libs/grilo-0.3.12
-2005260027 metadata/md5-cache/media-libs/gsound-1.0.2-r1
 2005260027 metadata/md5-cache/media-libs/gst-plugins-bad-1.14.5
 2005260027 metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
 2005260027 metadata/md5-cache/media-libs/gst-plugins-base-1.14.5
@@ -53465,7 +53513,6 @@
 2005260027 metadata/md5-cache/media-libs/libilbc-9999
 2005260027 metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
 2005260027 metadata/md5-cache/media-libs/libiptcdata-1.0.5
-2005260027 metadata/md5-cache/media-libs/libirman-0.4.5
 2005260027 metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r2
 2005260027 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
 2005260027 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.4
@@ -53511,7 +53558,6 @@
 2005260027 metadata/md5-cache/media-libs/libogg-1.3.4
 2005260027 metadata/md5-cache/media-libs/liboggz-1.1.1
 2005260027 metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
-2005260027 metadata/md5-cache/media-libs/libopenmpt-0.4.12
 2005260027 metadata/md5-cache/media-libs/libopenraw-0.0.9
 2005260027 metadata/md5-cache/media-libs/libopenraw-0.1.2
 2005260027 metadata/md5-cache/media-libs/libopenraw-0.1.3
@@ -53602,8 +53648,6 @@
 2005260027 metadata/md5-cache/media-libs/libzmf-9999
 2005260027 metadata/md5-cache/media-libs/lilv-0.24.4-r1
 2005260027 metadata/md5-cache/media-libs/lilv-0.24.6
-2005260027 metadata/md5-cache/media-libs/lv2-1.14.0-r2
-2005260027 metadata/md5-cache/media-libs/lv2-1.16.0-r1
 2005260027 metadata/md5-cache/media-libs/lvtk-1.2.0
 2005260027 metadata/md5-cache/media-libs/memphis-0.2.3
 2005260027 metadata/md5-cache/media-libs/mlt-6.20.0
@@ -53776,15 +53820,12 @@
 2005281509 metadata/md5-cache/media-libs/mesa-19.3.5
 2005281509 metadata/md5-cache/media-libs/mesa-20.0.4-r1
 2005281509 metadata/md5-cache/media-libs/mesa-20.0.7
-2005290039 metadata/md5-cache/media-libs/mesa-20.1.0
 2005281509 metadata/md5-cache/media-libs/mesa-20.1.0_rc4
-2005281509 metadata/md5-cache/media-libs/mesa-9999
 2005281509 metadata/md5-cache/media-libs/osl-1.10.5
 2005291209 metadata/md5-cache/media-libs/libgig-9999
 2005291209 metadata/md5-cache/media-libs/liblscp-9999
 2005291309 metadata/md5-cache/media-libs/rlottie-0.0.1_pre20200424
 2005300009 metadata/md5-cache/media-libs/libinsane-1.0.4
-2006010910 metadata/md5-cache/media-libs/Manifest.gz
 2005311939 metadata/md5-cache/media-libs/alure-1.2-r1
 2005311939 metadata/md5-cache/media-libs/alure-1.2-r2
 2006010910 metadata/md5-cache/media-libs/aubio-0.4.7-r1
@@ -53793,9 +53834,6 @@
 2005311939 metadata/md5-cache/media-libs/dumb-2.0.3
 2006010910 metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
 2006010910 metadata/md5-cache/media-libs/elgato-streamdeck-9999
-2006010039 metadata/md5-cache/media-libs/harfbuzz-2.6.5
-2006010039 metadata/md5-cache/media-libs/harfbuzz-2.6.6
-2006010039 metadata/md5-cache/media-libs/harfbuzz-9999
 2005311939 metadata/md5-cache/media-libs/libcdr-0.1.6
 2006010910 metadata/md5-cache/media-libs/mutagen-1.43.0
 2006010910 metadata/md5-cache/media-libs/mutagen-1.44.0
@@ -53805,6 +53843,18 @@
 2005302339 metadata/md5-cache/media-libs/vulkan-loader-1.2.135
 2005302339 metadata/md5-cache/media-libs/vulkan-loader-1.2.137
 2005302339 metadata/md5-cache/media-libs/vulkan-loader-9999
+2006041239 metadata/md5-cache/media-libs/Manifest.gz
+2006012339 metadata/md5-cache/media-libs/gsound-1.0.2-r1
+2006020239 metadata/md5-cache/media-libs/harfbuzz-2.6.5
+2006020239 metadata/md5-cache/media-libs/harfbuzz-2.6.6
+2006020239 metadata/md5-cache/media-libs/harfbuzz-9999
+2006041239 metadata/md5-cache/media-libs/libirman-0.4.5
+2006032338 metadata/md5-cache/media-libs/libopenmpt-0.5.0
+2006040508 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200525
+2006041239 metadata/md5-cache/media-libs/lv2-1.14.0-r2
+2006041239 metadata/md5-cache/media-libs/lv2-1.16.0-r1
+2006032239 metadata/md5-cache/media-libs/mesa-20.1.0
+2006032239 metadata/md5-cache/media-libs/mesa-9999
 1702282326 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
 1801032209 metadata/md5-cache/media-plugins/gmpc-discogs-0.20.0
 1801032209 metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0
@@ -53829,20 +53879,17 @@
 2002230040 metadata/md5-cache/media-plugins/gmpc-avahi-11.8.16
 2003152109 metadata/md5-cache/media-plugins/imlib2_loaders-1.6.1
 2004230939 metadata/md5-cache/media-plugins/live-2020.03.06
-2005260027 metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
 2005260027 metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
 2005260027 metadata/md5-cache/media-plugins/alsaequal-0.7.1
 2005260027 metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
 2005260027 metadata/md5-cache/media-plugins/ams-lv2-1.1.0
 2005260027 metadata/md5-cache/media-plugins/ams-lv2-1.2.1
-2005260027 metadata/md5-cache/media-plugins/audacious-plugins-9999
 2005260027 metadata/md5-cache/media-plugins/calf-0.90.3
 2005260027 metadata/md5-cache/media-plugins/calf-9999
 2005260027 metadata/md5-cache/media-plugins/caps-plugins-0.9.24
 2005260027 metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
 2005260027 metadata/md5-cache/media-plugins/frei0r-plugins-1.6.1
 2005260027 metadata/md5-cache/media-plugins/g2reverb-0.7.1
-2005260027 metadata/md5-cache/media-plugins/gimp-lensfun-0.2.4-r1
 2005260027 metadata/md5-cache/media-plugins/gimp-resynthesizer-2.0.3-r3
 2005260027 metadata/md5-cache/media-plugins/gkrellmpc-0.1_beta10
 2005260027 metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
@@ -54293,8 +54340,6 @@
 2005260027 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
 2005260027 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
 2005260027 metadata/md5-cache/media-plugins/vdr-peer-0.0.1
-2005260027 metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
-2005260027 metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
 2005260027 metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
 2005260027 metadata/md5-cache/media-plugins/vdr-pin-0.1.14
 2005260027 metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -54369,9 +54414,13 @@
 2005260027 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
 2005260027 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
 2005260027 metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
-2005282209 metadata/md5-cache/media-plugins/Manifest.gz
 2005282209 metadata/md5-cache/media-plugins/audacious-plugins-3.10.1-r3
 2005282209 metadata/md5-cache/media-plugins/audacious-plugins-4.0.3
+2006041239 metadata/md5-cache/media-plugins/Manifest.gz
+2006021438 metadata/md5-cache/media-plugins/audacious-plugins-4.0.4
+2006021508 metadata/md5-cache/media-plugins/audacious-plugins-9999
+2006041239 metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
+2006041239 metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002081239 metadata/md5-cache/media-radio/xdx-2.5.0
@@ -54426,8 +54475,8 @@
 2005260027 metadata/md5-cache/media-radio/xwxapt-3.4.2
 2005281909 metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
-2005291109 metadata/md5-cache/media-radio/wsjtx-2.1.2
-2005300809 metadata/md5-cache/media-radio/Manifest.gz
+2006040939 metadata/md5-cache/media-radio/Manifest.gz
+2006040939 metadata/md5-cache/media-radio/wsjtx-2.1.2
 1703120008 metadata/md5-cache/media-sound/SmarTagger-0.1-r2
 1805272138 metadata/md5-cache/media-sound/aseqview-0.2.8
 1908162118 metadata/md5-cache/media-sound/asunder-2.9.3-r1
@@ -54525,9 +54574,7 @@
 2005260027 metadata/md5-cache/media-sound/abcmidi-2020.01.22
 2005260027 metadata/md5-cache/media-sound/aeolus-0.9.7
 2005260027 metadata/md5-cache/media-sound/alac_decoder-0.2.0-r1
-2005260027 metadata/md5-cache/media-sound/alsa-tools-1.1.7
 2005260027 metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
-2005260027 metadata/md5-cache/media-sound/alsa-utils-1.2.1
 2005260027 metadata/md5-cache/media-sound/alsa-utils-1.2.2
 2005260027 metadata/md5-cache/media-sound/alsamixer-app-0.1-r1
 2005260027 metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
@@ -54539,7 +54586,6 @@
 2005260027 metadata/md5-cache/media-sound/aqualung-1.0-r2
 2005260027 metadata/md5-cache/media-sound/ardour-5.12
 2005260027 metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
-2005260027 metadata/md5-cache/media-sound/audacious-9999
 2005260027 metadata/md5-cache/media-sound/audacity-2.2.2
 2005260027 metadata/md5-cache/media-sound/audacity-2.3.2
 2005260027 metadata/md5-cache/media-sound/audacity-2.3.3
@@ -54592,7 +54638,6 @@
 2005260027 metadata/md5-cache/media-sound/declick-0.6.5-r1
 2005260027 metadata/md5-cache/media-sound/deinvert-9999
 2005260027 metadata/md5-cache/media-sound/denemo-2.3.0-r1
-2005260027 metadata/md5-cache/media-sound/din-44.0.2
 2005260027 metadata/md5-cache/media-sound/dir2ogg-0.12-r1
 2005260027 metadata/md5-cache/media-sound/dir2ogg-0.13-r1
 2005260027 metadata/md5-cache/media-sound/drumstick-1.1.3
@@ -54628,8 +54673,6 @@
 2005260027 metadata/md5-cache/media-sound/gom-0.29.103-r1
 2005260027 metadata/md5-cache/media-sound/gqradio-1.9.2
 2005260027 metadata/md5-cache/media-sound/gramofile-1.6_p9
-2005260027 metadata/md5-cache/media-sound/grip-4.0.1-r1
-2005260027 metadata/md5-cache/media-sound/grip-4.1.1
 2005260027 metadata/md5-cache/media-sound/gsm-1.0.13-r1
 2005260027 metadata/md5-cache/media-sound/gstreamripper-0.2
 2005260027 metadata/md5-cache/media-sound/gtkguitune-0.8
@@ -54648,9 +54691,6 @@
 2005260027 metadata/md5-cache/media-sound/id3v2-0.1.12-r1
 2005260027 metadata/md5-cache/media-sound/jaaa-0.9.2
 2005260027 metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0
-2005260027 metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
-2005260027 metadata/md5-cache/media-sound/jack2-1.9.14
-2005260027 metadata/md5-cache/media-sound/jack2-9999
 2005260027 metadata/md5-cache/media-sound/jack_capture-0.9.73
 2005261009 metadata/md5-cache/media-sound/jack_capture-9999
 2005260027 metadata/md5-cache/media-sound/jackbeat-0.7.6
@@ -54718,7 +54758,6 @@
 2005260027 metadata/md5-cache/media-sound/mt-daapd-0.2.4.2
 2005260027 metadata/md5-cache/media-sound/multimux-0.2.5.2
 2005260027 metadata/md5-cache/media-sound/mumble-1.3.0
-2005260027 metadata/md5-cache/media-sound/mumble-1.3.1_rc1
 2005260027 metadata/md5-cache/media-sound/mumble-9999
 2005260027 metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
 2005260027 metadata/md5-cache/media-sound/mup-6.6
@@ -54734,7 +54773,6 @@
 2005260027 metadata/md5-cache/media-sound/ncmpcpp-9999
 2005260027 metadata/md5-cache/media-sound/normalize-0.7.7-r1
 2005260027 metadata/md5-cache/media-sound/oggtst-0.0
-2005260027 metadata/md5-cache/media-sound/openmpt123-0.4.12
 2005260027 metadata/md5-cache/media-sound/opus-tools-0.2
 2005260027 metadata/md5-cache/media-sound/orpheus-1.6-r3
 2005260027 metadata/md5-cache/media-sound/pamix-1.5
@@ -54883,8 +54921,6 @@
 2005260027 metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
 2005260027 metadata/md5-cache/media-sound/xwax-1.6-r1
 2005260027 metadata/md5-cache/media-sound/yarock-1.4.0
-2005260027 metadata/md5-cache/media-sound/yoshimi-1.7.0.1
-2005260027 metadata/md5-cache/media-sound/yoshimi-1.7.1
 2005260027 metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
 2005281739 metadata/md5-cache/media-sound/ardour-6.0
 2005281739 metadata/md5-cache/media-sound/ardour-9999
@@ -54917,9 +54953,20 @@
 2006010910 metadata/md5-cache/media-sound/rgain-1.2.1-r1
 2006010910 metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
 2006010910 metadata/md5-cache/media-sound/whipper-0.9.0
-2006011639 metadata/md5-cache/media-sound/Manifest.gz
 2006011639 metadata/md5-cache/media-sound/beets-1.4.9-r2
 2006011639 metadata/md5-cache/media-sound/beets-9999
+2006041239 metadata/md5-cache/media-sound/Manifest.gz
+2006021438 metadata/md5-cache/media-sound/audacious-4.0.4
+2006021438 metadata/md5-cache/media-sound/audacious-9999
+2006041239 metadata/md5-cache/media-sound/din-44.0.2
+2006030109 metadata/md5-cache/media-sound/gnome-music-3.34.6
+2006031839 metadata/md5-cache/media-sound/grip-4.1.1
+2006021939 metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1-r1
+2006041239 metadata/md5-cache/media-sound/jack2-1.9.14
+2006041239 metadata/md5-cache/media-sound/jack2-9999
+2006030109 metadata/md5-cache/media-sound/mumble-1.3.1_rc1
+2006032338 metadata/md5-cache/media-sound/openmpt123-0.5.0
+2006031839 metadata/md5-cache/media-sound/yoshimi-1.7.1
 1902221339 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
@@ -54942,7 +54989,6 @@
 2005260027 metadata/md5-cache/media-tv/kodi-18.4-r1
 2005260027 metadata/md5-cache/media-tv/kodi-18.5-r2
 2005260027 metadata/md5-cache/media-tv/kodi-18.7
-2005260027 metadata/md5-cache/media-tv/kodi-9999
 2005260027 metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321
 2005260027 metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
 2005260027 metadata/md5-cache/media-tv/mythtv-29.1-r3
@@ -54953,7 +54999,6 @@
 2005260027 metadata/md5-cache/media-tv/plex-media-server-1.19.1
 2005260027 metadata/md5-cache/media-tv/plex-media-server-1.19.2
 2005260027 metadata/md5-cache/media-tv/tvheadend-4.2.8-r1
-2005260027 metadata/md5-cache/media-tv/tvheadend-9999
 2005260027 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
 2005260027 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2
 2005260027 metadata/md5-cache/media-tv/v4l-utils-1.10.1
@@ -54962,10 +55007,12 @@
 2005260027 metadata/md5-cache/media-tv/v4l-utils-1.16.6
 2005260027 metadata/md5-cache/media-tv/v4l-utils-1.18.0
 2005271509 metadata/md5-cache/media-tv/kodi-18.6
-2006010910 metadata/md5-cache/media-tv/Manifest.gz
 2006010438 metadata/md5-cache/media-tv/kodi-18.7.1
 2006010910 metadata/md5-cache/media-tv/tvnamer-2.4
 2006010910 metadata/md5-cache/media-tv/tvnamer-2.5
+2006040109 metadata/md5-cache/media-tv/Manifest.gz
+2006040109 metadata/md5-cache/media-tv/kodi-9999
+2006032338 metadata/md5-cache/media-tv/tvheadend-9999
 1702282327 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -54974,7 +55021,6 @@
 1911092239 metadata/md5-cache/media-video/dvd9to5-0.1.7
 1802230338 metadata/md5-cache/media-video/dvd_info-1.1
 1801070909 metadata/md5-cache/media-video/dvgrab-3.5-r1
-1908180209 metadata/md5-cache/media-video/movit-1.2.0
 1911101209 metadata/md5-cache/media-video/mplay-sh-0.5.3-r1
 1702282328 metadata/md5-cache/media-video/nvidia-video-codec-7.0.1
 1702282328 metadata/md5-cache/media-video/nvidia-video-codec-7.1.9
@@ -54994,7 +55040,6 @@
 2001252139 metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
 2002222009 metadata/md5-cache/media-video/shrip-0.6.0-r1
 2004032241 metadata/md5-cache/media-video/xvid4conf-1.12
-2004061609 metadata/md5-cache/media-video/rav1e-9999
 2004241309 metadata/md5-cache/media-video/h264enc-10.4.7-r1
 2004261409 metadata/md5-cache/media-video/dv2sub-0.3-r1
 2004261539 metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r1
@@ -55080,7 +55125,6 @@
 2005260027 metadata/md5-cache/media-video/matroxset-0.4
 2005260027 metadata/md5-cache/media-video/mediainfo-20.03
 2005260027 metadata/md5-cache/media-video/mjpegtools-2.1.0-r4
-2005260027 metadata/md5-cache/media-video/mkclean-0.8.10
 2005260027 metadata/md5-cache/media-video/mkvalidator-0.5.2
 2005260027 metadata/md5-cache/media-video/mkvtoolnix-37.0.0
 2005260027 metadata/md5-cache/media-video/mkvtoolnix-42.0.0
@@ -55090,8 +55134,6 @@
 2005260027 metadata/md5-cache/media-video/mkvtoolnix-9999
 2005260027 metadata/md5-cache/media-video/motion-4.1.1-r1
 2005260027 metadata/md5-cache/media-video/motiontrack-0.1.3-r2
-2005260027 metadata/md5-cache/media-video/movit-1.6.1
-2005260027 metadata/md5-cache/media-video/movit-1.6.2
 2005260027 metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
 2005260027 metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
 2005260027 metadata/md5-cache/media-video/mpeg2vidcodec-12-r1
@@ -55137,8 +55179,6 @@
 2005260027 metadata/md5-cache/media-video/simplescreenrecorder-0.4.1
 2005260027 metadata/md5-cache/media-video/simplescreenrecorder-0.4.2
 2005260027 metadata/md5-cache/media-video/simplescreenrecorder-9999
-2005260027 metadata/md5-cache/media-video/smplayer-18.6.0
-2005260027 metadata/md5-cache/media-video/smplayer-19.10.2
 2005260027 metadata/md5-cache/media-video/smtube-19.6.0
 2005260027 metadata/md5-cache/media-video/smtube-20.1.0
 2005260027 metadata/md5-cache/media-video/snappy-1.0-r1
@@ -55158,10 +55198,8 @@
 2005260027 metadata/md5-cache/media-video/unifi-video-3.10.10
 2005260027 metadata/md5-cache/media-video/unifi-video-3.10.11
 2005260027 metadata/md5-cache/media-video/unifi-video-3.10.12
-2005260027 metadata/md5-cache/media-video/ushare-1.1a-r9
 2005260027 metadata/md5-cache/media-video/v4l2loopback-0.12.0
 2005260027 metadata/md5-cache/media-video/v4l2loopback-0.12.1.1_pre
-2005260027 metadata/md5-cache/media-video/v4l2loopback-9999
 2005260027 metadata/md5-cache/media-video/vamps-0.99.2-r2
 2005260027 metadata/md5-cache/media-video/vcdimager-0.7.24
 2005260027 metadata/md5-cache/media-video/vcdimager-2.0.1
@@ -55184,10 +55222,7 @@
 2005260027 metadata/md5-cache/media-video/x264-encoder-9999
 2005260027 metadata/md5-cache/media-video/xine-ui-0.99.10
 2005260027 metadata/md5-cache/media-video/xvattr-1.3-r3
-2005291109 metadata/md5-cache/media-video/smplayer-20.4.2
 2005291209 metadata/md5-cache/media-video/mplayer-9999
-2005301039 metadata/md5-cache/media-video/ffmpeg-4.2.3
-2006011209 metadata/md5-cache/media-video/Manifest.gz
 2006010910 metadata/md5-cache/media-video/devedeng-4.15.0
 2006010910 metadata/md5-cache/media-video/devedeng-4.16.0
 2006010910 metadata/md5-cache/media-video/gaupol-1.7
@@ -55208,6 +55243,18 @@
 2006010910 metadata/md5-cache/media-video/vidcutter-6.0.0
 2006010910 metadata/md5-cache/media-video/vidcutter-9999
 2006010910 metadata/md5-cache/media-video/yle-dl-20200419
+2006041239 metadata/md5-cache/media-video/Manifest.gz
+2006040939 metadata/md5-cache/media-video/ffmpeg-4.2.3
+2006041239 metadata/md5-cache/media-video/mkclean-0.8.10
+2006041039 metadata/md5-cache/media-video/motion-4.3.1
+2006041239 metadata/md5-cache/media-video/movit-1.2.0
+2006041239 metadata/md5-cache/media-video/movit-1.6.1
+2006041239 metadata/md5-cache/media-video/movit-1.6.2
+2006021209 metadata/md5-cache/media-video/rav1e-9999
+2006040939 metadata/md5-cache/media-video/smplayer-20.4.2
+2006041239 metadata/md5-cache/media-video/ushare-1.1a-r9
+2006021739 metadata/md5-cache/media-video/v4l2loopback-0.12.5
+2006021739 metadata/md5-cache/media-video/v4l2loopback-9999
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1910111911 metadata/md5-cache/net-analyzer/bwping-1.15
@@ -55274,7 +55321,6 @@
 2002230040 metadata/md5-cache/net-analyzer/mrtg-ping-probe-2.2.0
 2002230040 metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.2.2
 2002230040 metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
-2002261340 metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
 2002261340 metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r9
 2002261340 metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r10
 2002261340 metadata/md5-cache/net-analyzer/jffnms-0.9.4-r1
@@ -55356,8 +55402,6 @@
 2005260027 metadata/md5-cache/net-analyzer/cloudshark-1.0.2.174
 2005260027 metadata/md5-cache/net-analyzer/cloudshark-1.0.3.180
 2005260027 metadata/md5-cache/net-analyzer/cloudshark-1.0.4
-2005260027 metadata/md5-cache/net-analyzer/cnet-3.3.1
-2005260027 metadata/md5-cache/net-analyzer/cnet-3.3.4
 2005260027 metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
 2005260027 metadata/md5-cache/net-analyzer/cutter-1.03-r1
 2005260027 metadata/md5-cache/net-analyzer/cutter-1.04
@@ -55387,7 +55431,6 @@
 2005260027 metadata/md5-cache/net-analyzer/gensink-4.1-r2
 2005260027 metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
 2005260027 metadata/md5-cache/net-analyzer/goaccess-9999
-2005260027 metadata/md5-cache/net-analyzer/gr-fosphor-9999
 2005260027 metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
 2005260027 metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.0
 2005260027 metadata/md5-cache/net-analyzer/gspoof-3.2-r3
@@ -55541,7 +55584,6 @@
 2005260027 metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
 2005260027 metadata/md5-cache/net-analyzer/openvas-scanner-7.0.0
 2005260027 metadata/md5-cache/net-analyzer/ostinato-0.9_p20180522
-2005260027 metadata/md5-cache/net-analyzer/p0f-3.09_beta
 2005260027 metadata/md5-cache/net-analyzer/packit-1.6.1
 2005260027 metadata/md5-cache/net-analyzer/packit-1.7
 2005260027 metadata/md5-cache/net-analyzer/packit-9999
@@ -55571,7 +55613,6 @@
 2005260027 metadata/md5-cache/net-analyzer/sancp-1.6.1-r4
 2005260027 metadata/md5-cache/net-analyzer/sarg-2.3.11-r1
 2005260027 metadata/md5-cache/net-analyzer/sarg-2.3.11-r2
-2005260027 metadata/md5-cache/net-analyzer/sarg-2.4.0
 2005260027 metadata/md5-cache/net-analyzer/sbd-1.37-r1
 2005260027 metadata/md5-cache/net-analyzer/scanlogd-2.2.7
 2005260027 metadata/md5-cache/net-analyzer/scanssh-2.1
@@ -55675,12 +55716,6 @@
 2005260027 metadata/md5-cache/net-analyzer/yersinia-0.7.3
 2005260027 metadata/md5-cache/net-analyzer/yersinia-0.8.2
 2005260027 metadata/md5-cache/net-analyzer/yersinia-9999
-2005260027 metadata/md5-cache/net-analyzer/zabbix-3.0.30
-2005260027 metadata/md5-cache/net-analyzer/zabbix-3.0.31
-2005260027 metadata/md5-cache/net-analyzer/zabbix-4.0.19
-2005260027 metadata/md5-cache/net-analyzer/zabbix-4.0.20
-2005260027 metadata/md5-cache/net-analyzer/zabbix-4.4.7
-2005260027 metadata/md5-cache/net-analyzer/zabbix-4.4.8
 2005260027 metadata/md5-cache/net-analyzer/zabbix-5.0.0
 2005260027 metadata/md5-cache/net-analyzer/zmap-2.1.1
 2005260027 metadata/md5-cache/net-analyzer/zmap-9999
@@ -55735,14 +55770,24 @@
 2006010910 metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
 2006010910 metadata/md5-cache/net-analyzer/wapiti-3.0.3
 2006010910 metadata/md5-cache/net-analyzer/wapiti-9999
-2006011709 metadata/md5-cache/net-analyzer/Manifest.gz
 2006011539 metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
 2006011709 metadata/md5-cache/net-analyzer/iptraf-ng-1.2.0
-2006011709 metadata/md5-cache/net-analyzer/iptraf-ng-9999
+2006041239 metadata/md5-cache/net-analyzer/Manifest.gz
+2006040939 metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
+2006041239 metadata/md5-cache/net-analyzer/cnet-3.3.1
+2006041239 metadata/md5-cache/net-analyzer/cnet-3.3.4
+2006020009 metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20191202
+2006020009 metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20200131
+2006020009 metadata/md5-cache/net-analyzer/gr-fosphor-9999
+2006031339 metadata/md5-cache/net-analyzer/iptraf-ng-9999
+2006041239 metadata/md5-cache/net-analyzer/p0f-3.09_beta
+2006040939 metadata/md5-cache/net-analyzer/sarg-2.4.0
+2006040939 metadata/md5-cache/net-analyzer/zabbix-3.0.31
+2006040939 metadata/md5-cache/net-analyzer/zabbix-4.0.20
+2006040939 metadata/md5-cache/net-analyzer/zabbix-4.4.8
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2004032241 metadata/md5-cache/net-dialup/ppp-scripts-0
-2005260027 metadata/md5-cache/net-dialup/Manifest.gz
 2005260027 metadata/md5-cache/net-dialup/accel-ppp-1.12.0
 2005260027 metadata/md5-cache/net-dialup/accel-ppp-9999
 2005260027 metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2
@@ -55773,7 +55818,6 @@
 2005260027 metadata/md5-cache/net-dialup/rp-l2tp-0.4-r4
 2005260027 metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
 2005260027 metadata/md5-cache/net-dialup/rp-pppoe-3.13
-2005260027 metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
 2005260027 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2005260027 metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
 2005260027 metadata/md5-cache/net-dialup/tkvoice-1.5
@@ -55784,6 +55828,8 @@
 2005260027 metadata/md5-cache/net-dialup/xl2tpd-1.3.12
 2005260027 metadata/md5-cache/net-dialup/xl2tpd-1.3.13
 2005260027 metadata/md5-cache/net-dialup/xl2tpd-1.3.15
+2006041239 metadata/md5-cache/net-dialup/Manifest.gz
+2006041239 metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
 1909191939 metadata/md5-cache/net-dns/dnscap-1.10.2
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 1810090339 metadata/md5-cache/net-dns/s6-dns-2.3.0.1
@@ -55865,11 +55911,6 @@
 2005260027 metadata/md5-cache/net-dns/nsd-4.3.0
 2005260027 metadata/md5-cache/net-dns/nsd-4.3.1
 2005260027 metadata/md5-cache/net-dns/odsclient-1.03-r1
-2005260027 metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
-2005260027 metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
-2005260027 metadata/md5-cache/net-dns/opendnssec-1.4.8.2
-2005260027 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
-2005260027 metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
 2005260027 metadata/md5-cache/net-dns/pdns-4.1.13
 2005260027 metadata/md5-cache/net-dns/pdns-4.2.0
 2005260027 metadata/md5-cache/net-dns/pdns-4.2.1
@@ -55882,10 +55923,15 @@
 2005260027 metadata/md5-cache/net-dns/resolv_wrapper-1.1.6
 2005260027 metadata/md5-cache/net-dns/sheerdns-1.0.3
 2005260027 metadata/md5-cache/net-dns/unbound-1.10.1
-2006010910 metadata/md5-cache/net-dns/Manifest.gz
 2006010910 metadata/md5-cache/net-dns/dnsviz-0.8.2
 2005301309 metadata/md5-cache/net-dns/pdns-4.3.0
 2005301309 metadata/md5-cache/net-dns/pdns-recursor-4.3.1
+2006041239 metadata/md5-cache/net-dns/Manifest.gz
+2006041239 metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
+2006041239 metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
+2006041239 metadata/md5-cache/net-dns/opendnssec-1.4.8.2
+2006041239 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
+2006041239 metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2005260027 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -56004,7 +56050,6 @@
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 1912111539 metadata/md5-cache/net-ftp/tnftp-20141104
 1912111539 metadata/md5-cache/net-ftp/tnftp-20151004
-2001061909 metadata/md5-cache/net-ftp/uftpd-2.11
 2002230040 metadata/md5-cache/net-ftp/gproftpd-8.3.2-r1
 2003311822 metadata/md5-cache/net-ftp/pureadmin-0.4-r1
 2005260027 metadata/md5-cache/net-ftp/atftp-0.7.2-r1
@@ -56034,8 +56079,9 @@
 2005260027 metadata/md5-cache/net-ftp/yafc-1.3.7
 2005281339 metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
 2005300209 metadata/md5-cache/net-ftp/proftpd-1.3.7_rc3-r1
-2005312038 metadata/md5-cache/net-ftp/Manifest.gz
 2005312038 metadata/md5-cache/net-ftp/proftpd-1.3.7_rc4-r1
+2006041139 metadata/md5-cache/net-ftp/Manifest.gz
+2006041139 metadata/md5-cache/net-ftp/uftpd-2.12
 1910111911 metadata/md5-cache/net-im/centerim-5.0.1
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
 1902181039 metadata/md5-cache/net-im/librvp-0.9.7
@@ -56050,9 +56096,7 @@
 2005042039 metadata/md5-cache/net-im/telegram-desktop-bin-2.1.1
 2005091439 metadata/md5-cache/net-im/telegram-desktop-bin-2.1.3
 2005102009 metadata/md5-cache/net-im/discord-bin-0.0.10
-2005102009 metadata/md5-cache/net-im/teams-1.3.00.5153
 2005150239 metadata/md5-cache/net-im/signal-desktop-bin-1.34.0
-2005182239 metadata/md5-cache/net-im/zoom-5.0.408598.0517
 2005260027 metadata/md5-cache/net-im/bitlbee-3.5.1
 2005260027 metadata/md5-cache/net-im/bitlbee-3.6-r1
 2005260027 metadata/md5-cache/net-im/bitlbee-9999
@@ -56109,7 +56153,6 @@
 2005260027 metadata/md5-cache/net-im/vacuum-9999
 2005260027 metadata/md5-cache/net-im/ysm-2.9.9.1-r1
 2005251839 metadata/md5-cache/net-im/zoom-5.0.413237.0524
-2005280939 metadata/md5-cache/net-im/telegram-desktop-2.1.0
 2005280939 metadata/md5-cache/net-im/telegram-desktop-2.1.7
 2006010910 metadata/md5-cache/net-im/err-5.2.0-r1
 2006010910 metadata/md5-cache/net-im/gajim-1.1.3-r1
@@ -56118,9 +56161,14 @@
 2006010910 metadata/md5-cache/net-im/poezio-9999
 2006010910 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426
 2006010910 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
-2006011508 metadata/md5-cache/net-im/Manifest.gz
 2006011508 metadata/md5-cache/net-im/ekg2-0.4_pre20190315
 2006011508 metadata/md5-cache/net-im/ekg2-9999
+2006040939 metadata/md5-cache/net-im/Manifest.gz
+2006040109 metadata/md5-cache/net-im/skypeforlinux-8.60.0.76
+2006040939 metadata/md5-cache/net-im/teams-1.3.00.5153
+2006040508 metadata/md5-cache/net-im/telegram-desktop-2.1.0
+2006040508 metadata/md5-cache/net-im/telegram-desktop-2.1.8
+2006032139 metadata/md5-cache/net-im/zoom-5.0.418682.0603
 1805212239 metadata/md5-cache/net-irc/dccserver-0.5-r1
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1702282328 metadata/md5-cache/net-irc/nebula-0.5
@@ -56162,7 +56210,6 @@
 2005260027 metadata/md5-cache/net-irc/kvirc-5.2_pre20190628041642
 2005260027 metadata/md5-cache/net-irc/kvirc-5.2_pre20191202122540
 2005260027 metadata/md5-cache/net-irc/kvirc-9999
-2005260027 metadata/md5-cache/net-irc/ngircd-25
 2005260027 metadata/md5-cache/net-irc/onis-0.8.2-r1
 2005260027 metadata/md5-cache/net-irc/pisg-0.73-r1
 2005260027 metadata/md5-cache/net-irc/polari-3.30.2
@@ -56185,12 +56232,14 @@
 2005260027 metadata/md5-cache/net-irc/znc-1.7.5
 2005260027 metadata/md5-cache/net-irc/znc-9999
 2005281039 metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r2
-2006010910 metadata/md5-cache/net-irc/Manifest.gz
 2006010910 metadata/md5-cache/net-irc/limnoria-20191123
 2006010910 metadata/md5-cache/net-irc/limnoria-99999999
 2006010910 metadata/md5-cache/net-irc/quasselgrep-0_p20170411
 2006010910 metadata/md5-cache/net-irc/quasselgrep-0_p20190211
 2006010910 metadata/md5-cache/net-irc/quasselgrep-9999
+2006031839 metadata/md5-cache/net-irc/Manifest.gz
+2006031839 metadata/md5-cache/net-irc/ngircd-25
+2006021639 metadata/md5-cache/net-irc/unrealircd-5.0.5.1
 1801032209 metadata/md5-cache/net-libs/enet-1.2.2-r1
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1908281909 metadata/md5-cache/net-libs/gloox-1.0.22
@@ -56215,8 +56264,6 @@
 1912110241 metadata/md5-cache/net-libs/libisds-0.10.8
 1912232039 metadata/md5-cache/net-libs/libisds-0.11
 2002060910 metadata/md5-cache/net-libs/libasr-1.0.4
-2002092209 metadata/md5-cache/net-libs/libmrss-0.19.2
-2002092209 metadata/md5-cache/net-libs/libnxml-0.18.3
 2002112051 metadata/md5-cache/net-libs/freaklabs-chibiarduino-9999
 2002112051 metadata/md5-cache/net-libs/liba53-9999
 2002131609 metadata/md5-cache/net-libs/aqbanking-6.0.1
@@ -56262,13 +56309,11 @@
 2005260027 metadata/md5-cache/net-libs/enet-1.3.13
 2005260027 metadata/md5-cache/net-libs/farstream-0.2.8-r2
 2005260027 metadata/md5-cache/net-libs/glib-networking-2.60.4
-2005260027 metadata/md5-cache/net-libs/glib-networking-2.62.3
 2005260027 metadata/md5-cache/net-libs/glib-networking-2.64.0
 2005260027 metadata/md5-cache/net-libs/glib-networking-2.64.2
 2005260027 metadata/md5-cache/net-libs/gnet-2.0.8-r2
 2005260027 metadata/md5-cache/net-libs/gnome-online-accounts-3.32.1
 2005260027 metadata/md5-cache/net-libs/gnome-online-accounts-3.34.1
-2005260027 metadata/md5-cache/net-libs/gnutls-3.6.13
 2005260027 metadata/md5-cache/net-libs/google-cloud-cpp-0.10.0
 2005260027 metadata/md5-cache/net-libs/google-cloud-cpp-0.10.0-r1
 2005260027 metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
@@ -56319,7 +56364,6 @@
 2005260027 metadata/md5-cache/net-libs/libbtbb-2018.12.1
 2005260027 metadata/md5-cache/net-libs/libbtbb-9999
 2005260027 metadata/md5-cache/net-libs/libcapi-3.0.7-r1
-2005260027 metadata/md5-cache/net-libs/libcork-0.15.0
 2005260027 metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8
 2005260027 metadata/md5-cache/net-libs/libcrafter-0.3
 2005260027 metadata/md5-cache/net-libs/libcrafter-9999
@@ -56447,7 +56491,6 @@
 2005260027 metadata/md5-cache/net-libs/libsmi-0.5.0
 2005260027 metadata/md5-cache/net-libs/libsoup-2.62.3
 2005260027 metadata/md5-cache/net-libs/libsoup-2.66.4
-2005260027 metadata/md5-cache/net-libs/libsoup-2.70.0
 2005260027 metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
 2005260027 metadata/md5-cache/net-libs/libsrtp-2.2.0
 2005260027 metadata/md5-cache/net-libs/libssh-0.9.4
@@ -56517,8 +56560,6 @@
 2005260027 metadata/md5-cache/net-libs/ntirpc-3.0
 2005260027 metadata/md5-cache/net-libs/ntirpc-3.2
 2005260027 metadata/md5-cache/net-libs/obby-0.4.8-r1
-2005260027 metadata/md5-cache/net-libs/onion-0.8
-2005260027 metadata/md5-cache/net-libs/onion-9999
 2005260027 metadata/md5-cache/net-libs/openmq-cclient-4.4.1
 2005260027 metadata/md5-cache/net-libs/openpgm-5.1.118-r1
 2005260027 metadata/md5-cache/net-libs/openpgm-5.2.122
@@ -56529,13 +56570,6 @@
 2005260027 metadata/md5-cache/net-libs/pjproject-2.7.1-r1
 2005260027 metadata/md5-cache/net-libs/pjproject-2.7.2-r2
 2005260027 metadata/md5-cache/net-libs/pjproject-2.9-r2
-2005260027 metadata/md5-cache/net-libs/quiche-0.1.0-r1
-2005260027 metadata/md5-cache/net-libs/quiche-0.1.0_alpha4_p20190912
-2005260027 metadata/md5-cache/net-libs/quiche-0.2.0
-2005260027 metadata/md5-cache/net-libs/quiche-0.3.0
-2005260027 metadata/md5-cache/net-libs/quiche-0.4.0
-2005260027 metadata/md5-cache/net-libs/quiche-9999
-2005260027 metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
 2005260027 metadata/md5-cache/net-libs/qxmpp-9999
 2005260027 metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
 2005260027 metadata/md5-cache/net-libs/rest-0.8.1
@@ -56571,7 +56605,6 @@
 2005260939 metadata/md5-cache/net-libs/wandio-4.2.3_p1-r1
 2005260027 metadata/md5-cache/net-libs/webkit-gtk-2.24.4
 2005260027 metadata/md5-cache/net-libs/webkit-gtk-2.26.4-r1
-2005260027 metadata/md5-cache/net-libs/webkit-gtk-2.28.2
 2005260027 metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r1
 2005260027 metadata/md5-cache/net-libs/wvstreams-99999
 2005260027 metadata/md5-cache/net-libs/xrootd-4.11.1
@@ -56585,11 +56618,8 @@
 2005260027 metadata/md5-cache/net-libs/zmqpp-4.2.0
 2005281909 metadata/md5-cache/net-libs/rpcsvc-proto-1.4.1-r1
 2005281309 metadata/md5-cache/net-libs/serf-1.3.9-r2
-2005291109 metadata/md5-cache/net-libs/qxmpp-1.2.0
-2006011038 metadata/md5-cache/net-libs/Manifest.gz
 2006011038 metadata/md5-cache/net-libs/libbloom-1.5-r2
 2006010409 metadata/md5-cache/net-libs/libgadu-1.12.2-r1
-2005302239 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
 2005310209 metadata/md5-cache/net-libs/librsync-2.3.1
 2006010910 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.13-r1
 2006010910 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
@@ -56604,6 +56634,26 @@
 2006010910 metadata/md5-cache/net-libs/stem-1.7.0
 2006010910 metadata/md5-cache/net-libs/stem-1.7.1
 2006010910 metadata/md5-cache/net-libs/stem-1.8.0-r1
+2006041239 metadata/md5-cache/net-libs/Manifest.gz
+2006031839 metadata/md5-cache/net-libs/glib-networking-2.62.3
+2006012238 metadata/md5-cache/net-libs/gnutls-3.6.13-r1
+2006021739 metadata/md5-cache/net-libs/libcork-0.15.0-r1
+2006041239 metadata/md5-cache/net-libs/libmrss-0.19.2
+2006040939 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+2006041239 metadata/md5-cache/net-libs/libnxml-0.18.3
+2006031839 metadata/md5-cache/net-libs/libsoup-2.70.0
+2006031909 metadata/md5-cache/net-libs/nghttp2-1.41.0
+2006030039 metadata/md5-cache/net-libs/nodejs-14.4.0
+2006041239 metadata/md5-cache/net-libs/onion-0.8
+2006041239 metadata/md5-cache/net-libs/onion-9999
+2006021209 metadata/md5-cache/net-libs/quiche-0.1.0-r1
+2006021209 metadata/md5-cache/net-libs/quiche-0.1.0_alpha4_p20190912
+2006021209 metadata/md5-cache/net-libs/quiche-0.2.0
+2006021209 metadata/md5-cache/net-libs/quiche-0.3.0
+2006021209 metadata/md5-cache/net-libs/quiche-0.4.0
+2006021209 metadata/md5-cache/net-libs/quiche-9999
+2006040939 metadata/md5-cache/net-libs/qxmpp-1.2.0
+2006012339 metadata/md5-cache/net-libs/webkit-gtk-2.28.2
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -56716,7 +56766,6 @@
 2005260027 metadata/md5-cache/net-mail/sendEmail-1.56-r1
 2005260027 metadata/md5-cache/net-mail/sendEmail-1.56-r2
 2005260027 metadata/md5-cache/net-mail/serialmail-0.75-r4
-2005260027 metadata/md5-cache/net-mail/smtptools-0.2.3
 2005260027 metadata/md5-cache/net-mail/swaks-20130209.0-r1
 2005260027 metadata/md5-cache/net-mail/tnef-1.4.18
 2005260027 metadata/md5-cache/net-mail/tpop3d-1.5.5
@@ -56732,7 +56781,6 @@
 2005281909 metadata/md5-cache/net-mail/mu-1.4.1
 2005281209 metadata/md5-cache/net-mail/smtptools-0.2.3-r1
 2005291509 metadata/md5-cache/net-mail/qmailadmin-1.2.16
-2006010910 metadata/md5-cache/net-mail/Manifest.gz
 2006010910 metadata/md5-cache/net-mail/archivemail-0.9.0-r1
 2006010910 metadata/md5-cache/net-mail/automx2-2019.0
 2006010910 metadata/md5-cache/net-mail/automx2-2020.1-r1
@@ -56751,6 +56799,8 @@
 2005310809 metadata/md5-cache/net-mail/relay-ctrl-3.2
 2006010910 metadata/md5-cache/net-mail/rss2email-3.11
 2006010910 metadata/md5-cache/net-mail/rss2email-3.11-r1
+2006041239 metadata/md5-cache/net-mail/Manifest.gz
+2006041239 metadata/md5-cache/net-mail/smtptools-0.2.3
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1801071509 metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.21-r1
 1810062209 metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
@@ -56801,7 +56851,6 @@
 1906221109 metadata/md5-cache/net-misc/s6-networking-2.3.0.4
 1811071339 metadata/md5-cache/net-misc/sgopherd-18.08
 1702282329 metadata/md5-cache/net-misc/sipcalc-1.1.6
-1710031639 metadata/md5-cache/net-misc/spiped-1.6.0-r1
 1702282329 metadata/md5-cache/net-misc/sshrc-0.6.1
 1901031339 metadata/md5-cache/net-misc/sshrc-0.6.2
 1904290109 metadata/md5-cache/net-misc/stuntman-1.2.15
@@ -56993,8 +57042,6 @@
 2005260027 metadata/md5-cache/net-misc/geomyidae-0.32.2
 2005260027 metadata/md5-cache/net-misc/geomyidae-0.34
 2005260027 metadata/md5-cache/net-misc/gerbera-1.4.0-r1
-2005260027 metadata/md5-cache/net-misc/gerbera-1.5.0
-2005260027 metadata/md5-cache/net-misc/gerbera-9999
 2005260027 metadata/md5-cache/net-misc/getdate-1.2-r1
 2005260027 metadata/md5-cache/net-misc/getdate-1.2-r2
 2005260027 metadata/md5-cache/net-misc/gnome-online-miners-3.34.0
@@ -57074,8 +57121,6 @@
 2005260027 metadata/md5-cache/net-misc/mico-2.3.13-r13
 2005260027 metadata/md5-cache/net-misc/mico-2.3.13-r14
 2005260027 metadata/md5-cache/net-misc/mico-9999
-2005260027 metadata/md5-cache/net-misc/mikutter-3.8.6
-2005260027 metadata/md5-cache/net-misc/mikutter-9999
 2005260027 metadata/md5-cache/net-misc/minidlna-1.2.1-r1
 2005260027 metadata/md5-cache/net-misc/minissdpd-1.5.20190824
 2005260027 metadata/md5-cache/net-misc/miniupnpd-2.1.20200329
@@ -57257,7 +57302,6 @@
 2005260027 metadata/md5-cache/net-misc/socat-1.7.3.3
 2005260027 metadata/md5-cache/net-misc/socat-1.7.3.4
 2005260027 metadata/md5-cache/net-misc/socat-2.0.0_beta9
-2005260027 metadata/md5-cache/net-misc/socat-9999
 2005260027 metadata/md5-cache/net-misc/socket-1.5
 2005260027 metadata/md5-cache/net-misc/spice-gtk-0.37-r2
 2005260027 metadata/md5-cache/net-misc/spice-gtk-0.38
@@ -57321,7 +57365,6 @@
 2005260027 metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
 2005260027 metadata/md5-cache/net-misc/x2goclient-4.1.2.1
 2005260027 metadata/md5-cache/net-misc/x2goclient-4.1.2.1-r1
-2005260027 metadata/md5-cache/net-misc/x2goclient-4.1.2.2
 2005260027 metadata/md5-cache/net-misc/x2goserver-4.1.0.2
 2005260027 metadata/md5-cache/net-misc/x2goserver-4.1.0.3
 2005260027 metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
@@ -57330,16 +57373,10 @@
 2005260027 metadata/md5-cache/net-misc/zssh-1.5c-r1
 2005260027 metadata/md5-cache/net-misc/zsync-0.6.2-r1
 2005271509 metadata/md5-cache/net-misc/kea-1.7.8
-2005272239 metadata/md5-cache/net-misc/usbip-3.19
-2005272239 metadata/md5-cache/net-misc/usbip-4.13
 2005280909 metadata/md5-cache/net-misc/econnman-1.1-r1
 2005281509 metadata/md5-cache/net-misc/eventd-0.27.0-r1
 2005281509 metadata/md5-cache/net-misc/zerotier-1.4.6
-2005292039 metadata/md5-cache/net-misc/dropbox-97.4.467
-2005292039 metadata/md5-cache/net-misc/dropbox-98.4.158
 2005300009 metadata/md5-cache/net-misc/lldpd-1.0.5-r1
-2006010910 metadata/md5-cache/net-misc/Manifest.gz
-2005312238 metadata/md5-cache/net-misc/axel-2.17.8
 2006010910 metadata/md5-cache/net-misc/charm-1.9.2-r2
 2006010910 metadata/md5-cache/net-misc/dmr_utils-9999
 2006010910 metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
@@ -57374,7 +57411,6 @@
 2006010910 metadata/md5-cache/net-misc/python-x2go-0.6.1.3
 2006010910 metadata/md5-cache/net-misc/pytvshows-0.2-r4
 2005311609 metadata/md5-cache/net-misc/r8168-8.048.03
-2006010910 metadata/md5-cache/net-misc/ris-linux-0.4-r1
 2006010910 metadata/md5-cache/net-misc/s3cmd-1.6.1
 2006010910 metadata/md5-cache/net-misc/s3cmd-2.0.0
 2006010910 metadata/md5-cache/net-misc/s3cmd-2.0.2
@@ -57388,6 +57424,19 @@
 2006010910 metadata/md5-cache/net-misc/you-get-0.4.1432
 2006010910 metadata/md5-cache/net-misc/youtube-dl-2020.05.29
 2006010910 metadata/md5-cache/net-misc/youtube-dl-99999999
+2006041239 metadata/md5-cache/net-misc/Manifest.gz
+2006040939 metadata/md5-cache/net-misc/axel-2.17.8
+2006021538 metadata/md5-cache/net-misc/dropbox-98.4.158
+2006040109 metadata/md5-cache/net-misc/gerbera-1.5.0-r1
+2006040109 metadata/md5-cache/net-misc/gerbera-9999
+2006041239 metadata/md5-cache/net-misc/mikutter-3.8.6
+2006041239 metadata/md5-cache/net-misc/mikutter-9999
+2006041239 metadata/md5-cache/net-misc/ris-linux-0.4-r1
+2006031239 metadata/md5-cache/net-misc/socat-9999
+2006040009 metadata/md5-cache/net-misc/spiped-1.6.0-r1
+2006031109 metadata/md5-cache/net-misc/usbip-3.19
+2006031109 metadata/md5-cache/net-misc/usbip-4.13
+2006040939 metadata/md5-cache/net-misc/x2goclient-4.1.2.2
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2002171109 metadata/md5-cache/net-nds/shelldap-1.5.0
@@ -57419,7 +57468,6 @@
 2005260027 metadata/md5-cache/net-news/liferea-1.12.3
 2005260027 metadata/md5-cache/net-news/liferea-1.12.7-r1
 2005260027 metadata/md5-cache/net-news/newsboat-2.13
-2005260027 metadata/md5-cache/net-news/newsboat-2.19-r1
 2005260027 metadata/md5-cache/net-news/quiterss-0.19.3
 2005260027 metadata/md5-cache/net-news/quiterss-9999
 2005260027 metadata/md5-cache/net-news/rssguard-3.5.9-r1
@@ -57428,10 +57476,11 @@
 2005260027 metadata/md5-cache/net-news/snownews-1.5.12-r1
 2005260027 metadata/md5-cache/net-news/snownews-1.5.13
 2005260027 metadata/md5-cache/net-news/snownews-1.6.10
-2006010910 metadata/md5-cache/net-news/Manifest.gz
 2006010910 metadata/md5-cache/net-news/canto-curses-0.9.9
 2006010910 metadata/md5-cache/net-news/canto-daemon-0.9.7
 2006010910 metadata/md5-cache/net-news/rawdog-2.22-r1
+2006021209 metadata/md5-cache/net-news/Manifest.gz
+2006021209 metadata/md5-cache/net-news/newsboat-2.19-r1
 1702282329 metadata/md5-cache/net-nntp/brag-1.4.3
 1909180009 metadata/md5-cache/net-nntp/slrn-1.0.3
 2002121952 metadata/md5-cache/net-nntp/leafnode-1.11.11
@@ -57450,7 +57499,6 @@
 1907151840 metadata/md5-cache/net-p2p/gnut-0.4.28-r1
 1902072239 metadata/md5-cache/net-p2p/go-ethereum-1.8.15
 1806011708 metadata/md5-cache/net-p2p/tvrss-1.8_beta
-1702282329 metadata/md5-cache/net-p2p/vuze-coreplugins-4.8.1.2
 1911232009 metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.6.0
 2003041639 metadata/md5-cache/net-p2p/qbittorrent-4.2.1
 2003041639 metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -57514,7 +57562,6 @@
 2005260027 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
 2005260027 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 2005260027 metadata/md5-cache/net-p2p/tremc-0.9.1
-2005260027 metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
 2005260027 metadata/md5-cache/net-p2p/vuze-5.7.6.0
 2005260027 metadata/md5-cache/net-p2p/xmr-stak-2.10.0
 2005260027 metadata/md5-cache/net-p2p/xmr-stak-2.10.1
@@ -57535,7 +57582,6 @@
 2005260027 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
 2005260027 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
 2005260027 metadata/md5-cache/net-p2p/xmr-stak-rx-9999
-2006010910 metadata/md5-cache/net-p2p/Manifest.gz
 2006010910 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
 2006010910 metadata/md5-cache/net-p2p/deluge-2.0.3-r4
 2006010910 metadata/md5-cache/net-p2p/deluge-2.0.3-r5
@@ -57544,6 +57590,7 @@
 2006010910 metadata/md5-cache/net-p2p/nicotine+-1.4.1-r2
 2006010910 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
 2006010910 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
+2006041108 metadata/md5-cache/net-p2p/Manifest.gz
 1808280009 metadata/md5-cache/net-print/c2esp-27
 1702282329 metadata/md5-cache/net-print/cups-bjnp-1.1
 1702282329 metadata/md5-cache/net-print/cups-bjnp-1.2.1
@@ -57621,10 +57668,7 @@
 2005260027 metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
 2005260027 metadata/md5-cache/net-proxy/dante-1.4.1-r2
 2005260027 metadata/md5-cache/net-proxy/dnsproxy-1.17
-2005260027 metadata/md5-cache/net-proxy/haproxy-1.8.13
 2005260027 metadata/md5-cache/net-proxy/haproxy-1.8.25-r1
-2005260027 metadata/md5-cache/net-proxy/haproxy-1.8.9
-2005260027 metadata/md5-cache/net-proxy/haproxy-1.9.15
 2005260027 metadata/md5-cache/net-proxy/haproxy-1.9.15-r1
 2005260027 metadata/md5-cache/net-proxy/haproxy-1.9.9999
 2005260027 metadata/md5-cache/net-proxy/haproxy-2.0.14
@@ -57647,7 +57691,6 @@
 2005260027 metadata/md5-cache/net-proxy/redsocks-0.5
 2005260027 metadata/md5-cache/net-proxy/redsocks-0.5-r1
 2005260027 metadata/md5-cache/net-proxy/redsocks-9999
-2005260027 metadata/md5-cache/net-proxy/rejik-3.2.10
 2005260027 metadata/md5-cache/net-proxy/squid-4.11
 2005260027 metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2
 2005260027 metadata/md5-cache/net-proxy/squidguard-1.6.0
@@ -57663,10 +57706,13 @@
 2005260027 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
 2005260027 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
 2005291109 metadata/md5-cache/net-proxy/torsocks-2.3.0
-2006010910 metadata/md5-cache/net-proxy/Manifest.gz
 2006010910 metadata/md5-cache/net-proxy/mitmproxy-4.0.4
 2006010608 metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4
 2006010910 metadata/md5-cache/net-proxy/sshuttle-0.78.5
+2006041239 metadata/md5-cache/net-proxy/Manifest.gz
+2006021109 metadata/md5-cache/net-proxy/haproxy-2.1.5
+2006041108 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
+2006041239 metadata/md5-cache/net-proxy/rejik-3.2.10
 2005260027 metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
 2005260027 metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
 2005260027 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
@@ -57779,7 +57825,6 @@
 2005260027 metadata/md5-cache/net-wireless/blueman-9999
 2005260027 metadata/md5-cache/net-wireless/bluez-5.54
 2005260027 metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
-2005260027 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
 2005260027 metadata/md5-cache/net-wireless/bss-0.8-r1
 2005260027 metadata/md5-cache/net-wireless/crackle-0.1
 2005260027 metadata/md5-cache/net-wireless/crackle-9999
@@ -57787,34 +57832,15 @@
 2005260027 metadata/md5-cache/net-wireless/crda-4.14
 2005260027 metadata/md5-cache/net-wireless/cubicsdr-0.2.3-r2
 2005260027 metadata/md5-cache/net-wireless/cubicsdr-9999
-2005260027 metadata/md5-cache/net-wireless/dump1090-1.15_pre20180509
-2005260027 metadata/md5-cache/net-wireless/dump1090-3.7.2
-2005260027 metadata/md5-cache/net-wireless/dump1090-9999
 2005260027 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.1
-2005260027 metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3
 2005260027 metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3
-2005260027 metadata/md5-cache/net-wireless/gnuradio-3.7.9999
-2005260027 metadata/md5-cache/net-wireless/gnuradio-9999
 2005260027 metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
-2005260027 metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
-2005260027 metadata/md5-cache/net-wireless/gqrx-2.12.1
-2005260027 metadata/md5-cache/net-wireless/gqrx-9999
 2005260027 metadata/md5-cache/net-wireless/gqrx-scanner-1.0.1_p20190329
 2005260027 metadata/md5-cache/net-wireless/gr-baz-9999
 2005260027 metadata/md5-cache/net-wireless/gr-doa-9999
 2005260027 metadata/md5-cache/net-wireless/gr-foo-9999
-2005260027 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
-2005260027 metadata/md5-cache/net-wireless/gr-ieee802154-9999
-2005260027 metadata/md5-cache/net-wireless/gr-iio-0.3-r2
-2005260027 metadata/md5-cache/net-wireless/gr-iio-9999
-2005260027 metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
-2005260027 metadata/md5-cache/net-wireless/gr-iqbal-9999
 2005260027 metadata/md5-cache/net-wireless/gr-ntsc-9999
 2005260027 metadata/md5-cache/net-wireless/gr-ntsc-rc-9999
-2005260027 metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5
-2005260027 metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5
-2005260027 metadata/md5-cache/net-wireless/gr-osmosdr-9999
-2005260027 metadata/md5-cache/net-wireless/gr-paint-9999
 2005260027 metadata/md5-cache/net-wireless/gr-ppm-wiegand-9999
 2005260027 metadata/md5-cache/net-wireless/gr-rds-9999
 2005260027 metadata/md5-cache/net-wireless/gr-rftap-9999
@@ -57823,7 +57849,6 @@
 2005260027 metadata/md5-cache/net-wireless/hackrf-tools-9999
 2005260027 metadata/md5-cache/net-wireless/horst-5.1
 2005260027 metadata/md5-cache/net-wireless/horst-9999
-2005260027 metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
 2005260027 metadata/md5-cache/net-wireless/hostapd-2.9-r1
 2005260027 metadata/md5-cache/net-wireless/hostapd-2.9-r2
 2005260027 metadata/md5-cache/net-wireless/hostapd-9999
@@ -57895,14 +57920,6 @@
 2005260027 metadata/md5-cache/net-wireless/ubertooth-2018.08.1
 2005260027 metadata/md5-cache/net-wireless/ubertooth-2018.12.1
 2005260027 metadata/md5-cache/net-wireless/ubertooth-9999
-2005260027 metadata/md5-cache/net-wireless/uhd-3.10.3.0
-2005260027 metadata/md5-cache/net-wireless/uhd-3.11.0.0
-2005260027 metadata/md5-cache/net-wireless/uhd-3.12.0.0
-2005260027 metadata/md5-cache/net-wireless/uhd-3.13.0.1
-2005260027 metadata/md5-cache/net-wireless/uhd-3.13.1.0
-2005260027 metadata/md5-cache/net-wireless/uhd-3.14.0.0
-2005260027 metadata/md5-cache/net-wireless/uhd-3.14.1.1
-2005260027 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1
 2005260027 metadata/md5-cache/net-wireless/unifi-5.12.72
 2005260027 metadata/md5-cache/net-wireless/unifi-5.13.27
 2005260027 metadata/md5-cache/net-wireless/unifi-5.14.7
@@ -57922,13 +57939,10 @@
 2005291209 metadata/md5-cache/net-wireless/lorcon-old-9999
 2005291209 metadata/md5-cache/net-wireless/multimode-9999
 2005291209 metadata/md5-cache/net-wireless/yatebts-9999
-2006010910 metadata/md5-cache/net-wireless/Manifest.gz
 2006010910 metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
 2006010910 metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
 2006010910 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200519
 2006010910 metadata/md5-cache/net-wireless/aircrack-ng-9999
-2006010910 metadata/md5-cache/net-wireless/chirp-20200430
-2006010910 metadata/md5-cache/net-wireless/chirp-99999999
 2006010910 metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
 2006010910 metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0
 2006010910 metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
@@ -57950,8 +57964,37 @@
 2006010910 metadata/md5-cache/net-wireless/rfcat-9999
 2006010910 metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
 2006010910 metadata/md5-cache/net-wireless/soapy_power-9999
-2006010910 metadata/md5-cache/net-wireless/urh-2.8.4
-2006010910 metadata/md5-cache/net-wireless/urh-9999
+2006041239 metadata/md5-cache/net-wireless/Manifest.gz
+2006020109 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
+2006041239 metadata/md5-cache/net-wireless/chirp-20200430
+2006041239 metadata/md5-cache/net-wireless/chirp-99999999
+2006020009 metadata/md5-cache/net-wireless/dump1090-3.7.2
+2006020009 metadata/md5-cache/net-wireless/dump1090-9999
+2006031739 metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1
+2006031739 metadata/md5-cache/net-wireless/gnuradio-9999
+2006041239 metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
+2006041239 metadata/md5-cache/net-wireless/gqrx-2.12.1
+2006041239 metadata/md5-cache/net-wireless/gqrx-9999
+2006020009 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20190606
+2006020009 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
+2006020009 metadata/md5-cache/net-wireless/gr-ieee802154-9999
+2006020009 metadata/md5-cache/net-wireless/gr-iio-0.3-r3
+2006022109 metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
+2006022109 metadata/md5-cache/net-wireless/gr-iio-9999
+2006020009 metadata/md5-cache/net-wireless/gr-iqbal-0.37.3
+2006020009 metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
+2006020009 metadata/md5-cache/net-wireless/gr-iqbal-9999
+2006020009 metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5-r1
+2006020009 metadata/md5-cache/net-wireless/gr-osmosdr-0.2.0
+2006020009 metadata/md5-cache/net-wireless/gr-osmosdr-9999
+2006020009 metadata/md5-cache/net-wireless/gr-paint-0.0_p20200418
+2006020009 metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
+2006020009 metadata/md5-cache/net-wireless/gr-paint-9999
+2006041239 metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
+2006020009 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1
+2006020009 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
+2006020009 metadata/md5-cache/net-wireless/urh-2.8.8
+2006020009 metadata/md5-cache/net-wireless/urh-9999
 1910170740 metadata/md5-cache/perl-core/JSON-PP-2.273.0
 1912110241 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2002110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -58537,7 +58580,6 @@
 2005260027 metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
 2005260027 metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
 2005260027 metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
-2005260027 metadata/md5-cache/sci-chemistry/mopac7-1.15
 2005260027 metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r4
 2005260027 metadata/md5-cache/sci-chemistry/mustang-3.2.2
 2005260027 metadata/md5-cache/sci-chemistry/namd-2.10
@@ -58587,14 +58629,12 @@
 2005260027 metadata/md5-cache/sci-chemistry/votca-csg-1.4.1
 2005260027 metadata/md5-cache/sci-chemistry/votca-csg-1.5
 2005260027 metadata/md5-cache/sci-chemistry/votca-csg-1.5.1
-2005260027 metadata/md5-cache/sci-chemistry/votca-csg-1.6
 2005260027 metadata/md5-cache/sci-chemistry/votca-csg-1.6_rc1
 2005260027 metadata/md5-cache/sci-chemistry/votca-csg-9999
 2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
 2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-1.4.1
 2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-1.5
 2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-1.5.1
-2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-1.6
 2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-1.6_rc1
 2005260027 metadata/md5-cache/sci-chemistry/votca-csgapps-9999
 2005260027 metadata/md5-cache/sci-chemistry/votca-ctp-1.5
@@ -58603,15 +58643,12 @@
 2005260027 metadata/md5-cache/sci-chemistry/votca-xtp-1.4.1
 2005260027 metadata/md5-cache/sci-chemistry/votca-xtp-1.5
 2005260027 metadata/md5-cache/sci-chemistry/votca-xtp-1.5.1
-2005260027 metadata/md5-cache/sci-chemistry/votca-xtp-1.6
 2005260027 metadata/md5-cache/sci-chemistry/votca-xtp-1.6_rc1
 2005260027 metadata/md5-cache/sci-chemistry/votca-xtp-9999
 2005260027 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
 2005260027 metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
-2005291109 metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
 2006010910 metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
 2006010910 metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
-2006010910 metadata/md5-cache/sci-chemistry/Manifest.gz
 2006010910 metadata/md5-cache/sci-chemistry/ParmEd-2.7.3
 2006010910 metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
 2006010910 metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
@@ -58630,7 +58667,12 @@
 2006010910 metadata/md5-cache/sci-chemistry/p3d-9999
 2006010910 metadata/md5-cache/sci-chemistry/propka-3.1_p140511
 2006010910 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
-2006010910 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
+2006041209 metadata/md5-cache/sci-chemistry/Manifest.gz
+2006040939 metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
+2006040039 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
+2006040939 metadata/md5-cache/sci-chemistry/votca-csg-1.6
+2006040939 metadata/md5-cache/sci-chemistry/votca-csgapps-1.6
+2006040939 metadata/md5-cache/sci-chemistry/votca-xtp-1.6
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1801270108 metadata/md5-cache/sci-electronics/iverilog-10.2
@@ -58766,7 +58808,6 @@
 2005260027 metadata/md5-cache/sci-geosciences/gpxsee-7.23
 2005260027 metadata/md5-cache/sci-geosciences/gpxsee-7.25
 2005260027 metadata/md5-cache/sci-geosciences/gpxsee-7.26
-2005260027 metadata/md5-cache/sci-geosciences/gpxsee-7.29
 2005260027 metadata/md5-cache/sci-geosciences/grass-7.4.4
 2005260027 metadata/md5-cache/sci-geosciences/grass-7.4.4-r3
 2005260027 metadata/md5-cache/sci-geosciences/gshhs-1.13
@@ -58842,10 +58883,7 @@
 2005260027 metadata/md5-cache/sci-geosciences/viking-1.7
 2005260027 metadata/md5-cache/sci-geosciences/viking-1.7-r1
 2005260027 metadata/md5-cache/sci-geosciences/xtide-2.15.1
-2005291109 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
-2005291109 metadata/md5-cache/sci-geosciences/gmt-5.4.4
 2005291209 metadata/md5-cache/sci-geosciences/josm-99999
-2006010910 metadata/md5-cache/sci-geosciences/Manifest.gz
 2006010910 metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
 2006010910 metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
 2006010910 metadata/md5-cache/sci-geosciences/gpsd-3.18.1
@@ -58854,6 +58892,10 @@
 2006010910 metadata/md5-cache/sci-geosciences/mapserver-7.2.2
 2006010910 metadata/md5-cache/sci-geosciences/routino-3.3.2
 2006010910 metadata/md5-cache/sci-geosciences/tilecache-2.11-r1
+2006040939 metadata/md5-cache/sci-geosciences/Manifest.gz
+2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
+2006040939 metadata/md5-cache/sci-geosciences/gmt-5.4.4
+2006040939 metadata/md5-cache/sci-geosciences/gpxsee-7.29
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -58881,11 +58923,9 @@
 2002230040 metadata/md5-cache/sci-libs/mkl-rt-2019.4.243
 2002230040 metadata/md5-cache/sci-libs/symmetrica-3.0.1
 2003012209 metadata/md5-cache/sci-libs/givaro-4.1.1
-2003022039 metadata/md5-cache/sci-libs/btf-1.2.6
 2003022039 metadata/md5-cache/sci-libs/camd-2.4.6
 2003022039 metadata/md5-cache/sci-libs/ccolamd-2.9.6
 2003022039 metadata/md5-cache/sci-libs/colamd-2.9.6
-2003022039 metadata/md5-cache/sci-libs/ldl-2.2.6
 2003061809 metadata/md5-cache/sci-libs/m4rie-20200115
 2003160309 metadata/md5-cache/sci-libs/matio-1.5.17
 2003201209 metadata/md5-cache/sci-libs/htslib-1.9
@@ -58898,16 +58938,12 @@
 2004132039 metadata/md5-cache/sci-libs/cddlib-094j
 2004132009 metadata/md5-cache/sci-libs/ogdi-4.1.0
 2004291409 metadata/md5-cache/sci-libs/proj-7.0.0
-2005012109 metadata/md5-cache/sci-libs/geos-3.8.1
 2005081846 metadata/md5-cache/sci-libs/coinor-cbc-2.10.5
 2005081846 metadata/md5-cache/sci-libs/coinor-cgl-0.60.3
 2005081846 metadata/md5-cache/sci-libs/coinor-dylp-1.10.4
 2005081846 metadata/md5-cache/sci-libs/coinor-osi-0.108.6
 2005081846 metadata/md5-cache/sci-libs/coinor-sample-1.2.12
 2005081846 metadata/md5-cache/sci-libs/coinor-vol-1.5.4
-2005152039 metadata/md5-cache/sci-libs/spqr-2.0.9
-2005152039 metadata/md5-cache/sci-libs/suitesparse-5.4.0
-2005162309 metadata/md5-cache/sci-libs/klu-1.3.9
 2005260027 metadata/md5-cache/sci-libs/ViSP-3.2.0-r2
 2005260027 metadata/md5-cache/sci-libs/ViSP-3.3.0
 2005260027 metadata/md5-cache/sci-libs/adolc-2.4.1
@@ -58997,7 +59033,6 @@
 2005260027 metadata/md5-cache/sci-libs/colpack-1.0.10
 2005260027 metadata/md5-cache/sci-libs/cqrlib-1.1.3
 2005260027 metadata/md5-cache/sci-libs/cxsparse-3.1.2-r1
-2005260027 metadata/md5-cache/sci-libs/cxsparse-3.2.0
 2005260027 metadata/md5-cache/sci-libs/dcmtk-3.6.3
 2005260027 metadata/md5-cache/sci-libs/dcmtk-3.6.4-r1
 2005260027 metadata/md5-cache/sci-libs/dcmtk-3.6.5
@@ -59059,7 +59094,6 @@
 2005260027 metadata/md5-cache/sci-libs/itpp-4.3.1-r1
 2005260027 metadata/md5-cache/sci-libs/kim-api-2.1.3
 2005260027 metadata/md5-cache/sci-libs/klu-1.2.1
-2005260027 metadata/md5-cache/sci-libs/lapack-3.8.0
 2005260027 metadata/md5-cache/sci-libs/lapack-3.8.0-r1
 2005260027 metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r4
 2005260027 metadata/md5-cache/sci-libs/lapack-reference-3.6.0
@@ -59115,7 +59149,6 @@
 2005260027 metadata/md5-cache/sci-libs/libtifiles2-1.1.6-r1
 2005260027 metadata/md5-cache/sci-libs/libtifiles2-1.1.7
 2005260027 metadata/md5-cache/sci-libs/libxc-2.1.3
-2005260027 metadata/md5-cache/sci-libs/libxc-2.2.3
 2005260027 metadata/md5-cache/sci-libs/libxc-3.0.0
 2005260027 metadata/md5-cache/sci-libs/linbox-1.6.3
 2005260027 metadata/md5-cache/sci-libs/linux-gpib-4.3.0
@@ -59176,10 +59209,6 @@
 2005260027 metadata/md5-cache/sci-libs/opencascade-7.4.0-r2
 2005260027 metadata/md5-cache/sci-libs/openlibm-0.5.4
 2005260027 metadata/md5-cache/sci-libs/openlibm-0.7.0
-2005260027 metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
-2005260027 metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
-2005260027 metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
-2005260027 metadata/md5-cache/sci-libs/orocos_kdl-9999
 2005260027 metadata/md5-cache/sci-libs/p4est-2.0
 2005260027 metadata/md5-cache/sci-libs/p4est-2.2
 2005260027 metadata/md5-cache/sci-libs/p4est-9999
@@ -59233,7 +59262,6 @@
 2005260027 metadata/md5-cache/sci-libs/superlu_mt-3.1
 2005260027 metadata/md5-cache/sci-libs/symengine-0.5.0-r1
 2005260027 metadata/md5-cache/sci-libs/symengine-0.6.0
-2005260027 metadata/md5-cache/sci-libs/ta-lib-0.4.0
 2005260027 metadata/md5-cache/sci-libs/tamu_anova-0.2-r1
 2005260027 metadata/md5-cache/sci-libs/taucs-2.2
 2005260027 metadata/md5-cache/sci-libs/trilinos-12.14.1
@@ -59248,7 +59276,6 @@
 2005260027 metadata/md5-cache/sci-libs/votca-tools-1.4.1
 2005260027 metadata/md5-cache/sci-libs/votca-tools-1.5
 2005260027 metadata/md5-cache/sci-libs/votca-tools-1.5.1
-2005260027 metadata/md5-cache/sci-libs/votca-tools-1.6
 2005260027 metadata/md5-cache/sci-libs/votca-tools-1.6_rc1
 2005260027 metadata/md5-cache/sci-libs/votca-tools-9999
 2005260027 metadata/md5-cache/sci-libs/vtk-8.1.0-r7
@@ -59263,7 +59290,6 @@
 2005260027 metadata/md5-cache/sci-libs/xylib-1.2
 2005280139 metadata/md5-cache/sci-libs/indilib-1.8.5
 2005291209 metadata/md5-cache/sci-libs/libmems-9999
-2006011009 metadata/md5-cache/sci-libs/Manifest.gz
 2006010910 metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
 2006010910 metadata/md5-cache/sci-libs/Shapely-1.6.4_p2-r1
 2006010910 metadata/md5-cache/sci-libs/bmrblib-1.0.3
@@ -59311,6 +59337,23 @@
 2006010910 metadata/md5-cache/sci-libs/tensorflow-estimator-2.0.1
 2006010910 metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
 2006010910 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0
+2006041239 metadata/md5-cache/sci-libs/Manifest.gz
+2006030139 metadata/md5-cache/sci-libs/btf-1.2.6
+2006030139 metadata/md5-cache/sci-libs/cxsparse-3.2.0
+2006041239 metadata/md5-cache/sci-libs/geos-3.8.1
+2006030139 metadata/md5-cache/sci-libs/klu-1.3.9
+2006012309 metadata/md5-cache/sci-libs/lapack-3.8.0
+2006030139 metadata/md5-cache/sci-libs/ldl-2.2.6
+2006040939 metadata/md5-cache/sci-libs/libxc-2.2.3
+2006041239 metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
+2006041239 metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
+2006041239 metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
+2006041239 metadata/md5-cache/sci-libs/orocos_kdl-9999
+2006030139 metadata/md5-cache/sci-libs/spqr-2.0.9
+2006030139 metadata/md5-cache/sci-libs/suitesparse-5.4.0
+2006041239 metadata/md5-cache/sci-libs/ta-lib-0.4.0
+2006020009 metadata/md5-cache/sci-libs/volk-2.3.0
+2006040939 metadata/md5-cache/sci-libs/votca-tools-1.6
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -59406,7 +59449,6 @@
 2005260027 metadata/md5-cache/sci-mathematics/octave-4.4.0
 2005260027 metadata/md5-cache/sci-mathematics/octave-4.4.1
 2005260027 metadata/md5-cache/sci-mathematics/octave-5.1.0
-2005260027 metadata/md5-cache/sci-mathematics/octave-5.2.0
 2005260027 metadata/md5-cache/sci-mathematics/octave-epstk-2.4
 2005260027 metadata/md5-cache/sci-mathematics/otter-3.3-r3
 2005260027 metadata/md5-cache/sci-mathematics/pari-2.11.2
@@ -59450,9 +59492,10 @@
 2005291209 metadata/md5-cache/sci-mathematics/gmp-ecm-9999
 2005291209 metadata/md5-cache/sci-mathematics/msieve-9999
 2005291209 metadata/md5-cache/sci-mathematics/yafu-9999
-2006010910 metadata/md5-cache/sci-mathematics/Manifest.gz
 2006010910 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
 2006010910 metadata/md5-cache/sci-mathematics/pymc3-3.1-r1
+2006040939 metadata/md5-cache/sci-mathematics/Manifest.gz
+2006040939 metadata/md5-cache/sci-mathematics/octave-5.2.0
 1908291909 metadata/md5-cache/sci-misc/ViSP-images-3.2.0
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 1905030409 metadata/md5-cache/sci-misc/tango-9.2.5a
@@ -59486,9 +59529,6 @@
 1805170109 metadata/md5-cache/sci-physics/h2o-gtk-0.1-r1
 1702282331 metadata/md5-cache/sci-physics/siscone-3.0.3
 2003012209 metadata/md5-cache/sci-physics/lhapdf-5.9.1
-2004271209 metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
-2004271209 metadata/md5-cache/sci-physics/geant-data-4.10.6_beta1-r1
-2004271209 metadata/md5-cache/sci-physics/geant-data-4.10.6_p1-r1
 2005260027 metadata/md5-cache/sci-physics/bullet-2.86
 2005260027 metadata/md5-cache/sci-physics/cernlib-2006-r5
 2005260027 metadata/md5-cache/sci-physics/cernlib-2006-r6
@@ -59504,10 +59544,6 @@
 2005260027 metadata/md5-cache/sci-physics/espresso-9999
 2005260027 metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
 2005260027 metadata/md5-cache/sci-physics/fastjet-3.0.6-r1
-2005260027 metadata/md5-cache/sci-physics/geant-4.10.05_p01
-2005260027 metadata/md5-cache/sci-physics/geant-4.10.6-r1
-2005260027 metadata/md5-cache/sci-physics/geant-4.10.6_beta1-r1
-2005260027 metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1
 2005260027 metadata/md5-cache/sci-physics/geant-vmc-4.4.0
 2005260027 metadata/md5-cache/sci-physics/geant-vmc-4.5.1_p1
 2005260027 metadata/md5-cache/sci-physics/geant-vmc-9999
@@ -59560,10 +59596,18 @@
 2005260027 metadata/md5-cache/sci-physics/xfoil-6.99
 2005260027 metadata/md5-cache/sci-physics/yoda-1.6.5
 2005260027 metadata/md5-cache/sci-physics/yoda-1.7.0-r1
-2006010910 metadata/md5-cache/sci-physics/Manifest.gz
 2006010910 metadata/md5-cache/sci-physics/lhapdf-6.2.3
 2006010910 metadata/md5-cache/sci-physics/qmeq-1.0
 2006010910 metadata/md5-cache/sci-physics/qutip-4.2.0
+2006040939 metadata/md5-cache/sci-physics/Manifest.gz
+2006031109 metadata/md5-cache/sci-physics/geant-4.10.05_p01
+2006031109 metadata/md5-cache/sci-physics/geant-4.10.6-r1
+2006031109 metadata/md5-cache/sci-physics/geant-4.10.6_beta1-r1
+2006031109 metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1
+2006031109 metadata/md5-cache/sci-physics/geant-4.10.6_p2
+2006040939 metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
+2006040939 metadata/md5-cache/sci-physics/geant-data-4.10.6_beta1-r1
+2006040939 metadata/md5-cache/sci-physics/geant-data-4.10.6_p1-r1
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
 2005260027 metadata/md5-cache/sci-visualization/epix-1.2.11-r2
 2005260027 metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
@@ -60466,12 +60510,10 @@
 2002112051 metadata/md5-cache/sys-apps/logwatch-9999
 2002140110 metadata/md5-cache/sys-apps/yarn-1.22.0
 2002222009 metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
-2002261340 metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
 2003042239 metadata/md5-cache/sys-apps/mlxup-bin-4.13.0
 2003110809 metadata/md5-cache/sys-apps/yarn-1.22.4
 2003121709 metadata/md5-cache/sys-apps/osinfo-db-20200214
 2003130209 metadata/md5-cache/sys-apps/ipmicfg-1.31.0.200205
-2003122309 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
 2003160109 metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r1
 2003261841 metadata/md5-cache/sys-apps/help2man-1.47.13
 2003261841 metadata/md5-cache/sys-apps/nosig-2
@@ -60489,12 +60531,8 @@
 2004032241 metadata/md5-cache/sys-apps/opentmpfiles-0.2
 2004032241 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
 2004032241 metadata/md5-cache/sys-apps/sdparm-1.10
-2004041909 metadata/md5-cache/sys-apps/bat-0.12.1-r1
-2004041909 metadata/md5-cache/sys-apps/bat-0.13.0
-2004041909 metadata/md5-cache/sys-apps/lsd-0.16.0
 2004130409 metadata/md5-cache/sys-apps/inxi-3.0.38.1
 2004152239 metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
-2004160809 metadata/md5-cache/sys-apps/lsd-0.17.0
 2004191909 metadata/md5-cache/sys-apps/osinfo-db-20200325
 2004201739 metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
 2004211009 metadata/md5-cache/sys-apps/cracklib-words-2.9.6
@@ -60503,7 +60541,6 @@
 2004211009 metadata/md5-cache/sys-apps/opentmpfiles-0.1.1
 2004211009 metadata/md5-cache/sys-apps/opentmpfiles-0.1.2
 2004211009 metadata/md5-cache/sys-apps/opentmpfiles-0.1.3
-2004251539 metadata/md5-cache/sys-apps/bat-0.15.0
 2004261309 metadata/md5-cache/sys-apps/help2man-1.47.14
 2004271839 metadata/md5-cache/sys-apps/help2man-1.47.15
 2004290209 metadata/md5-cache/sys-apps/hponcfg-5.5.0.0
@@ -60523,7 +60560,6 @@
 2005260027 metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r1
 2005260027 metadata/md5-cache/sys-apps/apparmor-2.13.4
 2005260027 metadata/md5-cache/sys-apps/apparmor-utils-2.13.4-r1
-2005270409 metadata/md5-cache/sys-apps/apply-default-acl-0.4.3
 2005260027 metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
 2005260027 metadata/md5-cache/sys-apps/attr-2.4.48-r3
 2005260027 metadata/md5-cache/sys-apps/attr-9999
@@ -60551,7 +60587,6 @@
 2005260027 metadata/md5-cache/sys-apps/chname-1.1
 2005260027 metadata/md5-cache/sys-apps/cinit-0.2.1
 2005260027 metadata/md5-cache/sys-apps/colorized-logs-2.4
-2005260027 metadata/md5-cache/sys-apps/colorized-logs-2.5
 2005260027 metadata/md5-cache/sys-apps/consolation-0.0.7
 2005260027 metadata/md5-cache/sys-apps/conspy-1.10
 2005260027 metadata/md5-cache/sys-apps/conspy-1.14
@@ -60561,8 +60596,6 @@
 2005260027 metadata/md5-cache/sys-apps/cpint-2.5.3
 2005260027 metadata/md5-cache/sys-apps/cpuid-20180519
 2005260027 metadata/md5-cache/sys-apps/cpuid-20200427
-2005260027 metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2
-2005260027 metadata/md5-cache/sys-apps/crazydiskinfo-1.1.0
 2005260027 metadata/md5-cache/sys-apps/daisydog-2014.05.30
 2005260027 metadata/md5-cache/sys-apps/darwin-miscutils-10
 2005260027 metadata/md5-cache/sys-apps/darwin-miscutils-11
@@ -60612,15 +60645,10 @@
 2005260027 metadata/md5-cache/sys-apps/ethq-0.5.0
 2005260027 metadata/md5-cache/sys-apps/ethq-0.6.1
 2005260027 metadata/md5-cache/sys-apps/ethq-9999
-2005260027 metadata/md5-cache/sys-apps/exa-0.9.0
 2005260027 metadata/md5-cache/sys-apps/fakeroot-1.22
 2005260027 metadata/md5-cache/sys-apps/fakeroot-1.23
 2005260027 metadata/md5-cache/sys-apps/fakeroot-1.24
 2005260027 metadata/md5-cache/sys-apps/fbset-2.1
-2005260027 metadata/md5-cache/sys-apps/fd-7.4.0
-2005260027 metadata/md5-cache/sys-apps/fd-7.5.0
-2005260027 metadata/md5-cache/sys-apps/fd-8.0.0
-2005260739 metadata/md5-cache/sys-apps/fd-8.1.1
 2005260027 metadata/md5-cache/sys-apps/findutils-4.7.0
 2005260027 metadata/md5-cache/sys-apps/flashrom-0.9.8
 2005260027 metadata/md5-cache/sys-apps/flashrom-1.2-r1
@@ -60680,7 +60708,6 @@
 2005260027 metadata/md5-cache/sys-apps/hwloc-1.11.13
 2005260027 metadata/md5-cache/sys-apps/hwloc-1.11.2-r1
 2005260027 metadata/md5-cache/sys-apps/hwloc-2.0.4
-2005260027 metadata/md5-cache/sys-apps/hwloc-2.1.0
 2005260027 metadata/md5-cache/sys-apps/hwsetup-1.2-r3
 2005260027 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.3.6
 2005260027 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.3.7
@@ -60747,7 +60774,6 @@
 2005260027 metadata/md5-cache/sys-apps/makedev-3.23.1-r1
 2005260027 metadata/md5-cache/sys-apps/man-db-2.8.7
 2005260027 metadata/md5-cache/sys-apps/man-db-2.9.1
-2005260027 metadata/md5-cache/sys-apps/man-db-9999
 2005260027 metadata/md5-cache/sys-apps/man-pages-posix-2013a
 2005260027 metadata/md5-cache/sys-apps/man2html-1.6g
 2005260027 metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
@@ -60824,11 +60850,8 @@
 2005260027 metadata/md5-cache/sys-apps/restorecond-2.9
 2005260027 metadata/md5-cache/sys-apps/restorecond-3.0
 2005260027 metadata/md5-cache/sys-apps/restorecond-9999
-2005260027 metadata/md5-cache/sys-apps/ripgrep-11.0.2
-2005260027 metadata/md5-cache/sys-apps/ripgrep-12.0.1
 2005260027 metadata/md5-cache/sys-apps/rkflashtool-6.1
 2005260027 metadata/md5-cache/sys-apps/rng-tools-5-r2
-2005260027 metadata/md5-cache/sys-apps/rng-tools-6.10
 2005260027 metadata/md5-cache/sys-apps/rng-tools-6.6-r1
 2005260027 metadata/md5-cache/sys-apps/rng-tools-6.7-r1
 2005260027 metadata/md5-cache/sys-apps/rng-tools-6.7-r2
@@ -60943,15 +60966,11 @@
 2005260027 metadata/md5-cache/sys-apps/zorroutils-0.05
 2005290509 metadata/md5-cache/sys-apps/lsvpd-1.7.11
 2005281139 metadata/md5-cache/sys-apps/prctl-1.6-r1
-2005291109 metadata/md5-cache/sys-apps/qdirstat-1.6.1
 2005291209 metadata/md5-cache/sys-apps/smartmontools-9999
 2005291209 metadata/md5-cache/sys-apps/superiotool-99999999
 2005301209 metadata/md5-cache/sys-apps/debianutils-4.11
 2005300709 metadata/md5-cache/sys-apps/gawk-4.2.1-r1
 2005300709 metadata/md5-cache/sys-apps/gawk-5.1.0
-2005292309 metadata/md5-cache/sys-apps/ripgrep-12.1.1
-2006010910 metadata/md5-cache/sys-apps/Manifest.gz
-2006010910 metadata/md5-cache/sys-apps/bleachbit-3.0
 2006010910 metadata/md5-cache/sys-apps/bleachbit-4.0.0
 2006010910 metadata/md5-cache/sys-apps/elivepatch-client-0.1
 2006010910 metadata/md5-cache/sys-apps/elivepatch-client-9999
@@ -60971,16 +60990,40 @@
 2005311239 metadata/md5-cache/sys-apps/pciutils-3.7.0
 2006010910 metadata/md5-cache/sys-apps/pkgcore-0.10.12
 2006010910 metadata/md5-cache/sys-apps/pkgcore-9999
-2006010910 metadata/md5-cache/sys-apps/portage-2.3.100
 2006010910 metadata/md5-cache/sys-apps/portage-2.3.99-r2
 2006010910 metadata/md5-cache/sys-apps/portage-9999
 2005311309 metadata/md5-cache/sys-apps/s390-tools-2.12.0
 2005311339 metadata/md5-cache/sys-apps/salinfo-1.2
-2005312238 metadata/md5-cache/sys-apps/sandbox-2.18
 2005311409 metadata/md5-cache/sys-apps/sandbox-2.20
-2005310539 metadata/md5-cache/sys-apps/systemd-244.3
 2005310539 metadata/md5-cache/sys-apps/systemd-245.5
 2005310539 metadata/md5-cache/sys-apps/systemd-9999
+2006041239 metadata/md5-cache/sys-apps/Manifest.gz
+2006020038 metadata/md5-cache/sys-apps/apply-default-acl-0.4.4
+2006021209 metadata/md5-cache/sys-apps/bat-0.12.1-r1
+2006021209 metadata/md5-cache/sys-apps/bat-0.13.0
+2006021209 metadata/md5-cache/sys-apps/bat-0.15.0
+2006040939 metadata/md5-cache/sys-apps/colorized-logs-2.5
+2006041009 metadata/md5-cache/sys-apps/crazydiskinfo-1.1.0
+2006021209 metadata/md5-cache/sys-apps/exa-0.9.0
+2006021209 metadata/md5-cache/sys-apps/fd-7.4.0
+2006021209 metadata/md5-cache/sys-apps/fd-7.5.0
+2006021209 metadata/md5-cache/sys-apps/fd-8.0.0
+2006021209 metadata/md5-cache/sys-apps/fd-8.1.1
+2006041239 metadata/md5-cache/sys-apps/hwloc-2.1.0
+2006021209 metadata/md5-cache/sys-apps/lsd-0.16.0
+2006021209 metadata/md5-cache/sys-apps/lsd-0.17.0
+2006021239 metadata/md5-cache/sys-apps/man-db-2.9.2
+2006021239 metadata/md5-cache/sys-apps/man-db-9999
+2006041239 metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
+2006031109 metadata/md5-cache/sys-apps/portage-2.3.100-r1
+2006040939 metadata/md5-cache/sys-apps/qdirstat-1.6.1
+2006021209 metadata/md5-cache/sys-apps/ripgrep-11.0.2
+2006021209 metadata/md5-cache/sys-apps/ripgrep-12.0.1
+2006021209 metadata/md5-cache/sys-apps/ripgrep-12.1.1
+2006040939 metadata/md5-cache/sys-apps/rng-tools-6.10
+2006040939 metadata/md5-cache/sys-apps/sandbox-2.18
+2006020138 metadata/md5-cache/sys-apps/systemd-244.3
+2006012339 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 1702282333 metadata/md5-cache/sys-auth/ykclient-2.15
 2001012339 metadata/md5-cache/sys-auth/pam_mount-2.16
@@ -60990,7 +61033,6 @@
 2003261841 metadata/md5-cache/sys-auth/pambase-20191128
 2003261841 metadata/md5-cache/sys-auth/pambase-20200304
 2004032241 metadata/md5-cache/sys-auth/nss-myhostname-0.3
-2004032241 metadata/md5-cache/sys-auth/realtime-base-0.1
 2004211009 metadata/md5-cache/sys-auth/pam_passwdqc-1.3.0
 2004211009 metadata/md5-cache/sys-auth/pambase-20190402
 2005260027 metadata/md5-cache/sys-auth/authenticator-0.2.4-r1
@@ -61070,7 +61112,6 @@
 2005260027 metadata/md5-cache/sys-auth/ykpers-1.20.0
 2005260027 metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2
 2005260027 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
-2006010910 metadata/md5-cache/sys-auth/Manifest.gz
 2006010910 metadata/md5-cache/sys-auth/keystone-16.0.0
 2006010910 metadata/md5-cache/sys-auth/keystone-16.0.1
 2006010910 metadata/md5-cache/sys-auth/keystone-17.0.0
@@ -61079,6 +61120,8 @@
 2006010910 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
 2006010910 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.1
 2006010910 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
+2006041239 metadata/md5-cache/sys-auth/Manifest.gz
+2006041239 metadata/md5-cache/sys-auth/realtime-base-0.1
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -61122,9 +61165,6 @@
 2004290209 metadata/md5-cache/sys-block/storcli-7.1316
 2005260027 metadata/md5-cache/sys-block/aoetools-36
 2005260027 metadata/md5-cache/sys-block/aoetools-37
-2005260027 metadata/md5-cache/sys-block/blktrace-1.1.0
-2005260027 metadata/md5-cache/sys-block/blktrace-1.1.0-r1
-2005260027 metadata/md5-cache/sys-block/blktrace-1.2.0
 2005260027 metadata/md5-cache/sys-block/buffer-1.19-r2
 2005260027 metadata/md5-cache/sys-block/cec-14
 2005260027 metadata/md5-cache/sys-block/di-4.47
@@ -61203,7 +61243,6 @@
 2005260027 metadata/md5-cache/sys-block/zram-init-8.1-r1
 2005260027 metadata/md5-cache/sys-block/zram-init-9.1
 2005260027 metadata/md5-cache/sys-block/zram-init-9999
-2006010910 metadata/md5-cache/sys-block/Manifest.gz
 2005311909 metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
 2005311909 metadata/md5-cache/sys-block/arcconf-3.01.23531
 2005311909 metadata/md5-cache/sys-block/arcconf-3.04.23699
@@ -61212,6 +61251,10 @@
 2006010910 metadata/md5-cache/sys-block/seekwatcher-0.13
 2006010910 metadata/md5-cache/sys-block/targetcli-fb-2.1.49
 2006010910 metadata/md5-cache/sys-block/targetcli-fb-2.1.51
+2006041239 metadata/md5-cache/sys-block/Manifest.gz
+2006041239 metadata/md5-cache/sys-block/blktrace-1.1.0
+2006041239 metadata/md5-cache/sys-block/blktrace-1.1.0-r1
+2006041239 metadata/md5-cache/sys-block/blktrace-1.2.0
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.1
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
@@ -61226,7 +61269,6 @@
 2005260027 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
 2005260027 metadata/md5-cache/sys-boot/arcload-0.50-r1
 2005260027 metadata/md5-cache/sys-boot/arcload-0.50-r3
-2005260027 metadata/md5-cache/sys-boot/colo-1.22
 2005260027 metadata/md5-cache/sys-boot/cromwell-2.40-r3
 2005260027 metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
 2005260027 metadata/md5-cache/sys-boot/efibootmgr-14
@@ -61280,9 +61322,11 @@
 2005260027 metadata/md5-cache/sys-boot/yaboot-static-1.3.16-r1
 2005260027 metadata/md5-cache/sys-boot/yaboot-static-1.3.17-r1
 2005301239 metadata/md5-cache/sys-boot/elilo-3.16-r3
-2005311039 metadata/md5-cache/sys-boot/Manifest.gz
 2005310139 metadata/md5-cache/sys-boot/palo-2.14
 2005311039 metadata/md5-cache/sys-boot/palo-9999
+2006041239 metadata/md5-cache/sys-boot/Manifest.gz
+2006041239 metadata/md5-cache/sys-boot/colo-1.22
+2006030539 metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
 1812141709 metadata/md5-cache/sys-cluster/charliecloud-0.9.6
 1905311709 metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1
 1712240039 metadata/md5-cache/sys-cluster/native-mpi-0
@@ -61359,12 +61403,6 @@
 2005260027 metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
 2005260027 metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
 2005260027 metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
-2005260027 metadata/md5-cache/sys-cluster/galera-25.3.25
-2005260027 metadata/md5-cache/sys-cluster/galera-25.3.26
-2005260027 metadata/md5-cache/sys-cluster/galera-25.3.28
-2005260027 metadata/md5-cache/sys-cluster/galera-25.3.28-r1
-2005260027 metadata/md5-cache/sys-cluster/galera-26.4.2
-2005260027 metadata/md5-cache/sys-cluster/galera-26.4.3
 2005260027 metadata/md5-cache/sys-cluster/galera-26.4.4
 2005260027 metadata/md5-cache/sys-cluster/gasnet-1.26.4
 2005260027 metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
@@ -61390,7 +61428,6 @@
 2005260027 metadata/md5-cache/sys-cluster/ipvsadm-1.28
 2005260027 metadata/md5-cache/sys-cluster/keepalived-2.0.17
 2005260027 metadata/md5-cache/sys-cluster/keepalived-2.0.19
-2005260027 metadata/md5-cache/sys-cluster/keepalived-2.0.20
 2005260027 metadata/md5-cache/sys-cluster/knem-1.1.3
 2005260027 metadata/md5-cache/sys-cluster/knem-9999
 2005260027 metadata/md5-cache/sys-cluster/kubeadm-1.15.10
@@ -61499,11 +61536,9 @@
 2005260027 metadata/md5-cache/sys-cluster/vzctl-4.9.4
 2005260027 metadata/md5-cache/sys-cluster/wulfware-2.6.0
 2005281609 metadata/md5-cache/sys-cluster/libcircle-0.3.0
-2006011009 metadata/md5-cache/sys-cluster/Manifest.gz
 2006010910 metadata/md5-cache/sys-cluster/ceph-12.2.12-r3
 2006010910 metadata/md5-cache/sys-cluster/ceph-14.2.7-r1
 2006010910 metadata/md5-cache/sys-cluster/ceph-14.2.9-r1
-2006011009 metadata/md5-cache/sys-cluster/ceph-15.2.3
 2006010910 metadata/md5-cache/sys-cluster/cinder-15.1.0-r1
 2006010910 metadata/md5-cache/sys-cluster/cinder-16.0.0
 2006010910 metadata/md5-cache/sys-cluster/cinder-2019.2.9999
@@ -61538,18 +61573,24 @@
 2006010910 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11
 2006010910 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12
 2006010910 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13
+2006041239 metadata/md5-cache/sys-cluster/Manifest.gz
+2006012239 metadata/md5-cache/sys-cluster/ceph-15.2.3
+2006041239 metadata/md5-cache/sys-cluster/galera-25.3.25
+2006041239 metadata/md5-cache/sys-cluster/galera-25.3.26
+2006041239 metadata/md5-cache/sys-cluster/galera-25.3.28
+2006041239 metadata/md5-cache/sys-cluster/galera-25.3.28-r1
+2006041239 metadata/md5-cache/sys-cluster/galera-26.4.2
+2006041239 metadata/md5-cache/sys-cluster/galera-26.4.3
+2006040939 metadata/md5-cache/sys-cluster/keepalived-2.0.20
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1910111911 metadata/md5-cache/sys-devel/llvm-common-8.0.1
-1909170139 metadata/md5-cache/sys-devel/llvmgold-8
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.5
 2001182039 metadata/md5-cache/sys-devel/llvmgold-11
 2002112051 metadata/md5-cache/sys-devel/ct-ng-1.24.0
 2002112051 metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
-2003042209 metadata/md5-cache/sys-devel/llvmgold-10
 2003092139 metadata/md5-cache/sys-devel/llvm-common-9.0.1
-2003092139 metadata/md5-cache/sys-devel/llvmgold-9
 2003121009 metadata/md5-cache/sys-devel/parity-2.0.1
 2003250109 metadata/md5-cache/sys-devel/llvm-common-10.0.0
 2003261841 metadata/md5-cache/sys-devel/autoconf-2.69-r5
@@ -61715,9 +61756,6 @@
 2005260027 metadata/md5-cache/sys-devel/patch-2.7.6-r4
 2005260027 metadata/md5-cache/sys-devel/pmake-1.111.3.3
 2005260027 metadata/md5-cache/sys-devel/prelink-20151030
-2005260027 metadata/md5-cache/sys-devel/prelink-99999999
-2005260027 metadata/md5-cache/sys-devel/qconf-2.3
-2005260027 metadata/md5-cache/sys-devel/qconf-2.4
 2005260027 metadata/md5-cache/sys-devel/smatch-1.60
 2005260027 metadata/md5-cache/sys-devel/smatch-9999
 2005260027 metadata/md5-cache/sys-devel/sparse-0.5.1
@@ -61740,16 +61778,20 @@
 2005281709 metadata/md5-cache/sys-devel/llvm-roc-3.5.0
 2005281509 metadata/md5-cache/sys-devel/sparse-0.6.1
 2005281509 metadata/md5-cache/sys-devel/sparse-9999
-2005291109 metadata/md5-cache/sys-devel/qconf-2.5
 2005300039 metadata/md5-cache/sys-devel/gcc-4.9.4-r1
 2005300039 metadata/md5-cache/sys-devel/gcc-5.5.0
-2005300039 metadata/md5-cache/sys-devel/gcc-6.5.0-r1
-2005300039 metadata/md5-cache/sys-devel/gcc-6.5.0-r2
 2005300039 metadata/md5-cache/sys-devel/gcc-7.5.0-r1
 2005300039 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
 2005300039 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
-2005311609 metadata/md5-cache/sys-devel/Manifest.gz
 2005311609 metadata/md5-cache/sys-devel/distcc-3.3.3-r1
+2006041209 metadata/md5-cache/sys-devel/Manifest.gz
+2006040009 metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+2006040009 metadata/md5-cache/sys-devel/gcc-6.5.0-r2
+2006040739 metadata/md5-cache/sys-devel/llvmgold-10
+2006040739 metadata/md5-cache/sys-devel/llvmgold-8
+2006040739 metadata/md5-cache/sys-devel/llvmgold-9
+2006041139 metadata/md5-cache/sys-devel/prelink-99999999
+2006040939 metadata/md5-cache/sys-devel/qconf-2.5
 2005260027 metadata/md5-cache/sys-fabric/Manifest.gz
 2005260027 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2005260027 metadata/md5-cache/sys-fabric/ibacm-1.0.8
@@ -61801,13 +61843,11 @@
 1912111540 metadata/md5-cache/sys-firmware/b43-firmware-6.30.163.46
 2004071209 metadata/md5-cache/sys-firmware/sof-firmware-1.4.2
 2004150409 metadata/md5-cache/sys-firmware/broadcom-bt-firmware-12.0.1.1011_p1
-2005260027 metadata/md5-cache/sys-firmware/Manifest.gz
 2005260027 metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
 2005260027 metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
 2005260027 metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
 2005260027 metadata/md5-cache/sys-firmware/edk2-ovmf-201905
 2005260027 metadata/md5-cache/sys-firmware/edk2-ovmf-999999
-2005260027 metadata/md5-cache/sys-firmware/intel-microcode-20200508_p20200508
 2005260027 metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
 2005260027 metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
 2005260027 metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
@@ -61850,6 +61890,8 @@
 2005260027 metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
 2005260027 metadata/md5-cache/sys-firmware/vgabios-0.7a
 2005260027 metadata/md5-cache/sys-firmware/vgabios-0.7a-r1
+2006020138 metadata/md5-cache/sys-firmware/Manifest.gz
+2006020138 metadata/md5-cache/sys-firmware/intel-microcode-20200520_p20200601
 1812311909 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
@@ -61883,9 +61925,7 @@
 2002112051 metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
 2002112051 metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
 2002112051 metadata/md5-cache/sys-fs/genext2fs-1.4.1
-2002112051 metadata/md5-cache/sys-fs/ncdu-1.14.1
 2002112051 metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
-2002141839 metadata/md5-cache/sys-fs/ncdu-1.14.2
 2002230040 metadata/md5-cache/sys-fs/lessfs-1.7.0-r1
 2002230139 metadata/md5-cache/sys-fs/lsscsi-0.31
 2003081409 metadata/md5-cache/sys-fs/mergerfs-2.28.3-r1
@@ -61898,10 +61938,8 @@
 2003261709 metadata/md5-cache/sys-fs/xwmfs-0.84
 2004032241 metadata/md5-cache/sys-fs/lsscsi-0.29
 2004032241 metadata/md5-cache/sys-fs/udev-init-scripts-33
-2004041909 metadata/md5-cache/sys-fs/sandboxfs-0.1.1
 2004200009 metadata/md5-cache/sys-fs/bindfs-1.14.5
 2004211009 metadata/md5-cache/sys-fs/static-dev-0.1
-2005021239 metadata/md5-cache/sys-fs/sandboxfs-0.2.0
 2005040040 metadata/md5-cache/sys-fs/squashfs-tools-ng-0.9.1
 2005260027 metadata/md5-cache/sys-fs/android-file-transfer-linux-3.8
 2005260027 metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
@@ -62080,7 +62118,6 @@
 2005260027 metadata/md5-cache/sys-fs/zfs-kmod-9999
 2005291209 metadata/md5-cache/sys-fs/cryptsetup-2.3.3
 2005301209 metadata/md5-cache/sys-fs/reiser4progs-2.0.1
-2006010910 metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
 2006010910 metadata/md5-cache/sys-fs/traydevice-1.6.2-r2
 2006010910 metadata/md5-cache/sys-fs/udiskie-2.1.0
 2006010910 metadata/md5-cache/sys-fs/udiskie-2.1.1
@@ -62088,8 +62125,13 @@
 2006010910 metadata/md5-cache/sys-fs/zfs-0.8.3-r1
 2006010910 metadata/md5-cache/sys-fs/zfs-0.8.4-r1
 2006010910 metadata/md5-cache/sys-fs/zfs-9999
-2006011609 metadata/md5-cache/sys-fs/Manifest.gz
 2006011609 metadata/md5-cache/sys-fs/lxcfs-4.0.3
+2006041239 metadata/md5-cache/sys-fs/Manifest.gz
+2006012239 metadata/md5-cache/sys-fs/ncdu-1.14.2
+2006012239 metadata/md5-cache/sys-fs/ncdu-1.15
+2006041239 metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
+2006021209 metadata/md5-cache/sys-fs/sandboxfs-0.1.1
+2006021209 metadata/md5-cache/sys-fs/sandboxfs-0.2.0
 1803241538 metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
@@ -62150,126 +62192,7 @@
 2005260027 metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.11
 2005260027 metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.12
 2005260027 metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.14
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
-2005272239 metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
-2005272239 metadata/md5-cache/sys-kernel/ck-sources-5.4.31
-2005272239 metadata/md5-cache/sys-kernel/ck-sources-5.4.37
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.179
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.180
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.181
-2005272309 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.121
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.122
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.124
-2005272309 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.125
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.222
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.223
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.224
-2005272309 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.222
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.223
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.224
-2005272309 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.39
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.40
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.42
-2005272309 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.43
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.10
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.11
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.12
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.14
-2005272309 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.15
-2005272239 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.9
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc1
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc2
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc3
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc4
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc5
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc6
-2005272239 metadata/md5-cache/sys-kernel/git-sources-5.7_rc7
 2005271839 metadata/md5-cache/sys-kernel/linux-firmware-20200519
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-3.18
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-4.19
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-4.4
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-4.9
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-5.4
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
-2005272239 metadata/md5-cache/sys-kernel/linux-headers-5.5
-2005272239 metadata/md5-cache/sys-kernel/mips-sources-4.14.149
-2005272239 metadata/md5-cache/sys-kernel/mips-sources-4.18.20
-2005272239 metadata/md5-cache/sys-kernel/mips-sources-4.19.79
-2005272239 metadata/md5-cache/sys-kernel/mips-sources-4.20.17
-2005272239 metadata/md5-cache/sys-kernel/mips-sources-4.4.196
-2005272239 metadata/md5-cache/sys-kernel/mips-sources-4.9.196
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.4_p6
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.5_p8
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p1
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p2
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p3
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p4
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p5
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p6
-2005272239 metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
-2005272239 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
-2005272239 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
-2005272239 metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
-2005280209 metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
-2005280209 metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
-2005280209 metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
-2005280209 metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
-2005280209 metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.182
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.125
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.225
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.225
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.43
-2005272239 metadata/md5-cache/sys-kernel/vanilla-sources-5.6.15
-2005272239 metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
-2005272239 metadata/md5-cache/sys-kernel/zen-sources-5.4.15
-2005272239 metadata/md5-cache/sys-kernel/zen-sources-5.5.13
-2005272239 metadata/md5-cache/sys-kernel/zen-sources-5.6.9
 2005281409 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.43
 2005281409 metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.15
 2005281409 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.43
@@ -62277,12 +62200,138 @@
 2005281409 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.43
 2005281409 metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.15
 2006010910 metadata/md5-cache/sys-kernel/kergen-0.1.4
-2005301539 metadata/md5-cache/sys-kernel/linux-headers-5.6
-2006011009 metadata/md5-cache/sys-kernel/linux-headers-5.7
-2005311609 metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
-2006011908 metadata/md5-cache/sys-kernel/Manifest.gz
-2006011609 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
-2006011908 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.0
+2006040939 metadata/md5-cache/sys-kernel/Manifest.gz
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.145
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.146
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.147
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.148
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.149
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.14.150
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.66
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.72
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.73
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.74
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.75
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.76
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.77
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.78
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.79
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-4.19.80
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.13
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.14
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.15
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.16
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.17
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.18
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.19
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.2.20
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.0
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.1
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.2
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.4
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.5
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.6-r1
+2006031109 metadata/md5-cache/sys-kernel/aufs-sources-5.3.7
+2006031109 metadata/md5-cache/sys-kernel/ck-sources-5.4.31
+2006031109 metadata/md5-cache/sys-kernel/ck-sources-5.4.37
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.178
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.179
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.180
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.181
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.182
+2006031739 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.183
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.120
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.121
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.122
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.124
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.125
+2006031739 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.126
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.221
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.222
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.223
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.224
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.225
+2006031739 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.226
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.221
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.222
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.223
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.224
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.225
+2006031739 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.226
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.38
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.39
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.40
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.42
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.43
+2006031739 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.44
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.10
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.11
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.12
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.14
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.15
+2006031739 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.16
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.9
+2006031109 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.0
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc1
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc2
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc3
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc4
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc5
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc6
+2006031109 metadata/md5-cache/sys-kernel/git-sources-5.7_rc7
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-3.18
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-4.19
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-4.4
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-4.9
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-5.4
+2006040939 metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-5.5
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-5.6
+2006031109 metadata/md5-cache/sys-kernel/linux-headers-5.7
+2006031109 metadata/md5-cache/sys-kernel/mips-sources-4.14.149
+2006031109 metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+2006031109 metadata/md5-cache/sys-kernel/mips-sources-4.19.79
+2006031109 metadata/md5-cache/sys-kernel/mips-sources-4.20.17
+2006031109 metadata/md5-cache/sys-kernel/mips-sources-4.4.196
+2006031109 metadata/md5-cache/sys-kernel/mips-sources-4.9.196
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.4_p6
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.5_p8
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p1
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p2
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p3
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p4
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p5
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p6
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
+2006031109 metadata/md5-cache/sys-kernel/pf-sources-5.7_p1
+2006031109 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+2006031109 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+2006031109 metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
+2006031109 metadata/md5-cache/sys-kernel/rt-sources-4.19.124_p53
+2006031109 metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p197
+2006031109 metadata/md5-cache/sys-kernel/rt-sources-4.9.224_p144
+2006031109 metadata/md5-cache/sys-kernel/rt-sources-5.4.40_p24
+2006031109 metadata/md5-cache/sys-kernel/rt-sources-5.6.14_p7
+2006031109 metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84
+2006031209 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.183
+2006031209 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.126
+2006031209 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.226
+2006031209 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.226
+2006031209 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.44
+2006031209 metadata/md5-cache/sys-kernel/vanilla-sources-5.6.16
+2006031109 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.0
+2006031109 metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+2006031109 metadata/md5-cache/sys-kernel/zen-sources-5.4.15
+2006031109 metadata/md5-cache/sys-kernel/zen-sources-5.5.13
+2006031109 metadata/md5-cache/sys-kernel/zen-sources-5.6.9
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908230439 metadata/md5-cache/sys-libs/freeipmi-1.6.4
@@ -62599,14 +62648,6 @@
 2005260027 metadata/md5-cache/sys-process/latencytop-0.5-r1
 2005260027 metadata/md5-cache/sys-process/lsof-4.91
 2005260027 metadata/md5-cache/sys-process/lsof-4.93.2-r1
-2005260027 metadata/md5-cache/sys-process/memwatch-0.1.0
-2005260027 metadata/md5-cache/sys-process/memwatch-0.2.0
-2005260027 metadata/md5-cache/sys-process/memwatch-0.2.1
-2005260027 metadata/md5-cache/sys-process/memwatch-0.3.0
-2005260027 metadata/md5-cache/sys-process/memwatch-0.3.0-r1
-2005260027 metadata/md5-cache/sys-process/memwatch-0.3.1
-2005260027 metadata/md5-cache/sys-process/memwatch-0.3.2
-2005260027 metadata/md5-cache/sys-process/memwatch-0.3.3
 2005260027 metadata/md5-cache/sys-process/minit-0.10-r1
 2005260027 metadata/md5-cache/sys-process/nmon-16g
 2005260027 metadata/md5-cache/sys-process/nmon-16i
@@ -62644,12 +62685,13 @@
 2005260027 metadata/md5-cache/sys-process/watchpid-0.1-r2
 2005260027 metadata/md5-cache/sys-process/xjobs-20190725
 2005291309 metadata/md5-cache/sys-process/minicoredumper-2.0.1-r1
-2006010910 metadata/md5-cache/sys-process/Manifest.gz
 2006010910 metadata/md5-cache/sys-process/glances-2.11.1
 2006010910 metadata/md5-cache/sys-process/glances-3.1.0
 2006010910 metadata/md5-cache/sys-process/glances-3.1.4.1-r1
 2006010910 metadata/md5-cache/sys-process/iotop-0.6
 2005301339 metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3
+2006041009 metadata/md5-cache/sys-process/Manifest.gz
+2006041009 metadata/md5-cache/sys-process/memwatch-0.3.3
 1910111911 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 1910111911 metadata/md5-cache/virtual/blas-3.6
 1910111911 metadata/md5-cache/virtual/blas-3.7
@@ -62723,7 +62765,6 @@
 2004062109 metadata/md5-cache/virtual/emacs-26-r2
 2004062109 metadata/md5-cache/virtual/httpd-fastcgi-0-r1
 2004062109 metadata/md5-cache/virtual/mysql-5.6-r13
-2004112009 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0
 2004112009 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.003.140
 2004122139 metadata/md5-cache/virtual/ffmpeg-9-r2
 2004211009 metadata/md5-cache/virtual/awk-1
@@ -62852,9 +62893,6 @@
 2005062039 metadata/md5-cache/virtual/os-headers-0
 2005091739 metadata/md5-cache/virtual/gnustep-back-0.28.0
 2005110709 metadata/md5-cache/virtual/notification-daemon-0
-2005200939 metadata/md5-cache/virtual/blas-3.8
-2005200939 metadata/md5-cache/virtual/lapack-3.8
-2005262139 metadata/md5-cache/virtual/Manifest.gz
 2005260027 metadata/md5-cache/virtual/acl-0-r2
 2005260027 metadata/md5-cache/virtual/fam-0-r1
 2005260027 metadata/md5-cache/virtual/glu-9.0-r2
@@ -62905,12 +62943,16 @@
 2005260027 metadata/md5-cache/virtual/rust-1.42.0
 2005260027 metadata/md5-cache/virtual/rust-1.43.0
 2005260027 metadata/md5-cache/virtual/rust-1.43.1
+2006020038 metadata/md5-cache/virtual/Manifest.gz
+2006012309 metadata/md5-cache/virtual/blas-3.8
+2006012309 metadata/md5-cache/virtual/lapack-3.8
+2006020038 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1
+2006012339 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc
 1907262139 metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
 1909061809 metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
 1808151104 metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r1
 1902071839 metadata/md5-cache/www-apache/mod_log_sql-1.101-r3
 1902071909 metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r1
-1903110209 metadata/md5-cache/www-apache/mod_security-2.9.3
 1910071309 metadata/md5-cache/www-apache/mod_vdbh-1.0.3-r2
 1808151104 metadata/md5-cache/www-apache/modsec-flameeyes-20130216
 1810260409 metadata/md5-cache/www-apache/modsecurity-crs-3.0.2
@@ -62951,7 +62993,6 @@
 2005260027 metadata/md5-cache/www-apache/mod_qos-11.61
 2005260027 metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
 2005260027 metadata/md5-cache/www-apache/mod_scgi-1.14-r1
-2005260027 metadata/md5-cache/www-apache/mod_security-2.9.1-r1
 2005260027 metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
 2005260027 metadata/md5-cache/www-apache/mod_whatkilledus-2.01
 2005260027 metadata/md5-cache/www-apache/mod_wsgi-4.5.13
@@ -62960,11 +63001,13 @@
 2005260027 metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1
 2005260027 metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
 2005260027 metadata/md5-cache/www-apache/passenger-6.0.2
-2005260027 metadata/md5-cache/www-apache/passenger-6.0.4
 2005260027 metadata/md5-cache/www-apache/pwauth-2.3.10
 2005282239 metadata/md5-cache/www-apache/mod_h2-1.15.10
-2005311139 metadata/md5-cache/www-apache/Manifest.gz
 2005311139 metadata/md5-cache/www-apache/passenger-6.0.5
+2006041239 metadata/md5-cache/www-apache/Manifest.gz
+2006041239 metadata/md5-cache/www-apache/mod_security-2.9.1-r1
+2006041239 metadata/md5-cache/www-apache/mod_security-2.9.3
+2006040939 metadata/md5-cache/www-apache/passenger-6.0.4
 1903221339 metadata/md5-cache/www-apps/airdcpp-webui-2.6.0
 1905211209 metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
 1906051110 metadata/md5-cache/www-apps/cgp-1_p20181209
@@ -63049,14 +63092,11 @@
 2005260027 metadata/md5-cache/www-apps/curator-3.0_p20110120-r3
 2005260027 metadata/md5-cache/www-apps/cvsweb-3.0.6-r1
 2005260027 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
-2005260027 metadata/md5-cache/www-apps/gitea-1.10.6
-2005260027 metadata/md5-cache/www-apps/gitea-1.11.5
 2005260027 metadata/md5-cache/www-apps/gitea-9999
 2005260027 metadata/md5-cache/www-apps/gitit-0.12.1.1
 2005260027 metadata/md5-cache/www-apps/gitit-0.12.1.1-r2
 2005260027 metadata/md5-cache/www-apps/gitit-0.12.2
 2005260027 metadata/md5-cache/www-apps/gitit-0.12.2.1
-2005260027 metadata/md5-cache/www-apps/grafana-bin-6.7.3
 2005260027 metadata/md5-cache/www-apps/hugo-0.69.0
 2005260027 metadata/md5-cache/www-apps/icingaweb2-2.7.1
 2005260027 metadata/md5-cache/www-apps/icingaweb2-2.7.3
@@ -63108,9 +63148,7 @@
 2005260027 metadata/md5-cache/www-apps/webdavcgi-0.8.3
 2005260027 metadata/md5-cache/www-apps/webdavcgi-0.8.4
 2005260027 metadata/md5-cache/www-apps/webdavcgi-1.1.1
-2005260027 metadata/md5-cache/www-apps/webmcp-1.2.6
 2005300009 metadata/md5-cache/www-apps/phpsysinfo-3.3.2
-2006010910 metadata/md5-cache/www-apps/Manifest.gz
 2006010910 metadata/md5-cache/www-apps/blohg-0.13-r4
 2006010910 metadata/md5-cache/www-apps/blohg-9999
 2006010910 metadata/md5-cache/www-apps/klaus-1.5.1
@@ -63129,6 +63167,10 @@
 2006010910 metadata/md5-cache/www-apps/roundup-1.6.1-r1
 2006010910 metadata/md5-cache/www-apps/scgi-1.14-r1
 2006010910 metadata/md5-cache/www-apps/trac-1.2.5
+2006041139 metadata/md5-cache/www-apps/Manifest.gz
+2006020739 metadata/md5-cache/www-apps/gitea-1.11.6
+2006041139 metadata/md5-cache/www-apps/grafana-bin-6.7.4
+2006020038 metadata/md5-cache/www-apps/webmcp-1.2.6
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2002231739 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2003261841 metadata/md5-cache/www-client/lynx-2.9.0_pre1
@@ -63143,18 +63185,14 @@
 2005260027 metadata/md5-cache/www-client/elinks-0.13_pre_pre20180225
 2005260027 metadata/md5-cache/www-client/elinks-9999
 2005260027 metadata/md5-cache/www-client/epiphany-3.30.5
-2005260027 metadata/md5-cache/www-client/epiphany-3.32.6
-2005260027 metadata/md5-cache/www-client/epiphany-3.34.4
 2005260027 metadata/md5-cache/www-client/firefox-52.9.0-r1
 2005260027 metadata/md5-cache/www-client/firefox-bin-52.9.0
 2005260027 metadata/md5-cache/www-client/firefox-bin-68.8.0
 2005260027 metadata/md5-cache/www-client/firefox-bin-76.0
 2005260027 metadata/md5-cache/www-client/firefox-bin-76.0.1
-2005260027 metadata/md5-cache/www-client/google-chrome-83.0.4103.61
 2005260027 metadata/md5-cache/www-client/jd-2.8.5_p120826
 2005260027 metadata/md5-cache/www-client/jd-2.8.9_p150226
 2005260027 metadata/md5-cache/www-client/links-2.20.2
-2005260027 metadata/md5-cache/www-client/links-2.20.2-r1
 2005260027 metadata/md5-cache/www-client/luakit-2017.08.10
 2005260027 metadata/md5-cache/www-client/luakit-9999
 2005260027 metadata/md5-cache/www-client/midori-9.0
@@ -63178,7 +63216,6 @@
 2005260027 metadata/md5-cache/www-client/uget-2.2.1
 2005260027 metadata/md5-cache/www-client/uget-9999
 2005260027 metadata/md5-cache/www-client/vivaldi-3.0.1874.38_p1
-2005260027 metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1921.3_p1
 2005260027 metadata/md5-cache/www-client/w3m-0.5.3_p20180125
 2005260027 metadata/md5-cache/www-client/w3m-0.5.3_p20190105
 2005260027 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r10
@@ -63190,7 +63227,6 @@
 2005282309 metadata/md5-cache/www-client/opera-beta-69.0.3686.12
 2005281609 metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1929.3_p1
 2005300209 metadata/md5-cache/www-client/chromium-83.0.4103.61
-2005300209 metadata/md5-cache/www-client/chromium-84.0.4136.5
 2005302209 metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.30
 2005302209 metadata/md5-cache/www-client/google-chrome-unstable-85.0.4158.4
 2006010910 metadata/md5-cache/www-client/pybugz-0.13
@@ -63198,8 +63234,18 @@
 2006010910 metadata/md5-cache/www-client/qutebrowser-1.11.1-r1
 2006010910 metadata/md5-cache/www-client/qutebrowser-9999
 2006010910 metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
-2006011739 metadata/md5-cache/www-client/Manifest.gz
 2006011739 metadata/md5-cache/www-client/opera-developer-70.0.3707.0
+2006041108 metadata/md5-cache/www-client/Manifest.gz
+2006012039 metadata/md5-cache/www-client/chromium-84.0.4147.30
+2006012339 metadata/md5-cache/www-client/epiphany-3.32.6
+2006012339 metadata/md5-cache/www-client/epiphany-3.34.4
+2006041108 metadata/md5-cache/www-client/firefox-68.9.0
+2006040739 metadata/md5-cache/www-client/firefox-77.0.1
+2006030409 metadata/md5-cache/www-client/firefox-bin-68.9.0
+2006040309 metadata/md5-cache/www-client/firefox-bin-77.0.1
+2006040009 metadata/md5-cache/www-client/google-chrome-83.0.4103.97
+2006040009 metadata/md5-cache/www-client/links-2.20.2-r1
+2006031239 metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1929.13_p1
 1808151104 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -63240,7 +63286,6 @@
 2001040209 metadata/md5-cache/www-plugins/passff-1.9.1
 2003110309 metadata/md5-cache/www-plugins/browserpass-3.0.6-r2
 2005260027 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.371
-2005260027 metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.61
 2005260027 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9-r1
 2005260027 metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
 2005260027 metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
@@ -63248,13 +63293,13 @@
 2005260027 metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
 2005260027 metadata/md5-cache/www-plugins/passff-host-1.2.1
 2005260027 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
-2005302209 metadata/md5-cache/www-plugins/Manifest.gz
 2005302209 metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.30_beta
 2005302209 metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4158.4_alpha
+2006040009 metadata/md5-cache/www-plugins/Manifest.gz
+2006040009 metadata/md5-cache/www-plugins/chrome-binary-plugins-83.0.4103.97
 1902072239 metadata/md5-cache/www-servers/caddy-0.10.11
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 1802271938 metadata/md5-cache/www-servers/pshs-0.3.3
-2004032241 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2005260027 metadata/md5-cache/www-servers/adsf-1.4.1
 2005260027 metadata/md5-cache/www-servers/adsf-1.4.2
 2005260027 metadata/md5-cache/www-servers/adsf-1.4.3
@@ -63274,14 +63319,12 @@
 2005260027 metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
 2005260027 metadata/md5-cache/www-servers/monkeyd-9999
 2005262209 metadata/md5-cache/www-servers/nginx-1.18.0-r1
-2005262209 metadata/md5-cache/www-servers/nginx-1.19.0
 2005260027 metadata/md5-cache/www-servers/nginx-unit-1.17.0
 2005260027 metadata/md5-cache/www-servers/ocsigenserver-2.8
 2005260027 metadata/md5-cache/www-servers/ocsigenserver-9999
 2005260027 metadata/md5-cache/www-servers/pound-2.7f-r1
 2005260027 metadata/md5-cache/www-servers/pshs-9999
 2005260027 metadata/md5-cache/www-servers/puma-3.12.4
-2005260027 metadata/md5-cache/www-servers/puma-4.3.3
 2005260027 metadata/md5-cache/www-servers/resin-4.0.48-r1
 2005260027 metadata/md5-cache/www-servers/sniproxy-0.5.0
 2005260027 metadata/md5-cache/www-servers/sniproxy-0.6.0
@@ -63301,7 +63344,6 @@
 2005260027 metadata/md5-cache/www-servers/varnish-6.3.2
 2005260027 metadata/md5-cache/www-servers/varnish-6.4.0
 2005260027 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
-2006010910 metadata/md5-cache/www-servers/Manifest.gz
 2006010910 metadata/md5-cache/www-servers/gunicorn-19.8.1
 2006010910 metadata/md5-cache/www-servers/gunicorn-19.9.0
 2006010910 metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
@@ -63310,8 +63352,11 @@
 2006010910 metadata/md5-cache/www-servers/tornado-6.0.3
 2006010910 metadata/md5-cache/www-servers/tornado-6.0.4
 2005302109 metadata/md5-cache/www-servers/uwsgi-2.0.18
+2006041239 metadata/md5-cache/www-servers/Manifest.gz
+2006030009 metadata/md5-cache/www-servers/nginx-1.19.0-r1
+2006031009 metadata/md5-cache/www-servers/puma-4.3.3
+2006041239 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2004032241 metadata/md5-cache/x11-apps/luit-20190106
-2005260027 metadata/md5-cache/x11-apps/Manifest.gz
 2005260027 metadata/md5-cache/x11-apps/amlc-0.5.1
 2005260027 metadata/md5-cache/x11-apps/appres-1.0.4
 2005260027 metadata/md5-cache/x11-apps/appres-1.0.5
@@ -63328,8 +63373,6 @@
 2005260027 metadata/md5-cache/x11-apps/ico-1.0.4
 2005260027 metadata/md5-cache/x11-apps/ico-1.0.5
 2005260027 metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
-2005260027 metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
-2005260027 metadata/md5-cache/x11-apps/igt-gpu-tools-9999
 2005260027 metadata/md5-cache/x11-apps/listres-1.0.4
 2005260027 metadata/md5-cache/x11-apps/mesa-progs-8.4.0
 2005260027 metadata/md5-cache/x11-apps/mesa-progs-9999
@@ -63427,6 +63470,9 @@
 2005260027 metadata/md5-cache/x11-apps/xwd-1.0.7
 2005260027 metadata/md5-cache/x11-apps/xwininfo-1.1.5
 2005260027 metadata/md5-cache/x11-apps/xwud-1.0.5
+2006032239 metadata/md5-cache/x11-apps/Manifest.gz
+2006032239 metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
+2006032239 metadata/md5-cache/x11-apps/igt-gpu-tools-9999
 2004032241 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
 2005031239 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2005190009 metadata/md5-cache/x11-base/xorg-drivers-9999
@@ -64080,7 +64126,6 @@
 2005260027 metadata/md5-cache/x11-misc/xtrace-1.4.0
 2005260027 metadata/md5-cache/x11-misc/xtrlock-2.12
 2005260027 metadata/md5-cache/x11-misc/xtrlock-2.13
-2005251539 metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
 2005260027 metadata/md5-cache/x11-misc/xvkbd-3.7
 2005260027 metadata/md5-cache/x11-misc/xvkbd-3.9
 2005260027 metadata/md5-cache/x11-misc/xvkbd-4.0
@@ -64093,12 +64138,8 @@
 2005260027 metadata/md5-cache/x11-misc/xxkb-1.11.1
 2005260027 metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
 2005271239 metadata/md5-cache/x11-misc/xbindkeys-1.8.7-r1
-2005281909 metadata/md5-cache/x11-misc/lightdm-1.30.0
-2005281909 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
 2005291109 metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
-2005291109 metadata/md5-cache/x11-misc/qlipper-5.1.2
 2005300009 metadata/md5-cache/x11-misc/shared-mime-info-1.15
-2006010910 metadata/md5-cache/x11-misc/Manifest.gz
 2006010910 metadata/md5-cache/x11-misc/arandr-0.1.10
 2006010910 metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2
 2006010910 metadata/md5-cache/x11-misc/menulibre-2.1.3
@@ -64117,6 +64158,11 @@
 2006010910 metadata/md5-cache/x11-misc/zim-0.72.0
 2006010910 metadata/md5-cache/x11-misc/zim-0.72.1-r1
 2006010910 metadata/md5-cache/x11-misc/zim-0.72.1-r2
+2006040939 metadata/md5-cache/x11-misc/Manifest.gz
+2006031839 metadata/md5-cache/x11-misc/lightdm-1.30.0
+2006031839 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
+2006040939 metadata/md5-cache/x11-misc/qlipper-5.1.2
+2006040939 metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -64379,16 +64425,16 @@
 2005260027 metadata/md5-cache/x11-terms/xterm-351
 2005260027 metadata/md5-cache/x11-terms/xterm-353
 2005260027 metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
-2005300609 metadata/md5-cache/x11-terms/alacritty-0.4.2-r1
-2005300609 metadata/md5-cache/x11-terms/alacritty-0.4.3_rc1
-2005300609 metadata/md5-cache/x11-terms/alacritty-9999
-2006010910 metadata/md5-cache/x11-terms/Manifest.gz
 2006010910 metadata/md5-cache/x11-terms/guake-3.3.2-r1
 2006010910 metadata/md5-cache/x11-terms/guake-3.6.3-r1
 2006010910 metadata/md5-cache/x11-terms/guake-3.7.0
 2006010910 metadata/md5-cache/x11-terms/guake-9999
 2006010910 metadata/md5-cache/x11-terms/terminator-1.91
 2006010910 metadata/md5-cache/x11-terms/terminator-1.92
+2006021209 metadata/md5-cache/x11-terms/Manifest.gz
+2006021209 metadata/md5-cache/x11-terms/alacritty-0.4.2-r1
+2006021209 metadata/md5-cache/x11-terms/alacritty-0.4.3
+2006021209 metadata/md5-cache/x11-terms/alacritty-9999
 1707301038 metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
@@ -64438,7 +64484,6 @@
 1912241509 metadata/md5-cache/x11-themes/tactile3-3.1
 1912241609 metadata/md5-cache/x11-themes/vdr-channel-logos-0.2-r2
 1912310209 metadata/md5-cache/x11-themes/experience-3.04-r1
-2002112051 metadata/md5-cache/x11-themes/claws-mail-themes-20140629
 2002112051 metadata/md5-cache/x11-themes/clearlooks-phenix-9999
 2002112051 metadata/md5-cache/x11-themes/gartoon-0.5-r2
 2002112051 metadata/md5-cache/x11-themes/gentoo-artwork-0.4.2-r1
@@ -64462,7 +64507,6 @@
 2004062109 metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0-r1
 2004080010 metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27
 2004080010 metadata/md5-cache/x11-themes/papirus-icon-theme-20191009
-2004271539 metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200427
 2005051709 metadata/md5-cache/x11-themes/papirus-icon-theme-20191101
 2005051709 metadata/md5-cache/x11-themes/papirus-icon-theme-20191201
 2005051709 metadata/md5-cache/x11-themes/papirus-icon-theme-20200102
@@ -64573,12 +64617,14 @@
 2005260027 metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
 2005260027 metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
 2005291639 metadata/md5-cache/x11-themes/numix-gtk-theme-2.6.7-r2
-2006010910 metadata/md5-cache/x11-themes/Manifest.gz
 2005311609 metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1
 2005311609 metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
 2005311609 metadata/md5-cache/x11-themes/fedora-backgrounds-32.2.2
 2006010109 metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
 2005311609 metadata/md5-cache/x11-themes/ubuntu-wallpapers-20.04.2
+2006041239 metadata/md5-cache/x11-themes/Manifest.gz
+2006041239 metadata/md5-cache/x11-themes/claws-mail-themes-20140629
+2006021209 metadata/md5-cache/x11-themes/e-flat-theme-0_pre20200602
 1908192239 metadata/md5-cache/x11-wm/e16-1.0.20
 1805240409 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 1912220239 metadata/md5-cache/x11-wm/e16-1.0.21
@@ -64626,7 +64672,6 @@
 2005260027 metadata/md5-cache/x11-wm/i3-4.16-r1
 2005260027 metadata/md5-cache/x11-wm/i3-4.16.1-r1
 2005260027 metadata/md5-cache/x11-wm/i3-4.17.1-r1
-2005260027 metadata/md5-cache/x11-wm/i3-4.18
 2005260027 metadata/md5-cache/x11-wm/i3-9999
 2005260027 metadata/md5-cache/x11-wm/i3-gaps-4.16.1-r2
 2005260027 metadata/md5-cache/x11-wm/i3-gaps-4.17.1-r1
@@ -64662,7 +64707,6 @@
 2005260027 metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
 2005260027 metadata/md5-cache/x11-wm/sawfish-1.12.90
 2005260027 metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
-2005260027 metadata/md5-cache/x11-wm/sithwm-1.2.3
 2005260027 metadata/md5-cache/x11-wm/spectrwm-3.1.0
 2005260027 metadata/md5-cache/x11-wm/spectrwm-3.2.0
 2005260027 metadata/md5-cache/x11-wm/spectrwm-3.3.0
@@ -64696,7 +64740,6 @@
 2005300009 metadata/md5-cache/x11-wm/windowmaker-0.95.8-r1
 2005300009 metadata/md5-cache/x11-wm/windowmaker-0.95.9-r1
 2005300009 metadata/md5-cache/x11-wm/windowmaker-9999
-2006010910 metadata/md5-cache/x11-wm/Manifest.gz
 2006010910 metadata/md5-cache/x11-wm/enlightenment-0.24.1
 2006010910 metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1
 2006010910 metadata/md5-cache/x11-wm/qtile-0.14.2-r1
@@ -64704,6 +64747,9 @@
 2006010910 metadata/md5-cache/x11-wm/qtile-9999
 2006010910 metadata/md5-cache/x11-wm/xpra-3.0.2-r1
 2006010910 metadata/md5-cache/x11-wm/xpra-3.0.5-r1
+2006041239 metadata/md5-cache/x11-wm/Manifest.gz
+2006040939 metadata/md5-cache/x11-wm/i3-4.18
+2006041239 metadata/md5-cache/x11-wm/sithwm-1.2.3
 2001140709 metadata/md5-cache/xfce-base/xfce4-settings-4.15.0
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2002112051 metadata/md5-cache/xfce-base/xfwm4-4.14.0-r1
@@ -64730,9 +64776,9 @@
 2005260027 metadata/md5-cache/xfce-base/xfce4-panel-4.15.2
 2005260027 metadata/md5-cache/xfce-base/xfconf-4.14.1
 2005260027 metadata/md5-cache/xfce-base/xfconf-4.14.3
-2005271009 metadata/md5-cache/xfce-base/Manifest.gz
-2005271009 metadata/md5-cache/xfce-base/exo-4.15.1
 2005271009 metadata/md5-cache/xfce-base/xfce4-settings-4.15.1
+2006031339 metadata/md5-cache/xfce-base/Manifest.gz
+2006031339 metadata/md5-cache/xfce-base/exo-4.15.1
 1910102139 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
 1910102139 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.0
 1811152009 metadata/md5-cache/xfce-extra/transd-0_p20120503-r1
@@ -64797,4 +64843,4 @@
 2005260027 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
 2005291909 metadata/md5-cache/xfce-extra/Manifest.gz
 2005291909 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r6
-2006011938 metadata/md5-cache/Manifest.gz
+2006041239 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6b3ced3af77a..8a7573409d5e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jun 2020 17:00:01 +0000
+Thu, 04 Jun 2020 10:00:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 43e5bcdc39cf..8c75e8f09646 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2a5854f61234dec10dc906a44e98b6316761b497 1591028736 2020-06-01T16:25:36+00:00
+f6d5a4718f5830355a196bca45fe3a26767401f3 1591262187 2020-06-04T09:16:27+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d8b89cd6ad24..b230b4e7aa91 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1591029301 Mon 01 Jun 2020 04:35:01 PM UTC
+1591263301 Thu 04 Jun 2020 09:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 47caad3feb70..cf9bcf099dbe 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jun 2020 16:38:11 +0000
+Thu, 04 Jun 2020 09:38:19 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8bab9587f091..a470dfdd4ea9 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 72d81a2d8d7a..736197fa7f6d 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -5,7 +5,7 @@ AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
-EBUILD arpwatch-2.1.15-r11.ebuild 2217 BLAKE2B a1f042a28108e69048d0d5494659fd890633d016bab65637ae3fd85d08bdc65e0c8d73fefbc60f4ba6a7ba40534b3fa3bc154cb8dca3b9e3be60b40480085e6a SHA512 af35788a8c783a35429835039940112fd9f470f99942251720609584c765c933bc49eace118fb401d291bb3d14a3e8599e8eea7d23a099907c513b03bad3ec8c
+EBUILD arpwatch-2.1.15-r11.ebuild 2212 BLAKE2B 256c4c6ec2122cd1a6eda7272afa4cecbb46625ccda72117cf949faeb589ef74d089923a036bd3fd0ef057bc549a692dc150132aad92bff14b3d1cd1d54fef94 SHA512 b51f3752058eab0ac532d11157c5f9d5f65f0dda01f6d396b13b39d668f424cad3290baaddbfaec2c2edd718010aa95806f7e32f04dceb44a68f7a26382366be
 EBUILD arpwatch-2.1.15-r8.ebuild 1375 BLAKE2B ea7a95aa5dfb0d1f46820bba13da044476e1395a7a22f0b13dd70fbee1824a763d24797ade3d7c74093cbb4c81aad9420a16978716f6210ca35d6a8c364ea89e SHA512 d7228a4473f28162ca9c50b74538ad461193a44db4f583dfa3fe20475a3837f6ef90e096e073396d3932580c8333cfb2675f7d48bf309642847c6d18e8ea81cc
 EBUILD arpwatch-2.1.15-r9.ebuild 1357 BLAKE2B 5c18e76a61fb2ad63e7f999bc326fc370cfbc0816a597f2f603b5b4e09214b93326a0340334e55e3edecb03a4934eec6093a47ca305c75c8b6ac4e76eddd1458 SHA512 19e8abb183a16693af2d595798f19cfbcc44ce855c8ae4db5a55b298421f98a95d39be94208a16b66c3106735afeac491588be75ca601171eb98a46016a39d8e
 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 d30e87c6a301..fbefe68bec99 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index 0c5dc1c88011..6f9e659b88c2 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -3,6 +3,6 @@ AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba
 AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c
 DIST cnet-3.3.1.tgz 2684531 BLAKE2B 5cb2cf545ccf1e2adb1e50f4220b944361ed44d61857ef4bf0ce30ed9e6346e0ed709bfbcfa339751bf2abc67d930b19decdc6355803426fa1eb4d097a6eed73 SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8
 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9
-EBUILD cnet-3.3.1.ebuild 978 BLAKE2B 60021756388bfbfd23ba197ea98ec12ed3c50b38e01354955ffb9638ed94b06bca5c6bdbb4faa42d08a42e9919e2febbae9f042fa407e2d0b64aafe9127b7db6 SHA512 0516c7eee23318d2cb48b04f51d4a3d5c1a378528662714bbeb4608921bb562b3d6093df3ee9e80f2547a00784c8b38c305c654b92828241eff5c9e1d16f04a9
-EBUILD cnet-3.3.4.ebuild 943 BLAKE2B 73a56c4d0e2018a4575f006db9aa43612dd884ab2ad119032569910b83d13c5c8e06a1c4559e1945cdaf570e4ab4762f041320123e85998f9a043c5bc9fea21f SHA512 05970fb9f411146ca58497a4b9db53706a1b4fd801c51b08851993d3357991b0d3620719974a93fb8edcd183e21e23a1e40d8cc0917cd2f66cddb640e1b545ee
+EBUILD cnet-3.3.1.ebuild 976 BLAKE2B 335d2d78e4fc2e69ca6c733d37b9d5d9a72a2c026564142c30c9b25bcdbad12de43030c364b5a792edd56c436356284974bb17a2955d5ad66cc3ea1431bc6067 SHA512 2aab1f7b7a2041b9f74ddf81b95183dad5cc3e3d7781faf6c9a61581ab3e3854969f30e465bac8e18eba937ce0c2db66028def45b2d35f821dbdecbcf8338601
+EBUILD cnet-3.3.4.ebuild 941 BLAKE2B 888da30d1a962b0f8f30697e70dadc30f362feb3058d3c259ad2317505d92fadef8a7e12798266336b6d3f4e105e2cabe2bf2563e9a7a83cb7044b5d2b9c77ae SHA512 4737df21d2d7a891c53be4ed2cac8ceb72b4eb92d1ea37525a750c6105e85cddc4aa6028a2d9704f5ec4dc3334755f937db33df39ef95a1c3f283c0ee4e329ee
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/cnet/cnet-3.3.1.ebuild b/net-analyzer/cnet/cnet-3.3.1.ebuild
index 3bde2f1eb731..e5765dba0c8d 100644
--- a/net-analyzer/cnet/cnet-3.3.1.ebuild
+++ b/net-analyzer/cnet/cnet-3.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Network simulation tool"
-HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"
+HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild
index d0f7d21a3314..252806110764 100644
--- a/net-analyzer/cnet/cnet-3.3.4.ebuild
+++ b/net-analyzer/cnet/cnet-3.3.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Network simulation tool"
-HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"
+HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 9d7bec1013b1..e52f36f808e8 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,2 +1,6 @@
-EBUILD gr-fosphor-9999.ebuild 1324 BLAKE2B fb6e43ec50f469d9fe71b1f2ab3e275c94e3f552f9a034ac86fe8253c09ecca22efb54390dabcd2570ad9484132d482d8805a836886fe56dac45db5963913421 SHA512 eeacf7ccb39e22fdb31e3b6035b57d68b151455ce4219ffde6dcbfc11a7280fa6253ea0fde990395212a38dc09bfd8e39a2a3b690168cf3d76ddaf4c7107dee6
+DIST gr-fosphor-0.0_p20191202.tar.gz 254103 BLAKE2B 460b4ff2ff9f4a6faa70c541dd8ce936ba8419a89cca7715913b6f93f07a151c467a5737860a362198d609dfe0e4bfc4a476278bfc720d89c1876ff56addf226 SHA512 6bc26be4aa3116af33a214046c76e5a7623e049e27e86d866892de611ffd4bfa4bd841b66535fc40320fa7c7a46d19af2d391ee594f9a7ed997355cd2ade6fa1
+DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
+EBUILD gr-fosphor-0.0_p20191202.ebuild 1379 BLAKE2B e24557d185a06d139ba915dfadb23eb99d434f88f09bb006fcbb7cfc0d565905bc095cd83e630d4b80b97c1fc25b906b5eefa5b8ecba00f5b7b950bda869c53a SHA512 c764a9ed59af2a4b929add701485cf89a5ed0563f0caddf29dc71fb23cc8e0fe00c92a834ad4acbdbd95fd335648d4d0c3f71f4bcccc84d455cd5086decfb873
+EBUILD gr-fosphor-0.0_p20200131.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02
+EBUILD gr-fosphor-9999.ebuild 1348 BLAKE2B c8c977e0b34e33e3e456c4a18b8149903b9391741500344ad904aa06e7c662cd28abed1330228ddd856ab40fac893650b38c3c5f0fa1c00b3830891a073f5ace SHA512 6cee886a5f0eab8b8be388664fd03bcd1c4746281d4dc86f15666eb7651e8412fed4fc5f0ff2f31cb00f7e8c8a5657f0ff32a082777c08f960c63beef6731c02
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
new file mode 100644
index 000000000000..78c0f817bcf6
--- /dev/null
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
+else
+	COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
+	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="glfw qt5 wxwidgets"
+
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	=net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
+	media-libs/freetype
+	dev-libs/boost:=
+	glfw? ( >=media-libs/glfw-3 )
+	virtual/opencl
+	virtual/opengl
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	dev-util/cppunit
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	default
+}
+
+src_configure() {
+	# tries to run OpenCL test program, but failing doesn't hurt
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GLFW="$(usex glfw)"
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WX="$(usex wxwidgets)"
+		-DENABLE_PYTHON=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
new file mode 100644
index 000000000000..73f6863f9df9
--- /dev/null
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
+else
+	COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96"
+	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="glfw qt5"
+
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	dev-libs/boost:=
+	dev-libs/log4cpp
+	media-libs/freetype
+	=net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
+	glfw? ( >=media-libs/glfw-3 )
+	virtual/opencl
+	virtual/opengl
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	dev-util/cppunit
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	default
+}
+
+src_configure() {
+	# tries to run OpenCL test program, but failing doesn't hurt
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GLFW="$(usex glfw)"
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_PYTHON=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 0eceaac74e02..73f6863f9df9 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -11,11 +11,11 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	#EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-	EGIT_BRANCH="gr3.7-qt5"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96"
+	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="glfw qt5 wxwidgets"
+IUSE="glfw qt5"
 
 RDEPEND="qt5? (
 		dev-qt/qtcore:5
@@ -31,9 +31,10 @@ RDEPEND="qt5? (
 		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 	)
-	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
-	media-libs/freetype
 	dev-libs/boost:=
+	dev-libs/log4cpp
+	media-libs/freetype
+	=net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
 	glfw? ( >=media-libs/glfw-3 )
 	virtual/opencl
 	virtual/opengl
@@ -57,7 +58,6 @@ src_configure() {
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GLFW="$(usex glfw)"
 		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WX="$(usex wxwidgets)"
 		-DENABLE_PYTHON=ON
 	)
 	cmake-utils_src_configure
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 8e03cdb2ada6..e4c0d72acacd 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -8,5 +8,5 @@ EBUILD iptraf-ng-1.1.4-r1.ebuild 1325 BLAKE2B d27a62d5195b922cb586cf4fa65b6e5af4
 EBUILD iptraf-ng-1.1.4-r2.ebuild 1427 BLAKE2B 27461cb4a2b174032d5037ad83e9d11543a2a5dc6f92c58387af31b200a7f9e020e4df208bc4bdecfa44d10c0073a570b02ac35adbcdf75f5dfbbaaf1a436f4d SHA512 c2c05f847e354cd072c08966b7b8028de98646c0c2e6827220dd2514ddae6a471535c47f5ba5033c3e37f61b1524038dd542a746436a21c5bf1b1c47bacb84db
 EBUILD iptraf-ng-1.1.4-r3.ebuild 1448 BLAKE2B d293142f201e9d8176c60e3f7df01018cf2da03a37a064c4a99d1cdd68d1972ed6ba6a3f688565e52ce142b531b4bed5d3c4071955d670d48cc96b143cc7c4da SHA512 c7831c5963e73ac4ff68dec2e870f5a1f9948ff97af688bd41aafff079b1b215e2d7e3d28acf85d5984b06cc622cfccba48f179b98ad3291e6d269c0c867c0cc
 EBUILD iptraf-ng-1.2.0.ebuild 1221 BLAKE2B 7a95ab155b63797f7e738d7760b0314fd231e48f8d1b59eabaa34ba458e4b09de23d8ad2c76dd158512fbebbbb7610e491f66fe8ca6ed9d9a29b805e83abd544 SHA512 8555bcf1d9595dd2c92dc3298aeb7f66ef80018d46d93a47c424d9d128a20ca32e38c381276ee092236042edd59e784746299e62813798c1285d918d20f0d731
-EBUILD iptraf-ng-9999.ebuild 1132 BLAKE2B 73d6e0f5a6eb521d3c194f51c43c47dd4bf36bb2cb045f534c167ddadf3b049b2ce53944bd72fd31d4d757339025498118439d6ce26f380ef341f44d395605c1 SHA512 08172cca43c699d498dc06e8a8a6db596c19008c0f1425fa9788e8e6b4b07950d60ed2ba6f67bcee017c5f0a9d95f516963fd431519e8415b04af6b00f7542c3
+EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51
 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
index 0471ab0b2911..486e56efca50 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
@@ -7,6 +7,7 @@ inherit flag-o-matic git-r3 toolchain-funcs
 DESCRIPTION="A console-based network monitoring utility"
 HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng"
 EGIT_REPO_URI="https://github.com/iptraf-ng/iptraf-ng"
+EGIT_BRANCH="dev"
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 1d98a9df113e..8612ff7db117 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,5 +1,3 @@
-AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8
-AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561
 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
diff --git a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch
deleted file mode 100644
index 1b6d5b75020d..000000000000
--- a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-https://github.com/netdata/netdata/pull/7877
-
-From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001
-From: Thiago Marques <thiagoftsm@gmail.com>
-Date: Tue, 28 Jan 2020 13:59:20 +0000
-Subject: [PATCH 1/2] missing_extern: Fix missing
-
-Fix few externs that were missing in global variables
----
- daemon/common.h            | 2 +-
- health/health.h            | 2 +-
- libnetdata/health/health.h | 2 +-
- web/api/web_api_v1.h       | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/common.h b/daemon/common.h
-index 6ac3cb3c87..59dbc41a8d 100644
---- a/daemon/common.h
-+++ b/daemon/common.h
-@@ -84,6 +84,6 @@ extern char *netdata_configured_timezone;
- extern int netdata_zero_metrics_enabled;
- extern int netdata_anonymous_statistics_enabled;
- 
--int netdata_ready;
-+extern int netdata_ready;
- 
- #endif /* NETDATA_COMMON_H */
-diff --git a/health/health.h b/health/health.h
-index 9da90d70c9..d77318fd78 100644
---- a/health/health.h
-+++ b/health/health.h
-@@ -52,7 +52,7 @@ extern unsigned int default_health_enabled;
- 
- #define HEALTH_SILENCERS_MAX_FILE_LEN 10000
- 
--char *silencers_filename;
-+extern char *silencers_filename;
- 
- extern void health_init(void);
- extern void *health_main(void *ptr);
-diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h
-index a3dc0775fc..f7580edab2 100644
---- a/libnetdata/health/health.h
-+++ b/libnetdata/health/health.h
-@@ -44,7 +44,7 @@ typedef struct silencers {
-     SILENCER *silencers;
- } SILENCERS;
- 
--SILENCERS *silencers;
-+extern SILENCERS *silencers;
- 
- extern SILENCER *create_silencer(void);
- extern int health_silencers_json_read_callback(JSON_ENTRY *e);
-diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h
-index 4fe3c8f6be..edeea98bed 100644
---- a/web/api/web_api_v1.h
-+++ b/web/api/web_api_v1.h
-@@ -29,6 +29,6 @@ extern void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation);
- extern void web_client_api_v1_init(void);
- extern void web_client_api_v1_management_init(void);
- 
--char *api_secret;
-+extern char *api_secret;
- 
- #endif //NETDATA_WEB_API_V1_H
-
-From c0275ddaad62459a6da1eee0a0c76282a1391590 Mon Sep 17 00:00:00 2001
-From: Thiago Marques <thiagoftsm@gmail.com>
-Date: Tue, 28 Jan 2020 14:06:56 +0000
-Subject: [PATCH 2/2] missing_extern: Variables
-
-This commit declares the variables inside .c files
----
- daemon/common.c            | 2 +-
- health/health.c            | 1 +
- libnetdata/health/health.c | 2 ++
- web/api/web_api_v1.c       | 2 ++
- 4 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/daemon/common.c b/daemon/common.c
-index e28f6cf000..67497a4e93 100644
---- a/daemon/common.c
-+++ b/daemon/common.c
-@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir          = VARLIB_DIR;
- char *netdata_configured_home_dir            = CACHE_DIR;
- char *netdata_configured_host_prefix         = NULL;
- char *netdata_configured_timezone            = NULL;
--
-+int netdata_ready;
-diff --git a/health/health.c b/health/health.c
-index 1124cf9107..4a84ef7fca 100644
---- a/health/health.c
-+++ b/health/health.c
-@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status {
- };
- 
- unsigned int default_health_enabled = 1;
-+char *silencers_filename;
- 
- // ----------------------------------------------------------------------------
- // health initialization
-diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c
-index e03538db3f..98d26d295f 100644
---- a/libnetdata/health/health.c
-+++ b/libnetdata/health/health.c
-@@ -1,5 +1,7 @@
- #include "health.h"
- 
-+SILENCERS *silencers;
-+
- /**
-  * Create Silencer
-  *
-diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c
-index aafcbc70be..4ac50524ad 100644
---- a/web/api/web_api_v1.c
-+++ b/web/api/web_api_v1.c
-@@ -2,6 +2,8 @@
- 
- #include "web_api_v1.h"
- 
-+char *api_secret;
-+
- static struct {
-     const char *name;
-     uint32_t hash;
diff --git a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
deleted file mode 100644
index 25c8dd4051ff..000000000000
--- a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/netdata/netdata/pull/7674
-
-From d19b834d0011485759604ecfa095a898b597d8e0 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Sun, 5 Jan 2020 16:13:18 -0500
-Subject: [PATCH] Fix spelling of Prometheus (#7673)
-
-diff --git a/configure.ac b/configure.ac
-index 00927ba8b1..8b2facb966 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -999,7 +999,7 @@ test "${enable_backend_prometheus_remote_write}" = "yes" -a "${have_CXX_compiler
-     AC_MSG_ERROR([C++ compiler required but not found. try installing g++])
- 
- AC_MSG_CHECKING([if prometheus remote write backend should be enabled])
--if test "${enable_backend_prometeus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \
-+if test "${enable_backend_prometheus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \
-                                                            -a "${have_protoc}" = "yes" -a "${have_CXX_compiler}" = "yes"; then
-     enable_backend_prometheus_remote_write="yes"
-     AC_DEFINE([ENABLE_PROMETHEUS_REMOTE_WRITE], [1], [Prometheus remote write API usability])
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index 57edaf1c3006..53d5d7f3722d 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,3 +1,3 @@
 DIST p0f-3.09b.tgz 92896 BLAKE2B 5db3fe335c1dd3fedca5c007e8a133ff7327189c640ec6bce254ae7b1e6fe5729acd39d5a3d507e286742ac0b7c7612eb5aae452d60ab0e737cb05b0191ffbbb SHA512 2a688baa865f27c91c023a7c53e530649f56a681e6ca2533152ab07b42883857b20c378b636e87dda8d1d5dfac17e426d09ee032b363d0b7d98e57a9ff6164d0
-EBUILD p0f-3.09_beta.ebuild 1114 BLAKE2B 6f3274bd5d51a391a069c44e2fe13cc2d5661a45872b2dd35f6b1f2104e2c366cbd4ded0711b3a33f122bd116db5edd8e6a2139bd6a1dab6f10651e4052b3e3d SHA512 f21bd79fae2c4aeb6c4c07fedfcde224d42b32d9d69e91efcdfe6ef8eccc300e34db50748425418f8bd8d19d9c944461d6f8e3f30dc7626945fb2ddda4bd2498
+EBUILD p0f-3.09_beta.ebuild 1113 BLAKE2B 6907d512d2ea6bf2662cee08a56315142485ef210e44831c7c57e28c4f4d83a8b44ba060ef6ada2cf47c52aa855df884368535b35068319222a3506c52e92d0e SHA512 02aff709128984fe9670d4ae5d453e293534c4c153d9c9cf7626d3535e23c2badf5a05915c5d9da6282b46fefb58da93ff9ee07248c9f3abede028db4467aa8d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/p0f/p0f-3.09_beta.ebuild b/net-analyzer/p0f/p0f-3.09_beta.ebuild
index 68db0781a828..92f2334f50ea 100644
--- a/net-analyzer/p0f/p0f-3.09_beta.ebuild
+++ b/net-analyzer/p0f/p0f-3.09_beta.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,8 +7,8 @@ inherit toolchain-funcs
 MY_P=${P/_beta/b}
 
 DESCRIPTION="A tool to perform passive OS detection based on SYN packets"
-HOMEPAGE="http://lcamtuf.coredump.cx/p0f3/"
-SRC_URI="http://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz"
+HOMEPAGE="https://lcamtuf.coredump.cx/p0f3/"
+SRC_URI="https://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index d4f29c871574..b73117711c32 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -10,5 +10,5 @@ DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31
 DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B 4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675 SHA512 cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b
 EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973
 EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe
-EBUILD sarg-2.4.0.ebuild 1252 BLAKE2B 84f4539cc89d0994471efde38959af24e115dcfb15d8e7c04d6e070b35c4abe550413fcd6c972d917c8099d4a43bbe763fbf09b562783452c8720728cadada59 SHA512 1181b89342ce7e32ca618a7ee47525e9d132336a10c82ee16fecf7229a56b8a4f6b798bf3c57a4f25b0ff74cc9eb07bf022cade2757ee4149077911a56e6506c
+EBUILD sarg-2.4.0.ebuild 1251 BLAKE2B 92efa3523de1832a356fe880e6e46062cc9500c9e53ed180920974e03a9382d5a471c729b0ef988c2104021540dda681d6bc4dad45fa13d39ff7493013ed2898 SHA512 74c77cabc48e9335f866881027948a743c34f172ac0e90b3820a1e5cf7f1c217d1a9722fe701074089239a9c342396b40bdeac3511b6ff6e617b8fe02a5c39f8
 MISC metadata.xml 997 BLAKE2B b0103361ea70e01da884621e5243317afdae68481b50c18296122617b0bc29669d50d6c6dda00c85d77e48186111bdf9252419a1b0627993b91dc652b263ca32 SHA512 0b24013475c4e92553539de23c2e88dff9e0bf9c42b3c5d6cb46e54dc113ceb8bc5889ac1d1c397f73bfde600ec6a394b2ba0da2520351f9050ec873b2c8d49c
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild b/net-analyzer/sarg/sarg-2.4.0.ebuild
index b74ab98fe0b2..c2da09b5fa35 100644
--- a/net-analyzer/sarg/sarg-2.4.0.ebuild
+++ b/net-analyzer/sarg/sarg-2.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/sarg/"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 231745445ac3..9424af365cc3 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -12,18 +12,12 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce
 AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b7063916619aaabc5b39b1ff5d960b968e382615f84b18531465cf0ad0eab5ffa171c0b4b1797e70d58ed3450 SHA512 7dd55ffe8062bee9104218bf673aeeeea56a4a332ef6a5676b83e7f026a2b6ebc70446c63d6116b684ad16abd95de355cdbdf07c81a51daf1424b3fd8d627c74
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
-DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.19.tar.gz 17211769 BLAKE2B 1f7ac3fb195c35a41fae84a2b9a7985bee49664df8469ef7a14b9e264348447e5d5822fdc05feca4041ca57e74d15bc8b5cae262024fc5dca7749af263224d2d SHA512 c279af3d8b1b9125420d65e4e20a8892f9531a345e1f0046214fa14ab6204d535fd0cb672b5f3c6b5e325b7d8ff44e317bde58611f4bef9d89aba70851326daf
 DIST zabbix-4.0.20.tar.gz 17215217 BLAKE2B 144b334e78b121d0ba01b285590a6d354ed54be8dcebc12216b51f9829dba98c76d122bb329efbf67931237636fe178ecf5dfd141954fe37d1063c24c3c6dcda SHA512 5f761ba8bd3eac67de9f8d3614ebf437a6a4cdad8f0bf961c8b4cbe39f13bafe64bdb58b6ba56f1a27304ebdaa32109447bd3328fd3e2fcc1aacde056fb1d5dd
-DIST zabbix-4.4.7.tar.gz 19413652 BLAKE2B 3c7d55a64f8d0e94d7fca3d088bb40592f56ffd5ca8025fb2cdd82ae7946bca1449b354e74cc3e50a6fca9b0bc2b46cf995b74d31d4b462f3d0b4be734f7c19b SHA512 2b96771bb555fae3df67665ac2e47c94662b071eb97c943d59b8f1fc7d31e2bf349c551a0015c6e239321f069b3ab87373c397a023cbff3daad8bd310d11fb6a
 DIST zabbix-4.4.8.tar.gz 19457802 BLAKE2B 4cc566b744d500c5f3a95eeaebe5418ff58cf3852318f474991706b0f81d1a9b0a1b3793e3e28b99fc45f4a6bfb9281c4d42acb5bb8fc49c37802d3c245dd853 SHA512 bd850d4ec8f30b9bcd531d84606c900692be5b91424cb06f66cde24ed4634a93d25476010e4387b51933406c2552a611e2e7ec4691b57ca6c38fc874c4b1aef1
 DIST zabbix-5.0.0.tar.gz 18519888 BLAKE2B 028fc41d4ce250c558130a631aaf385b0a944885a820f63aa3052738f767092ce71dfd65e52750dd61276b6171caa739eee5a5dea0002828a12035cc51a6f2d7 SHA512 056aee99d19def2f673813e29bb7869fa7906abe6956fddbeac359195167abe06add21ef08baf68a5ad6e256323a797e604cdd7828f34be2762daf7b31923984
-EBUILD zabbix-3.0.30.ebuild 9227 BLAKE2B 565fe222ec1d1e2aca06bf705e78fe3c0f641dfdacd61f6346efd85385386e04e5c62eb079e16ebfb9307b84a8eeb2bbb220a59e0d771035a59c669e9685050b SHA512 055dd251714720d7d175d6f4c7c07dd0d452c339b007dc75501ac17a4185ca32d7b3d57a30e93828373c67a3bbd7a22f468330368c75565a26faf6610aca9dd7
-EBUILD zabbix-3.0.31.ebuild 9214 BLAKE2B a03ee28ceae862d1909846f682b9489b7a23b44dce06267ce258e9137c8755271e4a90357fdf1d7843c8716df1e9518ed7188a95be4b651fb505b27e947453a9 SHA512 e4dd3829d87dbe8c28dc82e00574e6712abaf7c8b11e8bf97ccf059ff820e3689e64bc89387868c7c453328619eb62a33819d8831e50784c1ba5a6e19cd90f24
-EBUILD zabbix-4.0.19.ebuild 9250 BLAKE2B 77bad68ad6c6d435d07aa45c2f381772a8a694c5f0408100f34826cded4059ff310036c3e2d1b6f13b792e7492301d7453e8de126acedc8e7f4cacd2dec6e013 SHA512 62a6d0c2edf95779d46bb84a499fae78205101f4d4e3599c14aab3163b09ad9493742d15715b58b60088a5292694d8fed07dc286016284f2817ef026d23c1366
-EBUILD zabbix-4.0.20.ebuild 9221 BLAKE2B 342880176c78e465fe5d650826393970a5600a6a38d7ad9a40af6f8f48237a90939466079af51d63be7a939a1bea69b3607714bbfecca187058f1747121fe43e SHA512 27a8f7b4e46d9f5779d6ced6cebc13c1aef37ebd699ec9e52f31feb836eba4e4759e3597cf1995873f7808a952083f774931a4ab3e1cd7e84bbd24a6a859f1f5
-EBUILD zabbix-4.4.7.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0
-EBUILD zabbix-4.4.8.ebuild 9090 BLAKE2B 10ceda1d5e6f59db90d495d97931e315325eafcdb1417e87f3894ef641b496f0873d19b09dfbc955b1e2daa3006264301db42c481d853f0040d8262d28eb029d SHA512 800867a11a498825eb8613e02268384f98836e48973ffecc2071946c448569f0d4b8d07ca965e277a8808f55e87062339718c770354ec44b3a4bed2ea1f3cb07
+EBUILD zabbix-3.0.31.ebuild 9212 BLAKE2B d7336dade436fb0d8257b60c57b0ffb7c5ece865fc422c860c5f1bed28219b85ef3efb22ca5f3825e27903509b6f97cee28ffa7edd687c0f34f7c869bd5f2027 SHA512 2ff1c545e08e419e3dd813749339c1edca5fd035e50cc4ad7965500c1fe8add46b5ddd864932c4bc11952117e7c3df619f8aa42f815a04e3114e8f46c45cfd3c
+EBUILD zabbix-4.0.20.ebuild 9219 BLAKE2B 260a527502f825cd65c1192542dac57c14ff68f14acbd6b6c8f3c320aa2dfd62dde1cd7d71d764bdf3bce229a7e1d2618800633dc70e1911af7536f479c38e89 SHA512 eb752f9ed9c9fa64a118df3cc824a08af8a832e7d2202d4ea966c80448ed2d3c30aeee17d7d1c34b2f4bcd19a3a9f717144ba798066559a24e7ac935996ebfb3
+EBUILD zabbix-4.4.8.ebuild 9088 BLAKE2B a5681497e0f1bc1c3b10a5a2f6c0233787d379d82df41cd3c2852f22acde9954ae40b22dffc209616e5ea04ce3825fc2610b7f5ae7a86bb21b1a3855006e71f5 SHA512 17b71b82bf1660b873c4528e316cae3f713209ce1e2b54e6a9272b8d2ed78d2b387f6efe021ad3acb4bd70425d8bea1c8eb94013e72d88a6952a47d776f8d84c
 EBUILD zabbix-5.0.0.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-3.0.30.ebuild b/net-analyzer/zabbix/zabbix-3.0.30.ebuild
deleted file mode 100644
index bb8e85472a3c..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.30.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	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] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	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] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-security-disable-PidFile.patch"
-	"${FILESDIR}/${P}-mysql8.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.31.ebuild b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
index ff07f82291b2..ca1bbd3d9498 100644
--- a/net-analyzer/zabbix/zabbix-3.0.31.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-4.0.19.ebuild b/net-analyzer/zabbix/zabbix-4.0.19.ebuild
deleted file mode 100644
index 5fe2b0dd7666..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.19.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	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] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	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] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.0.20.ebuild b/net-analyzer/zabbix/zabbix-4.0.20.ebuild
index 3313b71565c9..a6e36395a53c 100644
--- a/net-analyzer/zabbix/zabbix-4.0.20.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
diff --git a/net-analyzer/zabbix/zabbix-4.4.7.ebuild b/net-analyzer/zabbix/zabbix-4.4.7.ebuild
deleted file mode 100644
index 4f4099f27c63..000000000000
--- a/net-analyzer/zabbix/zabbix-4.4.7.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	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] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	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] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.4.8.ebuild b/net-analyzer/zabbix/zabbix-4.4.8.ebuild
index 645e67353269..4ac5203ab7b3 100644
--- a/net-analyzer/zabbix/zabbix-4.4.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/stable/${PV}/${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-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 1db4120d4991..0a72e4d5a002 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/sendpage/Manifest b/net-dialup/sendpage/Manifest
index e2d78f708d91..464932987b29 100644
--- a/net-dialup/sendpage/Manifest
+++ b/net-dialup/sendpage/Manifest
@@ -1,5 +1,5 @@
 AUX 1.1.0-makefile.patch 369 BLAKE2B 4e2e5378e7816d4eaa33befd3df60915ee984792185b476fee7e045f4869d4443e514de6ff6515377ddf0f81284a0ec81110938dbc9edba0a9a09e8618568cd7 SHA512 35d177ce5a3bc0f559204fdbe320c1fe338d057faa9c100785e11b406cfdb06049784fdd434b4760f8dc852460192fdda4ce1cbad4ff35ad553cd748dd693f10
 AUX sendpage.initd 407 BLAKE2B 1f0ace1ce3a81e5bd1f74230384a68414b92b82a12a332dc861b89bfe76cef011444001786ca51ef5e64638fe00dfd5789ac43133b122bdbd6e75f503539a189 SHA512 35fcf9afdc289bbd7034733e3a49a4d6891745bbecce8fabf8642ae160a221fbc0e6d795403d8f01399c250c41973bab86e22a9aea307d7e42ffa9ce18f53e9b
 DIST sendpage-1.001.tar.gz 127130 BLAKE2B a90ff3334fd1f3c112bf852f2858caa2264659c195b11542fb1e67047f19298982b767af555da5aadbb621ed9765dd5d9d80449df445222b2eec20b1fb66366b SHA512 694f7eb8afd3a73d1322d51140b5eb473a3d697613a88d1b90fb0368e9eb25ec4cee8ed018841076fcd8370420d6c9f437f84af873b31cccb36c16f91a01cb3d
-EBUILD sendpage-1.1.0-r3.ebuild 1086 BLAKE2B 8c13e4366f8b22c05adde59abdeb6f78fce24901714c3a4b0d85788f256da335ed0f8e07a08b51285be1ea458637511dea256776308165899204aede8b8762a0 SHA512 dfeca4ea70d5b717e48f0726882f95b0ff18c51aa28c109a1dbe2e399a94899f4306bfaf69a0325203d1dabf67796e9ceb675b8ca456576e0a518da9f66555be
+EBUILD sendpage-1.1.0-r3.ebuild 1085 BLAKE2B 2ed619807dde07f664a30a03b27f8d97173bfe337d17a85ea4c7ad2039d6f944371c1cffe1d1d128041620ec70130fccd8049a4b92bbe3d3dde539ae938ba583 SHA512 2a8a639b2c234d6098884008b0a83a857148059ef84f05180b7b752a84a355686e4923f734d59c03883ddad30d463ffc9438b9bd34d10565b233f02863686f00
 MISC metadata.xml 643 BLAKE2B cf4db7d4b665e9998380d160be6692b88487b8a249d32cdbab60c6b5bf47f75cc14dbbb88c521b0cceba69ea5ee81def0a96e73dd7ecb3a386b833f649a90964 SHA512 76f748530bdcf74ef12f246ef954f2d334ae8ebab3923752e9fb02c5cb6b5475442c15275b91909555d3f9515a98d1f134b8c16ab3d9e73ac7d61b1cbcb71e83
diff --git a/net-dialup/sendpage/sendpage-1.1.0-r3.ebuild b/net-dialup/sendpage/sendpage-1.1.0-r3.ebuild
index a06e61474b36..821ae2e5942f 100644
--- a/net-dialup/sendpage/sendpage-1.1.0-r3.ebuild
+++ b/net-dialup/sendpage/sendpage-1.1.0-r3.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
@@ -7,8 +7,8 @@ inherit perl-module eutils user
 
 MY_P=${PN}-1.001
 DESCRIPTION="Dialup alphapaging software"
-HOMEPAGE="http://www.sendpage.org/"
-SRC_URI="http://www.sendpage.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://www.sendpage.org/"
+SRC_URI="https://www.sendpage.org/download/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index fc1588826cde..1605dc74f0b8 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 6b55666194a5..21960c2e4677 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -18,9 +18,9 @@ DIST opendnssec-1.4.12.tar.gz 1036392 BLAKE2B 3bfbcfe91d7da7c2e4b1c5439f7d55e156
 DIST opendnssec-1.4.8.2.tar.gz 1043171 BLAKE2B 20b1fa0d97b776223314937061cd42f4fe0a924e58a159fd0399d23058e2b0fd44d55049947de26c36aade5b5599527fc03f09eeef4e20f8c9beee40dfbcd7fb SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06
 DIST opendnssec-2.0.1.tar.gz 1101523 BLAKE2B 0446efd04e73e00d204c53164c3c6aaecb9f37014a110ee85d7e7b1728d225aafcf9e6ef31a7dd29cdf2e875e7b653ab6e8178cece65c47a1c5b027facc16130 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-1.3.18-r1.ebuild 5717 BLAKE2B a0367f5c05d1211c7ab393dde80fc3f96c40dacb8ba6494507878eb871fc89541a74f07cd5aec1406ebce7d7e386097ad2bce5ba2fec691e6a087348d033d3ba SHA512 012d731bf038501ee3bbe6efe115fdbdd278bc912128d209c4d777d9b3a56b46e4357a91524d617836e88abe716f1d17b7ed35114ff84585b306343e3aed5075
-EBUILD opendnssec-1.4.12-r1.ebuild 5804 BLAKE2B 24230a7e63a77b1f77f921d85608c85fd924235e2a996dbbd0b24b50eeb22cefeeff3a3f8c15b1d604f77355f5b3fe52e0d3c03fce693f00cfe7b94f9a7535d9 SHA512 b833b447452d048e3ce0b5619fb4969fceb80d2ceb168c5e3cca06bd30b0395edd745de2de558cdcf7beb86ebfce84691db9868f32f3583d706701072e18707a
-EBUILD opendnssec-1.4.8.2.ebuild 5854 BLAKE2B bd33ae903129a4cc06053d00840f848c1cc02c52040ed95b0137671ea9b03067eec5b8dc6edd89ade59c8ddf2f83928edbe62577f83b78511fa0aa2521ee9662 SHA512 a66894f5e6439658027c00298690c855603d1e97b17f3e06e461fde9efcab3b9dc10a285b55c435a85ad17de01202529b01a2ae5fcf052e9e103f86bcd8f2ac2
-EBUILD opendnssec-2.0.1-r1.ebuild 6787 BLAKE2B 203de779bc74c2273598ab37e0faa1a9a9dcc3a7ea00697b3c88180b90db9b9d09891442793ba9401aa1a3f5bf22b02f40a99a29496a5b8aeb2e6aa7149ccab5 SHA512 3a91fe2a31c58225de3ae786fbd3697ee4935e3ebd8949d066c41a14998f577dc9afbae758eb890d94960ba7912ba5ce4d9fefea1702c0687dec30cab1204283
-EBUILD opendnssec-2.0.3-r1.ebuild 6759 BLAKE2B 59e2fbd023d0c57480743fdcdbfdca29e3080bc726f8fd472f4dbae876e6e5738ec0d9b58194177fee23406aac8477dbf5726fa94a9f286f274826cd353e1603 SHA512 e34deebce92b6c3057e36a88cd46efef5141a3903a36df39e052fa64323559d1cf9ea32d85dc209613b7b6c6536c592678ae78310274cbbce08d2a1aaea3ecc7
+EBUILD opendnssec-1.3.18-r1.ebuild 5719 BLAKE2B 33ed406b2fb2bfdcd7a33a67971ceed4986958b8016259693379726604342ef930ce9626e962125a02b315bc0fc2b07ab31cbd88c09060b3b08b48f51ffd5652 SHA512 098d741ffe09e814ce0697d6d9b824080efcb08548c932b8e1a78fa905c4e680fa193304cf51e75563c70cd939597fb30e858d90eeea5984b15a0810d4fd6e22
+EBUILD opendnssec-1.4.12-r1.ebuild 5806 BLAKE2B 96d15804c15759d8f5c6caa8284d583e30308cb6fa24d9d36b177d8505bb816ab6d899ddd82225c1102a4ac58b1f98110f53cb6bdf7c40255532dbf91cf8959e SHA512 67c7c4afec19bb5f2c22498fcb385c4ce1042fa1e98b3b12bd183d8999531facf1d878c1f0800d22d19f67e09259b2545c0738e609885178f8a294020517861d
+EBUILD opendnssec-1.4.8.2.ebuild 5856 BLAKE2B b9b4bf8e9d94743c7bd4189889e3071aeaacb71915749b542b59d28a86260affd402bbcd2b2f88896a791237bcc358e0bdc72f4e068e61b048bf98ec03e3cd74 SHA512 e9f000c17e6bb9bdcd66bc38e2b7c21ff3dce0da7dcda07e2062ccd64416cc563577cc6856bb279d575eb74896e89527a895fc825fcd2cda8431c8e14c372633
+EBUILD opendnssec-2.0.1-r1.ebuild 6789 BLAKE2B 996d5f5d1335513084428339fd2ccb9482a1901b5940bf77bfd19bda36f6b99a4dd40f0d35cbe4d90f7e5b9ca37566b6f65e5aed21174618a1e477f97cc0de6c SHA512 982583cba1c39f9591d710bb4dbb7cf5b53c4b7b9a073b01416097bf7b604a94582f564bf60b7e8d4de588300bcb77d826f7cb3a9987475a94901f3b67d1d7e1
+EBUILD opendnssec-2.0.3-r1.ebuild 6761 BLAKE2B 67105b5333460bf466ac4620a7efb093423321b5878e715475e0232ac9a74ff51534a75b4417abc6a26a46027c31585ff60cfe92eed03b0300a2fb5e3cf0363b SHA512 dc199e6aaa506090c25ba9ea9538cda922f67dcb509a3e6ddf6ddbc9d15300d0d5166720ca53b10be49f99a13c90a9f1aef7429a1c0e26b039cbdac28f5bcad6
 MISC metadata.xml 906 BLAKE2B 87ce475aaab1ed562daa0c2102e206f32abc25b9fd77932bd6a33e5f31990864dd0da48e48e7165debc10ae0653f6bed364c12a52df48dd448e29590bf6f7141 SHA512 9cddc6b15c7a959cb885bc639c19e166ee202dd4b45db50c9bbb3b61fe9e84311f023a3d34cfc44e689cf81df092211fa4cb88427fb143c113bdfc1e7897112e
diff --git a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
index c29c6bf1ac7b..a37fb6fc331a 100644
--- a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.18-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
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
index 61d2ca9f1014..7204fc6a5df8 100644
--- a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.12-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
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools eutils multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
index 271869383a54..fa23c0bf555a 100644
--- a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.8.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=5
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
index 4802edd1581e..b93dc8f5ab2b 100644
--- a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-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=5
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools eutils multilib user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
index 71ed1ff5e73b..3108c7a8a9c4 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PKCS11_IUSE="+softhsm opensc external-hsm"
 inherit autotools user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 17454f72f873..c9e4d7c2fccd 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index b82fc38c3b36..62de4ffae055 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,3 +1,3 @@
-DIST uftpd-2.11.tar.xz 182000 BLAKE2B 75c9a564a90b10f2efdbfaaab67572adefda160d7b5df8fd303cfd970153ee24bdfbfb25dca1764d7b747a27779a2863a1b32a0ec489fbc2e4f3f991bc3436ee SHA512 bce9fe3d763d61030e883bba7988d206630f2124991ce0c11613744813f66ed8bf215a555e0061d0083d32b90ac5c9b583adf08520fb691617adeac759d50546
-EBUILD uftpd-2.11.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
+DIST uftpd-2.12.tar.xz 182384 BLAKE2B 1bf25bc4d443ec61d03be3d24c1c78b573dce78f17275db4fcaf2969e7bf01bbd20c3b6ff677f5b1c806b98fa34325cd5e39e671d8fd2c31f21220e5ca9a8c8d SHA512 4d9398a0c4f19eac3f2a4f694b683e5bc6a436a7ef50d030f3f71303d3212ac51e9e54844ed247988a9c69df8b0e52642a6da946c75ece25875ecee6cf04d520
+EBUILD uftpd-2.12.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.11.ebuild b/net-ftp/uftpd/uftpd-2.12.ebuild
similarity index 100%
rename from net-ftp/uftpd/uftpd-2.11.ebuild
rename to net-ftp/uftpd/uftpd-2.12.ebuild
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ac9a54db65fe..c7f18d10d71d 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index a56e70f31c68..a67411ed80a2 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,5 @@
 DIST skypeforlinux_8.59.0.77-1.x86_64.rpm 108914465 BLAKE2B 9d8300b9d315b95528e7e453a4b2175a22cc598634f0b517e6e0b45dfd7c04d6cee92d46d455486ee00ea1953617132e6c97576d5cc344988912aa3df03609e8 SHA512 4faa158605c13ee66bf49aad8e1b06f0429772c676088559fb28f6012cf263c1425f830678edd9605cfd69a4a0fb75f051fd96acd0a8a4fb636bb3a5beceb211
+DIST skypeforlinux_8.60.0.76-1.x86_64.rpm 108325497 BLAKE2B 84304111a215d0e0ddb7cdad218913feb961b490ab5bdee3ca506c1666b1a37dfdb8360fa84fb36c56cd47458012c92d6eea2f437e2b9787b7b232dc797adf76 SHA512 a7a1e3ae3c13d235c951c5aad006df668287e82914aa333ad5429ba1a2ac0ebb84cd703f4c5e620385469c91db437105dafac93dcde7af7bb774f48dbe2370d4
 EBUILD skypeforlinux-8.59.0.77.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+EBUILD skypeforlinux-8.60.0.76.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.60.0.76.ebuild b/net-im/skypeforlinux/skypeforlinux-8.60.0.76.ebuild
new file mode 100644
index 000000000000..c2755ee5b06c
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.60.0.76.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils rpm multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${PF} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index c2f875b8f971..2beee60383b5 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,5 +1,5 @@
 DIST teams_1.3.00.5153_amd64.deb 68143908 BLAKE2B fc540de9c70c825b58a6bbc30a8d15882dc80af3b725224617c32a988fa58498e9efafe3b3fcfebab3c5d98c7629cc00fd8e5b5f7a1b3df305449c6a0644b8d3 SHA512 bac34d936e9c34a9d3b31ed800a32c187154dbcf787da350e75e3c63103cbe41872cd98551204e922198ce1d86a06a9fa8b6020b7682b9aea15ff583e446dfca
 DIST teams_1.3.00.958_amd64.deb 65064414 BLAKE2B 4f8788f7a9d3a2cc032e873453469dd3f2a5bd9dd43c60de4b8719e7fafcf903bf266b35b2da16c593005fa1a4dc275bc65cc6164654b0df909a564ddc4cc00e SHA512 ee698784a0c91346306466a1b794c4d1b4ff01ede2869cc7c4731e62ebf16e6f18b65aa0b03452c1011ddd5c654808f1725f62a62a43814cacb9d7a2934fb7c3
-EBUILD teams-1.3.00.5153.ebuild 2761 BLAKE2B 2b4e7292dd91046bfed051b1ced2a22572ce439af91d8e7b948b5f2f1f597f7063f809620cb09656360018fb851711186f1b868ececf043f0f28c36cef9b3ef8 SHA512 980a033171eaadbbf27ef48e04a2f16e6f1b55a1157b3216ed417eaafc34bbdf05fbce0485bfd2a06cd0c96282a85163eaa870d44a275b8ab807c82977fafc49
+EBUILD teams-1.3.00.5153.ebuild 2759 BLAKE2B 4632904d295c314769bf449be3d50f7b3aff7ec2a78d7e4cd97615bcc65771c3cf9c15900e501236b87ccdda0c78d0c7f13f6a3bb6266394d9d064e2104ebbca SHA512 68834a6dfbcd86d7a40b3832e4afd36b52546376c5b0b28d99d4da58c71452d0d1b0794510cb9aace7479a937934f767262b9886271c3f9ff944c87f47edc6e7
 EBUILD teams-1.3.00.958.ebuild 1950 BLAKE2B 975cfdd03e7e92b6ca060f24d518092837ab9e106b44531189f1b8f647045ebd979ea72c53e4438508f7e3ae5972f5c40f8ed3e335ffe21fac449009a101c46c SHA512 22988beea775a43604231ade4ab9bfcf23e61ea83972345eb9f75633a4bd0f61d3e48297c6f75bad434913ecae28e0214b1e3ca5f0745a5376560a86d7385f72
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/net-im/teams/teams-1.3.00.5153.ebuild b/net-im/teams/teams-1.3.00.5153.ebuild
index 1993a0370f1c..6c43934aae50 100644
--- a/net-im/teams/teams-1.3.00.5153.ebuild
+++ b/net-im/teams/teams-1.3.00.5153.ebuild
@@ -71,7 +71,7 @@ src_install() {
 	rm -f "${D}"/usr/share/teams/libffmpeg.so || die
 
 	cat > 99teams <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/chromium
+		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
 	EOF
 	doenvd 99teams
 
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 6bd9230b90e1..42ded60dd442 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -2,6 +2,8 @@ AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4a
 AUX telegram-desktop-qt5.15.patch 975 BLAKE2B faf7fa6505d760299b05a02684817993162a5d3105581fd425bf4af179543170eb4d4b4c670907b88cbfead9bc288641216edb86f47fe370f0d691918426b4a1 SHA512 6bbe0583103d575a1413141799985c7c7b590d8a9856c727320ce322679a3d38343a144c314eee54fa9776c8f3a084627a333e6860d1b8cb8f496b1702070ac0
 DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d
 DIST tdesktop-2.1.7-full.tar.gz 36509059 BLAKE2B 4a1bf5879e71e64f34024165f9db39f69d1d8e87b0387704bdb74415d60d6a1efd22ab1fec994116a72a6982a55f13cee0edb667060bbe9336cba4ce12e7472c SHA512 f942ce93d9671f3bb95a8fbba107fc851bfe3f28871c9651f6f2d97d711602f8a671f7b74750894b2175d33a67c25017562cd4ee455da7aa9b86755d1c3f1cfb
-EBUILD telegram-desktop-2.1.0.ebuild 3717 BLAKE2B 5e0a8f4f73140a8f793ff0afe983db06cfaac151cab82aebb4a2900832e5ebf303bae0071d1067108c374b8e5dc2a6467388342512b34d3d77881c24aaadb0ac SHA512 9ff80da4041cafa2b626f5a2f625aa0b47b80d8cdc2f3c443588d08bf689922360a43efda1637921f81e6a94d93f3f2e713bd2326a7f2f434594cb9929ee1d07
+DIST tdesktop-2.1.8-full.tar.gz 36547777 BLAKE2B 35ea5d18555cb314517d0b231ee9fd29c12f9a808e942ecf625bec152315cfce13100315533cc2a73f00a2c91a41032c896922f1af8b7c19c23bc7ee2fdd6f29 SHA512 6456f3c129742838410d7455854430bc5ba118990fe43e2e5bfce3a88963a4fc746ae2def8afc9e2cc50e465dbd0bf8907e997b27dbc48f8838da84d916c9e3b
+EBUILD telegram-desktop-2.1.0.ebuild 3716 BLAKE2B 9b1960b1cec105bb69527e5540b9621538954f8ae3357702f1f328200c0950312f83d1efb2e5776c4a0e6141f7f57d7ce036a8bf2c25f0310edaeaaf3c5153ce SHA512 7647a66aee7105f0847b916dbff40deceeda6d6aae8ae4621e1027b7b21eccd0d2046ee00e0a9345af1fda93dd7c35cccbe1e12663ad8539212b406c28415ac5
 EBUILD telegram-desktop-2.1.7.ebuild 4010 BLAKE2B 61279753bfbde2ce025953489dbed3f0c629a01d344db8146346110cfdeee27d3b2369f948862bf97bf2fbbd5c265117f3a92bd80dfe99d789a17f6ea3de79e0 SHA512 ad6b101bf0a6f60dd65c73d6fe5bb6e8933181716c337180215cbe2d29ff8b27b09411cf640569e3dd66d4c558f95d30b040a044d45cf9f4ba88b7e2a271724f
+EBUILD telegram-desktop-2.1.8.ebuild 3963 BLAKE2B fe9e9583ea4bcc15d58430d1d580d8724e9cef05965165e4cc2e267b131264c1db9533760a617d6e7df56c5b2aa9a76fa1f5625a0c372153bea442467070e7f1 SHA512 53add9853b634dffbebd91e0be716558235b2942cc70aeadf6f7be146f657fdc352a113e1707fd0e2e8c9cf643bdbbb19b49e54c4e03d7fdf0237bb15796b0eb
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
index dd038756cdd2..3d59edf3d41f 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
@@ -70,7 +70,7 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( 
+PATCHES=(
 	"${FILESDIR}/${PV}-kde-dir.patch"
 	"${FILESDIR}/${PN}-qt5.15.patch"
 )
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.8.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.8.ebuild
new file mode 100644
index 000000000000..bc1842516e77
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.8.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-cpp/range-v3
+	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
+	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}
+"
+
+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
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	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_GSL=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-im/zoom/Manifest b/net-im/zoom/Manifest
index c0c5836fa5cd..78f8225e0114 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,10 +1,10 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
 AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
-DIST zoom-5.0.408598.0517_i686.tar.xz 38668604 BLAKE2B a503019946689f796a96a29d930ba4a997d233d6f0ff7ad6c100ab25b581b58fd09e811ae444ee0dd94e60c3ddc8b52bcdbd45f2c1daaa201fc71406bf11b764 SHA512 3f38df83c26d2a2be6af7cd8f2e4043edbdaf4262becd8ac0eea07e4822743fdb348bc9fbdd1111a9d378aed7c0ab540755fb0218abd0c1eef32a72bb57eed27
-DIST zoom-5.0.408598.0517_x86_64.tar.xz 41559224 BLAKE2B 56ef7e0b9f7277a7391d92bb8b0259ea98b2931b216bcace8dff43981f0b148846c5bfe0b1c476692712fd342e6652f4cae8d536e7f645168a84fb113e3c97ee SHA512 46762cf46974e4239bc716d1ccba8ec74ba1040bb7f917625535edc2422dcd07df22a448360d35a3e82ef1ab905d7f280401005e9398b5229e515d120d848222
 DIST zoom-5.0.413237.0524_i686.tar.xz 38703768 BLAKE2B d50ee81d58fd987580d09e6d672d85eed51607f242b600a4bce71c4729829a6b0ca9b2b3a572ca4a29a86c7fabc388582c4d6b7a4c4c88255297b3e4e92af5f4 SHA512 11806bc656b87760604d19eb7432050f0f10f12c6233b687fec319a221964ffc4f4294f45028c5b7bf148a33998254acb37c6597745299be32ba78774dc082a4
 DIST zoom-5.0.413237.0524_x86_64.tar.xz 41591272 BLAKE2B 21a7b53aba636721823ea414b361ca3768b3ddcbb9cf2d5fbb6a10f60bff79cb425bbd2b7b8da6f13c4a0544c6fb917172c414455b79f7b36766903768f72a9c SHA512 55736fcd43241c2abd090c1943b970741944bfe7061e61cb0fc5839706920025123089c26a3a20730ef253b338546a833a958dc29c5b00234a76a1483ec7669c
-EBUILD zoom-5.0.408598.0517.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
+DIST zoom-5.0.418682.0603_i686.tar.xz 38701696 BLAKE2B 0f7ca49317946efc5eb4260013d81475d928315538a1cb9b31bfc3dd608c506cf9d794e746e47355ce1fb294445d510d14fe216d754846fc3b23c9fd0c8543f3 SHA512 e73d57c2c13136ab15864e302a127f77f9d771cb280185b3b557819f52bcc7291995a44315436798febad9d557501306f70521f52197ebc9dd683be4ad488d19
+DIST zoom-5.0.418682.0603_x86_64.tar.xz 41610180 BLAKE2B f256c364c37b3ec4f5eae069d8e187343ae2e871140b2f297d414680c53d774dee9f6ed6002e25d4c014ce1ae75996ae8f3bf1ad4d34b38b5097e961eb53d558 SHA512 14ddc9e30a23eabef7391933dae953cdb3db07033b27210063f30e510c76c840cd13c94554ce182942346a8c419c474ba202bc311e0c4e9dfb773553f4726308
 EBUILD zoom-5.0.413237.0524.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
+EBUILD zoom-5.0.418682.0603.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
 MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/zoom-5.0.408598.0517.ebuild b/net-im/zoom/zoom-5.0.418682.0603.ebuild
similarity index 100%
rename from net-im/zoom/zoom-5.0.408598.0517.ebuild
rename to net-im/zoom/zoom-5.0.418682.0603.ebuild
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7fddace51072..4457a9279391 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index be2309afa2c8..101fda546862 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -4,5 +4,5 @@ AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e
 DIST ngircd-24.tar.gz 524968 BLAKE2B 8ec0518d54f43a4c42fbf9744d217eb2aae498fe4f0010bce6ad68164037c2e55dc2b9681babce8ca5f7e26bac60a91389c63dab397d349dd4bcbcce6c2e9839 SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395
 DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c
 EBUILD ngircd-24.ebuild 1685 BLAKE2B eb31abc6faf507e55bf9a88abe98fd83eb4dd9fee3e580e0b9f9fb187c47b29a2b7ab16e11f347769ad82e4f4f495eccf5622205215f91b3d920e833f6d7d8d8 SHA512 66d47dd1029301755ae43fbfcc5d25930a3965011884c5c965a9bd6983e187d79086b182958b9bb7942232e7705e419f8aaa11ed334aebbb76a9d8d55caec4df
-EBUILD ngircd-25.ebuild 2269 BLAKE2B 8ebaf779409d513b2cdd22506b8ae26382b8183b881e7729211413fb2a7d70b5979a97addd8514cce0dfee9891316f0fd051dbce0ef64833913407c79ea6e4c3 SHA512 e83e0e3865fbdb8bdf766baeb6b58fef197a7fc25ae12b8d758357ae6ac25c17989d4b842315e62d4353fbf3f6340ac12fa5c731883ea2248108a4db78b915aa
+EBUILD ngircd-25.ebuild 2267 BLAKE2B a6a325bad109619df5a6d48bd305724e440a5f66c810ab4fb7e52e07fb84b263d85560df73f5b940c180968dbbf6f3bda45e25d5472c9b9d476bc3eca2f3d314 SHA512 63afb428078ffadafe47e86da51563a6a14d5d4eff92a86c2776bef22d15e8e55d7366570d65db2e2e1cd55732a2751fa4b1fee7449c45fac9bbdc0c81c885e4
 MISC metadata.xml 632 BLAKE2B c27dd54558ef8f4670a5c888fbe81fffd77c20eb8e487a45bd61cfe8703fb3c379217e3ee8a0304a1b27eddc3a9fea0826b1cacd8c464a20fbd0bce43a109074 SHA512 27891662b1e62cd3d19faf621a3e06efcc0b51ad092cde32cf7cbf5817b7e7840cb57e948389547ecfbe70a022419dbe23b46870117ccb9c26da6581da426eb9
diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild
index da56e3240d4a..91c35b8f91ce 100644
--- a/net-irc/ngircd/ngircd-25.ebuild
+++ b/net-irc/ngircd/ngircd-25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
 IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib"
 
 RESTRICT="!test? ( test )"
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 0346d742db11..fa624a3f834e 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,7 +4,9 @@ AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8d
 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.5.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.5.1.ebuild
new file mode 100644
index 000000000000..d2f7a8a96ec9
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.5.1.ebuild
@@ -0,0 +1,171 @@
+# 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 eb000347eb9e..17ce643148a6 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index efa849f262ea..a4d416cf3442 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,7 +3,7 @@ DIST glib-networking-2.62.3.tar.xz 183996 BLAKE2B 3841a355fe485f30970ab571fbe7ae
 DIST glib-networking-2.64.0.tar.xz 187708 BLAKE2B c80a575a48bd5fd77a53a823e0a1ad98f63f75a1f83990a9ba28bd35b401f867b5be0afb3ce2650855b34e6d5a043b354086620c6c1caeb93feeeddab92292e1 SHA512 c5788167c114ab69812d4784912e0e468086f1ba1a8037dffc98466605af3f7a77f7a2666176da260669640bfbdf94ee959878c6297d93fe078d22fc6ff0584c
 DIST glib-networking-2.64.2.tar.xz 189680 BLAKE2B efadec24a601b2a93a720444e328e31308ed8e72a96638514d5f8510f8fa9a88b1e58809f4a610baf0c17ff1eccc84cb0e30e12753fa27ecc7b80d03fe2b4967 SHA512 b796d3ef82f7ceea1c69a1d4ef7cf09e88ff8e702e93abd37cca4ea2f09650c1bdfdf8d8c57360a4bbafdd8d3cf5f88f0aad668b5ce77b92b60c08b7456ffa12
 EBUILD glib-networking-2.60.4.ebuild 1767 BLAKE2B 2333935562c3520aecac692b63c22d5693322ef3c823678349c48895a6835e239259ffc1ff7e733838c8c48edd385411ace855e845ea454e41a1c828abdacfd2 SHA512 1b4a8e165182cb3ceea9587fcb18747cb9a33fb01571767918ec313e06c7161eb5a9553327aaa648827c6b338fc7612823d3ad31c729b8f0ffafef30b231d723
-EBUILD glib-networking-2.62.3.ebuild 1770 BLAKE2B 7c7b7eb889d4aadac5bea7d5a772baa476ecb2c531764199c07c4c46da15290a7572620166e115483dbb1e50307edd84e23d8ea4229d1d2c440c527bbafa3452 SHA512 1d4f451dab4bc6b0af82d5e7474471e874222201feada2024977901a865fe0b32e9a3add16cbfda3c9a9432fa59534c668deb01c5f31eb35c82faf14c1f234b3
+EBUILD glib-networking-2.62.3.ebuild 1769 BLAKE2B f4301f69d976be790907193f3e6220dd7b08b81efc7f6a97ecf9a9a2349c2d215345964f20770a22984ac6e26cfa23add8fbff3d18456770f92d3fc93c867d3e SHA512 2705eba315eccb97409d9e7e43dae87dad1fb1e9e48cc610a36381dad70a21a5193c45ba9e61bf03e9acdcaa5464ad1327d5b1947482d58df710987582169d2a
 EBUILD glib-networking-2.64.0.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
 EBUILD glib-networking-2.64.2.ebuild 1776 BLAKE2B 86f26398b596fc5ea94ed0bdb750523fcb3daeba92d8fa6425b97195477932aba70f8d31379bfbd4e12f2c30f1bf83547849042858072f0e49bc2149cb5cb4c9 SHA512 e8221e8d4c0cddcca0dff06fee174d300836ce549f0f9b4d75e9a9e9a658c5a75479379123b5c520e606ee6b958df515b67a2e8875fa3583f71647d8a7ed6822
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.62.3.ebuild b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
index e26b85fa56f3..a313d2e2f20c 100644
--- a/net-libs/glib-networking/glib-networking-2.62.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-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"
 
 RDEPEND="
 	>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 93c27cda2ff8..51d9d752f83d 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,4 @@
+AUX gnutls-3.6.13-handle-expired-root-certificates.patch 15894 BLAKE2B f9b542694247df7606c646f9cf375ed17fe074c28c433ff373a8312080b7618cb820317ace1d5c93660e57e5bf305ff6ebc9b694bb7c7ed1022cb67ac19cb432 SHA512 00ae99455cacc5f191de542986ba85aeace3f8de5cefe2fa24e7f1e5b736f71f9ed6d35183157bd46610d223afe55b03afaaaa6cb32f07cc3262029f4c8065f7
 DIST gnutls-3.6.13.tar.xz 5958956 BLAKE2B de67f96198b6456f397bf203f13bf1f906b69c7ce632dd96b72539fea12f2bd8ee8b2c608d1ed8b06d3b189023fa81e9a2cfcdd6c9bbd174e5bd2b0673f6ca47 SHA512 23581952cb72c9a34f378c002bb62413d5a1243b74b48ad8dc49eaea4020d33c550f8dc1dd374cf7fbfa4187b0ca1c5698c8a0430398268a8b8a863f8633305c
-EBUILD gnutls-3.6.13.ebuild 3985 BLAKE2B f8800a3883fbd2f04ac22f51d6486558ea48aae6393acde4361e1f634a74dfd0b9dbc1311fb8813725dfd14f45ad8f33e3338189fefcf554540c85df244181e2 SHA512 235d6a4c22ec21768d6feeb05f83cd7fbbe31ba78c20380cf7530ee17aa82d50d1465959fd62d5bcbd8c3cda4394600820f94a34c95e70b36592c778a8da6a61
+EBUILD gnutls-3.6.13-r1.ebuild 4056 BLAKE2B 0bcaaf93e6c5d5196a5e11ddec56a1b23a795f86f5ae79461d7d8b6da55403a153670ece591fa0fd58f0bfb064e755cd967cbf20870ca80a4ba3259c7c03e121 SHA512 b02412eb44b92f401662ef13774b4f7509b92425ba232558dd530727cfbf41b7a049f198f2af13291a5793a993f716d27197b725cf262af162ecd6b496b9c48b
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/files/gnutls-3.6.13-handle-expired-root-certificates.patch b/net-libs/gnutls/files/gnutls-3.6.13-handle-expired-root-certificates.patch
new file mode 100644
index 000000000000..91986cf449cb
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.6.13-handle-expired-root-certificates.patch
@@ -0,0 +1,391 @@
+From 299bd4f113d0bd39fa1577a671a04ed7899eff3c Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Sun, 31 May 2020 12:39:14 +0200
+Subject: [PATCH 1/3] _gnutls_pkcs11_verify_crt_status: check validity against
+ system cert
+
+To verify a certificate chain, this function replaces known
+certificates with the ones in the system trust store if possible.
+
+However, if it is found, the function checks the validity of the
+original certificate rather than the certificate found in the trust
+store.  That reveals a problem in a scenario that (1) a certificate is
+signed by multiple issuers and (2) one of the issuers' certificate has
+expired and included in the input chain.
+
+This patch makes it a little robuster by actually retrieving the
+certificate from the trust store and perform check against it.
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+---
+ lib/pkcs11.c      | 98 +++++++++++++++++++++++++++++++++--------------
+ lib/pkcs11_int.h  |  5 +++
+ lib/x509/verify.c |  7 +++-
+ 3 files changed, 80 insertions(+), 30 deletions(-)
+
+diff --git a/lib/pkcs11.c b/lib/pkcs11.c
+index fad16aaf4f..d8d4a65114 100644
+--- a/lib/pkcs11.c
++++ b/lib/pkcs11.c
+@@ -4547,34 +4547,10 @@ int gnutls_pkcs11_get_raw_issuer_by_subject_key_id (const char *url,
+ 	return ret;
+ }
+ 
+-/**
+- * gnutls_pkcs11_crt_is_known:
+- * @url: A PKCS 11 url identifying a token
+- * @cert: is the certificate to find issuer for
+- * @issuer: Will hold the issuer if any in an allocated buffer.
+- * @fmt: The format of the exported issuer.
+- * @flags: Use zero or flags from %GNUTLS_PKCS11_OBJ_FLAG.
+- *
+- * This function will check whether the provided certificate is stored
+- * in the specified token. This is useful in combination with 
+- * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED or
+- * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED,
+- * to check whether a CA is present or a certificate is blacklisted in
+- * a trust PKCS #11 module.
+- *
+- * This function can be used with a @url of "pkcs11:", and in that case all modules
+- * will be searched. To restrict the modules to the marked as trusted in p11-kit
+- * use the %GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE flag.
+- *
+- * Note that the flag %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED is
+- * specific to p11-kit trust modules.
+- *
+- * Returns: If the certificate exists non-zero is returned, otherwise zero.
+- *
+- * Since: 3.3.0
+- **/
+-unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
+-				 unsigned int flags)
++unsigned
++_gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
++			    unsigned int flags,
++			    gnutls_x509_crt_t *trusted_cert)
+ {
+ 	int ret;
+ 	struct find_cert_st priv;
+@@ -4586,6 +4562,15 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
+ 
+ 	memset(&priv, 0, sizeof(priv));
+ 
++	if (trusted_cert) {
++		ret = gnutls_pkcs11_obj_init(&priv.obj);
++		if (ret < 0) {
++			gnutls_assert();
++			goto cleanup;
++		}
++		priv.need_import = 1;
++	}
++
+ 	if (url == NULL || url[0] == 0) {
+ 		url = "pkcs11:";
+ 	}
+@@ -4632,8 +4617,18 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
+ 		_gnutls_debug_log("crt_is_known: did not find cert, using issuer DN + serial, using DN only\n");
+ 		/* attempt searching with the subject DN only */
+ 		gnutls_assert();
++		if (priv.obj)
++			gnutls_pkcs11_obj_deinit(priv.obj);
+ 		gnutls_free(priv.serial.data);
+ 		memset(&priv, 0, sizeof(priv));
++		if (trusted_cert) {
++			ret = gnutls_pkcs11_obj_init(&priv.obj);
++			if (ret < 0) {
++				gnutls_assert();
++				goto cleanup;
++			}
++			priv.need_import = 1;
++		}
+ 		priv.crt = cert;
+ 		priv.flags = flags;
+ 
+@@ -4650,9 +4645,26 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
+ 		goto cleanup;
+ 	}
+ 
++	if (trusted_cert) {
++		ret = gnutls_x509_crt_init(trusted_cert);
++		if (ret < 0) {
++			gnutls_assert();
++			ret = 0;
++			goto cleanup;
++		}
++		ret = gnutls_x509_crt_import_pkcs11(*trusted_cert, priv.obj);
++		if (ret < 0) {
++			gnutls_assert();
++			gnutls_x509_crt_deinit(*trusted_cert);
++			ret = 0;
++			goto cleanup;
++		}
++	}
+ 	ret = 1;
+ 
+       cleanup:
++	if (priv.obj)
++		gnutls_pkcs11_obj_deinit(priv.obj);
+ 	if (info)
+ 		p11_kit_uri_free(info);
+ 	gnutls_free(priv.serial.data);
+@@ -4660,6 +4672,36 @@ unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
+ 	return ret;
+ }
+ 
++/**
++ * gnutls_pkcs11_crt_is_known:
++ * @url: A PKCS 11 url identifying a token
++ * @cert: is the certificate to find issuer for
++ * @flags: Use zero or flags from %GNUTLS_PKCS11_OBJ_FLAG.
++ *
++ * This function will check whether the provided certificate is stored
++ * in the specified token. This is useful in combination with 
++ * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED or
++ * %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED,
++ * to check whether a CA is present or a certificate is blacklisted in
++ * a trust PKCS #11 module.
++ *
++ * This function can be used with a @url of "pkcs11:", and in that case all modules
++ * will be searched. To restrict the modules to the marked as trusted in p11-kit
++ * use the %GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE flag.
++ *
++ * Note that the flag %GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED is
++ * specific to p11-kit trust modules.
++ *
++ * Returns: If the certificate exists non-zero is returned, otherwise zero.
++ *
++ * Since: 3.3.0
++ **/
++unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
++				 unsigned int flags)
++{
++	return _gnutls_pkcs11_crt_is_known(url, cert, flags, NULL);
++}
++
+ /**
+  * gnutls_pkcs11_obj_get_flags:
+  * @obj: The pkcs11 object
+diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h
+index 9d88807098..86cce0dee5 100644
+--- a/lib/pkcs11_int.h
++++ b/lib/pkcs11_int.h
+@@ -460,6 +460,11 @@ inline static bool is_pkcs11_url_object(const char *url)
+ 	return 0;
+ }
+ 
++unsigned
++_gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
++			    unsigned int flags,
++			    gnutls_x509_crt_t *trusted_cert);
++
+ #endif				/* ENABLE_PKCS11 */
+ 
+ #endif /* GNUTLS_LIB_PKCS11_INT_H */
+diff --git a/lib/x509/verify.c b/lib/x509/verify.c
+index d202670198..fd7c6a1642 100644
+--- a/lib/x509/verify.c
++++ b/lib/x509/verify.c
+@@ -34,6 +34,7 @@
+ #include <tls-sig.h>
+ #include <str.h>
+ #include <datum.h>
++#include <pkcs11_int.h>
+ #include <x509_int.h>
+ #include <common.h>
+ #include <pk.h>
+@@ -1188,6 +1189,7 @@ _gnutls_pkcs11_verify_crt_status(const char* url,
+ 
+ 	for (; i < clist_size; i++) {
+ 		unsigned vflags;
++		gnutls_x509_crt_t trusted_cert;
+ 
+ 		if (i == 0) /* in the end certificate do full comparison */
+ 			vflags = GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE|
+@@ -1196,9 +1198,10 @@ _gnutls_pkcs11_verify_crt_status(const char* url,
+ 			vflags = GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE|
+ 				GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY|GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED;
+ 
+-		if (gnutls_pkcs11_crt_is_known (url, certificate_list[i], vflags) != 0) {
++		if (_gnutls_pkcs11_crt_is_known (url, certificate_list[i], vflags, &trusted_cert) != 0) {
+ 
+-			status |= check_ca_sanity(certificate_list[i], now, flags);
++			status |= check_ca_sanity(trusted_cert, now, flags);
++			gnutls_x509_crt_deinit(trusted_cert);
+ 
+ 			if (func)
+ 				func(certificate_list[i],
+-- 
+2.26.2
+
+
+From cdf075e7f54cb77f046ef3e7c2147f159941faca Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Sun, 31 May 2020 13:59:53 +0200
+Subject: [PATCH 2/3] x509: trigger fallback verification path when cert is
+ expired
+
+gnutls_x509_trust_list_verify_crt2 use the macro SIGNER_OLD_OR_UNKNOWN
+to trigger the fallback verification path if the signer of the last
+certificate is not in the trust store.  Previously, it doesn't take
+into account of the condition where the certificate is expired.
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+---
+ lib/x509/verify-high.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
+index b1421ef17a..40638ad3aa 100644
+--- a/lib/x509/verify-high.c
++++ b/lib/x509/verify-high.c
+@@ -1192,11 +1192,13 @@ gnutls_x509_trust_list_verify_crt(gnutls_x509_trust_list_t list,
+ 
+ #define LAST_DN cert_list[cert_list_size-1]->raw_dn
+ #define LAST_IDN cert_list[cert_list_size-1]->raw_issuer_dn
+-/* This macro is introduced to detect a verification output
+- * which indicates an unknown signer, or a signer which uses
+- * an insecure algorithm (e.g., sha1), something that indicates
+- * a superseded signer */
+-#define SIGNER_OLD_OR_UNKNOWN(output) ((output & GNUTLS_CERT_SIGNER_NOT_FOUND) || (output & GNUTLS_CERT_INSECURE_ALGORITHM))
++/* This macro is introduced to detect a verification output which
++ * indicates an unknown signer, a signer which uses an insecure
++ * algorithm (e.g., sha1), a signer has expired, or something that
++ * indicates a superseded signer */
++#define SIGNER_OLD_OR_UNKNOWN(output) ((output & GNUTLS_CERT_SIGNER_NOT_FOUND) || \
++				       (output & GNUTLS_CERT_EXPIRED) || \
++				       (output & GNUTLS_CERT_INSECURE_ALGORITHM))
+ #define SIGNER_WAS_KNOWN(output) (!(output & GNUTLS_CERT_SIGNER_NOT_FOUND))
+ 
+ /**
+-- 
+2.26.2
+
+
+From 9067bcbee8ff18badff1e829d22e63590dbd7a5c Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Sun, 31 May 2020 14:28:48 +0200
+Subject: [PATCH 3/3] tests: add test case for certificate chain superseding
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+---
+ tests/test-chains.h | 97 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 97 insertions(+)
+
+diff --git a/tests/test-chains.h b/tests/test-chains.h
+index dd19e6a815..9b06b85f5f 100644
+--- a/tests/test-chains.h
++++ b/tests/test-chains.h
+@@ -4010,6 +4010,102 @@ static const char *ed448[] = {
+ 	NULL
+ };
+ 
++/* This contains an expired intermediate CA, which should be superseded. */
++static const char *superseding[] = {
++	"-----BEGIN CERTIFICATE-----"
++	"MIIDrzCCAmegAwIBAgIUcozIBhMJvM/rd1PVI7LOq7Kscs8wDQYJKoZIhvcNAQEL"
++	"BQAwJjEkMCIGA1UEAxMbR251VExTIHRlc3QgaW50ZXJtZWRpYXRlIENBMCAXDTIw"
++	"MDUzMTEyMTczN1oYDzk5OTkxMjMxMjM1OTU5WjA3MRgwFgYDVQQDEw90ZXN0Lmdu"
++	"dXRscy5vcmcxGzAZBgNVBAoTEkdudVRMUyB0ZXN0IHNlcnZlcjCCASAwCwYJKoZI"
++	"hvcNAQEKA4IBDwAwggEKAoIBAQCd2PBnWn+b0FsIMbG+f/K+og2iK/BoLCsJD3j9"
++	"yRNSHD6wTifYwNTbe1LF/8BzxcwVRCD0zpbpFQawbjxbmBSzrXqQlUFFG11DvNBa"
++	"w58rgHGo3TYCrtFIBfLbziyB1w/vWeX0xHvv8MMJ1iRSdY+7Y36a2cV+s85PdO4B"
++	"TpZlLfy8LPP6p6+dgVoC+9tTu2H1wARYOVog+jt9A3Hx0L1xxVWTedFoiK2sVouz"
++	"fLRjfp5cOwuRHSD2qbpGOAeNVVaOE88Bv3pIGPguMw0qAdEDo20hRYH23LIyvBwB"
++	"oCnyFNnAViMtLa2QlXSliV9a9BKOXYjWzAeso2SF4pdHcvd5AgMBAAGjgZMwgZAw"
++	"DAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg90ZXN0LmdudXRscy5vcmcwEwYDVR0l"
++	"BAwwCgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAweAADAdBgNVHQ4EFgQUan6mlccq"
++	"Uy1Z64wvRv3xxg4h2ykwHwYDVR0jBBgwFoAUSCM0UwqJMThKWurKttKm3s4dKxgw"
++	"DQYJKoZIhvcNAQELBQADggExAKAOMyMLpk0u2UTwwFWtr1hfx7evo2J7dgco410I"
++	"DN/QWoe2Xlcxcp1h5R9rX1I3KU2WGFtdXqiMsllCLnrDEKZmlks0uz76bCpKmM99"
++	"/1MDlY7mGCr/2PPx53USK5J5JTiqgp6r7qAcDAnpYvrPH45kk7iqwh02DhAxRnGR"
++	"CW7KWK8h7uu0Az9iBT2YfV372g4fRDK3fqYzJofQwbhSiUuJ7wyZCRhGOoxMMmDb"
++	"KBbc1wAYXW+tlv2cSbfzRvSxMR+CzkyH2tGDxeN//aZUfGmQ8IzWUQ7UtK5z+Q0E"
++	"fL6fZtm2SdGabGpV1UYoGpwOtOngK+m0i9SqrMD7g5+SMhc1VuvVuTtxjr5Cha8l"
++	"X0HEZtxgFrkdfMD4yLAqiguaCBngtbRmELF5VpebmJbiLVU="
++	"-----END CERTIFICATE-----",
++	"-----BEGIN CERTIFICATE-----"
++	"MIIDkTCCAkmgAwIBAgIUY9cJ4NLNFEaojJHdP1I4Q7OHNJwwDQYJKoZIhvcNAQEL"
++	"BQAwGTEXMBUGA1UEAxMOR251VExTIHRlc3QgQ0EwHhcNMTgxMjMxMjMwMDAwWhcN"
++	"MjAwNTMwMjIwMDAwWjAmMSQwIgYDVQQDExtHbnVUTFMgdGVzdCBpbnRlcm1lZGlh"
++	"dGUgQ0EwggFSMA0GCSqGSIb3DQEBAQUAA4IBPwAwggE6AoIBMQC0ayeYJa/B/x7K"
++	"sH702LztQ4ZnVF3atB7CkF+DPAIR/BNyhbKIpGVBC3ZfI76Kn/55S3M7LsdLPL8W"
++	"yZdVNRfzoXJLMMLgJ5QS81YA5s6CSxFdpB6b+vq5GypNGLW6peYMx6iooW2qiITc"
++	"lg6ybBw1qufHlD351cfCog1Ls2569whfxQnNFZMa95jfKkxmiSTtH9AWY4FlpVg7"
++	"oc0lYpuZgVQIFxjsfC8IojsoVzKdF0cKhvtisUGZ5vveqOogfvMb7rrqmiFkKZLy"
++	"rXPlGQWdN1PiEZ8YXyK64osNAIyeL6eHPUC+SqKlkggMLmHAWHyameHWrIM5Jc8+"
++	"G+3ro22dy8U43sHHbps0FL4wPoKQHrlKmnbk7zMMRqIxcvbDYQv4qmeJ9KXldjeh"
++	"KZ+Aeap1AgMBAAGjZDBiMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0PAQH/BAUDAwcE"
++	"ADAdBgNVHQ4EFgQUSCM0UwqJMThKWurKttKm3s4dKxgwHwYDVR0jBBgwFoAUHncj"
++	"bWcxH5EHm5Yv7PzIRv6M4QMwDQYJKoZIhvcNAQELBQADggExAHP1UAQ/nvuQtRZF"
++	"Q4b96yxVwCjMjn7knLyLNtyYGE3466xvE/ofvx5lgaR06ez/G17XP+Ok5SLJNUVc"
++	"mplTERCv5CgnX7R5VdGJkkD1repaYxaTtwyJz0AfYEMRUj3jfaeLaiUKJvEW5RRs"
++	"I3solY18sy/m/xGrH2X0GTNfKM9BURENABsppt07jxH719nF9m9SynV/Z2hE5hlv"
++	"5e5vyPt4wyRPIJLUI3TKAlvb1s40zz3ua7ZTgQL/cOxfY4f9pRKW9CMB3uF69OP9"
++	"COAxrmHVZsImmDZ6qO1qQrbY1KN/cX5kG4pKg7Ium723aOlwcWzEDXKumD960fN1"
++	"5g+HrjNs6kW+r9Q5QS8qV5s8maZNcxTrMvQ1fF2AKBNI3Z3U7vmtrSeqxIXp3rGH"
++	"iJwOKIk="
++	"-----END CERTIFICATE-----",
++	NULL
++};
++
++static const char *superseding_ca[] = {
++	"-----BEGIN CERTIFICATE-----"
++	"MIIDkzCCAkugAwIBAgIUIs7jB4Q4sFcdCmzWVHbJLESC3T4wDQYJKoZIhvcNAQEL"
++	"BQAwGTEXMBUGA1UEAxMOR251VExTIHRlc3QgQ0EwIBcNMjAwNTMxMTIxMzEwWhgP"
++	"OTk5OTEyMzEyMzU5NTlaMCYxJDAiBgNVBAMTG0dudVRMUyB0ZXN0IGludGVybWVk"
++	"aWF0ZSBDQTCCAVIwDQYJKoZIhvcNAQEBBQADggE/ADCCAToCggExALRrJ5glr8H/"
++	"HsqwfvTYvO1DhmdUXdq0HsKQX4M8AhH8E3KFsoikZUELdl8jvoqf/nlLczsux0s8"
++	"vxbJl1U1F/OhckswwuAnlBLzVgDmzoJLEV2kHpv6+rkbKk0Ytbql5gzHqKihbaqI"
++	"hNyWDrJsHDWq58eUPfnVx8KiDUuzbnr3CF/FCc0Vkxr3mN8qTGaJJO0f0BZjgWWl"
++	"WDuhzSVim5mBVAgXGOx8LwiiOyhXMp0XRwqG+2KxQZnm+96o6iB+8xvuuuqaIWQp"
++	"kvKtc+UZBZ03U+IRnxhfIrriiw0AjJ4vp4c9QL5KoqWSCAwuYcBYfJqZ4dasgzkl"
++	"zz4b7eujbZ3LxTjewcdumzQUvjA+gpAeuUqaduTvMwxGojFy9sNhC/iqZ4n0peV2"
++	"N6Epn4B5qnUCAwEAAaNkMGIwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMD"
++	"BwQAMB0GA1UdDgQWBBRIIzRTCokxOEpa6sq20qbezh0rGDAfBgNVHSMEGDAWgBQe"
++	"dyNtZzEfkQebli/s/MhG/ozhAzANBgkqhkiG9w0BAQsFAAOCATEAcF9R9VGQxTwW"
++	"aOjeIeQ9ZJxybaj0BaXC8xR4b9uZloS9d/RBFTjgRbQ82yqaj7f80mgUtabKRfTA"
++	"ltV2MgTbJdOjwGzEDtKGhClBbovnEGrYTbPBT9rgfYPt0q7SMBr6AzGAPt+ltwI7"
++	"9yntV81qvTxvW5MEEo0j2MuA3NT3oqe+w1rUKNQCWhnN2TUhJGkTlaaMozcgNFaE"
++	"Dplop4dtvCGtupxOjC3Nf6FWq1k7iZQxX70AFBYVMpuF7qGh6qDp+T1hmTCSVzxP"
++	"SfDQIBjhKgy4clhkuR5SRxhN74RX+/5eiQyVLxzr+eIhqzJhPqUCmVnCLcqYdNRi"
++	"hpHic4uJm0wGOKYTI7EG8rb4ZP4Jz6k4iN9CnL/+kiiW5otSl3YyCAuao5VKdDq9"
++	"izchzb9eow=="
++	"-----END CERTIFICATE-----",
++	"-----BEGIN CERTIFICATE-----"
++	"MIIDZTCCAh2gAwIBAgIULcrECQOBgPaePBfBHXcyZiU0IiYwDQYJKoZIhvcNAQEL"
++	"BQAwGTEXMBUGA1UEAxMOR251VExTIHRlc3QgQ0EwIBcNMjAwNTMxMTIxMTQzWhgP"
++	"OTk5OTEyMzEyMzU5NTlaMBkxFzAVBgNVBAMTDkdudVRMUyB0ZXN0IENBMIIBUjAN"
++	"BgkqhkiG9w0BAQEFAAOCAT8AMIIBOgKCATEAnORCsX1unl//fy2d1054XduIg/3C"
++	"qVBaT3Hca65SEoDwh0KiPtQoOgZLdKY2cobGs/ojYtOjcs0KnlPYdmtjEh6WEhuJ"
++	"U95v4TQdC4OLMiE56eIGq252hZAbHoTL84Q14DxQWGuzQK830iml7fbw2WcIcRQ8"
++	"vFGs8SzfXw63+MI6Fq6iMAQIqP08WzGmRRzL5wvCiPhCVkrPmwbXoABub6AAsYwW"
++	"PJB91M9/lx5gFH5k9/iPfi3s2Kg3F8MOcppqFYjxDSnsfiz6eMh1+bYVIAo367vG"
++	"VYHigXMEZC2FezlwIHaZzpEoFlY3a7LFJ00yrjQ910r8UE+CEMTYzE40D0olCMo7"
++	"FA9RCjeO3bUIoYaIdVTUGWEGHWSeoxGei9Gkm6u+ASj8f+i0jxdD2qXsewIDAQAB"
++	"o0MwQTAPBgNVHRMBAf8EBTADAQH/MA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYE"
++	"FB53I21nMR+RB5uWL+z8yEb+jOEDMA0GCSqGSIb3DQEBCwUAA4IBMQAeMSzMyuTy"
++	"FjXTjxAUv010bsr6e6fI9txq/S1tXmWWJV/8aeARthuOFZO5Jjy3C5aMbac2HDV4"
++	"Otu0+JLaoEMSXvorAhValVuq06i5cmaPzvJBcxMWzlEAXfavSwHv5Q+kqNU3z81S"
++	"WnjEpMHcl9OyER7o9IhF55Xom2BXY5XL83QOzQ4C3bpKrNevZC7i7zS8NoYRGP+8"
++	"w21JseXkWQW4o2hkFqbCcRE1dlMW02iJE28RZ5aBFDIm2Y6zuLaXZIkaO7E41CAw"
++	"IUyhowm/S1HcmQnhruAGKJvQtB6jvnhZb7pgnuSkhIvAQgw93CLE985KEua1ifY2"
++	"p1d/6ho2TWotHHqDnDkB8pC0Wzai8R+63z18Kt0gROX2QItCyFksjNJqYPbgwZgt"
++	"eh1COrLsOJo+"
++	"-----END CERTIFICATE-----",
++	NULL
++};
++
+ #if defined __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+ #  pragma GCC diagnostic push
+ #  pragma GCC diagnostic ignored "-Wunused-variable"
+@@ -4178,6 +4274,7 @@ static struct
+     GNUTLS_CERT_INSECURE_ALGORITHM | GNUTLS_CERT_INVALID, NULL, 1576759855, 1},
+   { "ed448 - ok", ed448, &ed448[0], GNUTLS_PROFILE_TO_VFLAGS(GNUTLS_PROFILE_ULTRA),
+     0, NULL, 1584352960, 1},
++  { "superseding - ok", superseding, superseding_ca, 0, 0, 0, 1590928011 },
+   { NULL, NULL, NULL, 0, 0}
+ };
+ 
+-- 
+2.26.2
+
diff --git a/net-libs/gnutls/gnutls-3.6.13.ebuild b/net-libs/gnutls/gnutls-3.6.13-r1.ebuild
similarity index 98%
rename from net-libs/gnutls/gnutls-3.6.13.ebuild
rename to net-libs/gnutls/gnutls-3.6.13-r1.ebuild
index 1969a8391568..0f8de4605ebc 100644
--- a/net-libs/gnutls/gnutls-3.6.13.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.13-r1.ebuild
@@ -54,6 +54,8 @@ DOCS=(
 
 HTML_DOCS=()
 
+PATCHES=( "${FILESDIR}"/${P}-handle-expired-root-certificates.patch )
+
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC
diff --git a/net-libs/libcork/Manifest b/net-libs/libcork/Manifest
index 8de15cc1b466..618c13ac093b 100644
--- a/net-libs/libcork/Manifest
+++ b/net-libs/libcork/Manifest
@@ -1,5 +1,5 @@
 AUX libcork-0.15.0-git.patch 539 BLAKE2B c3b50675afd74b3bd5c5049bf311ccf33dd4fc257bb4b9ccfb50007bff022ec9c260de0b507dfcf2ecd3ce3036e00fa1ef52f0d437003e6c2e5c52a8de3daab5 SHA512 2e32bd6c53c9fc3f7c27344a724138e5f3073a8d6f5b63a30cd86b48bf430a63b70cc0a2fdb93000f944cbc12655d12926c01ba374ec52e12cc126712fc41442
 AUX libcork-0.15.0-version.patch 498 BLAKE2B 15fbafc607e6a3dab0376ade883db9a783b1490b7a9063f1d3d815149198caf962e9375ed752fc077a5bf9a5cb767499071cf2aab8bf29a912024bac6eaa33da SHA512 1a0a0cf02bf51423760626a3e886c36b3e58f02cc09a5898313c185c339f08194b4bc9e118d8546aa8529d2a3047faecf85dbcf7a9097d0422b416306db05222
 DIST libcork-0.15.0.tar.gz 182736 BLAKE2B cfabcf4b040d3d2796511b5d7dce005fcff9bc6704dfaf89ea9eac36617b0c544e932ab3e12c0b06e4e3e916c50da10ba26401527a8e83bde523b91b911fd6da SHA512 8f41cce2101b96707068a21e5bd0a43c23f996c3620e7dd36621ed4bdd3f92851a92ea56ed92db40d7d8fe55ddfbdfcdaac4d2c8b2fc6cb3b1abe3b0e74c6a75
-EBUILD libcork-0.15.0.ebuild 719 BLAKE2B 978d3df2aa767ab574ce54efdf08801a0779eee4f8ddc9521b734de8bbe41d844481308fb3bcf08a2afbc53e246341888bc417e0427ce47c50f42517148e006f SHA512 7198a9ba11c06c326321e59467ef51e8512944e3e352f7cc94ad272ce4d7039ae22891e97c482c6f7e126cb3f47ad07b1931c9723e3a6b7aafb787d685a2c05a
+EBUILD libcork-0.15.0-r1.ebuild 945 BLAKE2B 79459e83a2faf85f8a6193ded118d3ed21fb14ab822180c8c0e7cd534ba7b0f42c7f070db59fe1ae0f50094f977ac8f42574a931ce4e2116032b0915d69ba7fd SHA512 748e0a47a597114f0eccafbe8b671efb2b196f8a36ddc6234fdfaf9fa137b4232c84afb97a217d2eaab250717db838743870270d67c888794650ee373c6e2fbc
 MISC metadata.xml 321 BLAKE2B 413fda934011eb441b90050b4b07cb32143b70be324588f93a2d34076f67e65dac26bbfac264155c62d03a8feccfa42e14e33f80dcbc3c92d9ca8606a57ee108 SHA512 b51116388b073e857b090b791063df90c082fb7268ae80b594362e84999e4f22de11636dbb8abc9d214f651799cf1385905706de5b875c9fefdcc3c9cbc09594
diff --git a/net-libs/libcork/libcork-0.15.0.ebuild b/net-libs/libcork/libcork-0.15.0-r1.ebuild
similarity index 62%
rename from net-libs/libcork/libcork-0.15.0.ebuild
rename to net-libs/libcork/libcork-0.15.0-r1.ebuild
index 0db7956e7c1a..24782aabf811 100644
--- a/net-libs/libcork/libcork-0.15.0.ebuild
+++ b/net-libs/libcork/libcork-0.15.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -12,22 +12,34 @@ SRC_URI="https://github.com/dcreager/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="dev-libs/check"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-git.patch"
+	"${FILESDIR}/${P}-version.patch"
+)
+
 src_prepare() {
 	if ! [ -e "${S}"/RELEASE-VERSION ] ; then
 		echo ${PV} > "${S}"/RELEASE-VERSION || die
 	fi
-	eapply "${FILESDIR}"/${P}-git.patch
-	eapply "${FILESDIR}"/${P}-version.patch
+	sed -i -e "/DESTINATION/s/\${PROJECT_NAME}/\${PROJECT_NAME}-${PVR}/g" \
+		docs/old/CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
+
 src_install() {
 	cmake-utils_src_install
 }
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index ae128f1c507d..8c6c2d23509a 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2.ebuild 978 BLAKE2B 0556b62d1b1e86104b3181fc5b92d72ba9d3e60e1010e2cc654eb5e97475d8f72170578dff6c0030c68ed746ff92ee190d4738d416f57ea065e9a51138c733da SHA512 0fa630105a7f356ffb490147d6415a641f3df9416fd9dce29d483ed0586254341f7c38d06adee1a27a4871d93ce63561c20ce8e190a740011ff0701578ba29d9
+EBUILD libmrss-0.19.2.ebuild 980 BLAKE2B 973b0eed41f64477fb7d00a55a0ef32dfe7d6e2f252dbad8a7c25453fdac8b7161aac4422348105a3d52dd4c1d258c0f22b6d45d0acca0f38fcd6829713ba7ab SHA512 f3fc8203513bddd479e496329cbc524670c2a0a81fa79e6b88758b69a1b5e0b746b14906d9b5f3dfce4d8041f992885f1805f204ac4d740aee07db967c1976c0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
index f4ce0a9497b3..4676489f4776 100644
--- a/net-libs/libmrss/libmrss-0.19.2.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
-HOMEPAGE="http://www.autistici.org/bakunin/libmrss/doc/"
-SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.autistici.org/bakunin/libmrss/doc/"
+SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 799d27555817..8cdee3229ceb 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -1,5 +1,5 @@
 DIST libnetfilter_queue-1.0.2.tar.bz2 354201 BLAKE2B 5df5a94ca07a6fb919d8a153143a0e340c323bac6491c3d03f9d871eb3c31e85ab0290cc6f67f678038605e829af0dfbfbb966b1a6b9bb76ea7acc4275a7d3a4 SHA512 89fec4d943b85f35e7cef3b1b9071b1280c6e1b282b7e5cb97eb17d05b9ddd175194639ead986767d27152540fe8e167383a1f7bbfe3cdf874a5a42a2c096f11
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
 EBUILD libnetfilter_queue-1.0.2.ebuild 732 BLAKE2B c8ff9d89e95321aafb844c352c029ec532d757f605d48f57b8238940e05d7cf36f1c5b93e0efdbfe5fbea713d8e2babfd474b4b53861929693d4ac66d0f2523b SHA512 baddfdc66514d1a924a4e77d812bd6095b87d75e81109ab0b68b4db52a9c382efa39bc7d13020bea2df9b0ffca43282dab00004481d87f20c0257e756fe86371
-EBUILD libnetfilter_queue-1.0.3.ebuild 727 BLAKE2B 81270834c7093a892287a5dcdc492c580cf93a0e35618487fe160dcbfa03f2ba24c6b6ee5322a2ee547acc2264c632da04cb02ebd2ecef8856093a2742702e89 SHA512 7e1647b8a312388731e796d928549b18ba9fd25adc20d520145b1674e27a6e943d14cbeb0b590c1a44b5526cc444ea0f838bb5decb5d0ff857a0d1a713f518fc
+EBUILD libnetfilter_queue-1.0.3.ebuild 725 BLAKE2B de050e5d54770f6a8a8d3139895b8bbcfd347ab8779a21aa89b255a3a4fb873fc70a684fa06515f74aac584c72ac4bda00770b86639060913414036c7b2c60e9 SHA512 150d4a29d25e3f893fbb42a578fb27e58680ae4c0caee6801eca0e6e2ca130682d12138bc0f04b962b420b3574bfebfd69d688f43fc9638dc2a62c5641fccf3b
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
index 203b98ae3892..a6095066f37f 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index da55bd199f9b..75d3a6c2d292 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3.ebuild 912 BLAKE2B 4d3729f8b862c08a2d6d06ed672379e0a30296548e881432fd536505f73040474faa5381fa7c6e9bf0fda6f25c9a0ebedb97335c7b684631694b3a8ddf7b3098 SHA512 934c9f1d41f0e1215b9f55a4953972234821c639e6ac3a09dfa2b2614153d5bdbf3d1f542e5ea6bf321812eed1045bc9a3d0d0f8bd5037171c7720b985ae05b8
+EBUILD libnxml-0.18.3.ebuild 914 BLAKE2B 38f973759899df9afe7145d82b18f4a3f7eb7a2235ffe96b347cea12a7e83670904c4a2e23a0c4e4b5ec4190d9f5c4500865961fe773a95d1f94647d7340d03f SHA512 cc55562815a60568fd34427304273830bf9a3d4eb85a8f4dd7db433dc6748aedabef84d5e2d40f3810b011f7bf502f5bd8b37ef80f0d5279f4dda0b14d04268f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
index 8d4062c2bd02..c153deafa5a7 100644
--- a/net-libs/libnxml/libnxml-0.18.3.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
-HOMEPAGE="http://www.autistici.org/bakunin/libnxml/doc/"
-SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.autistici.org/bakunin/libnxml/doc/"
+SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 876620d06245..6a77e8b873ac 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -6,5 +6,5 @@ DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 EBUILD libsoup-2.62.3.ebuild 2917 BLAKE2B 3565f682f83a4a9658c232ff6949fa630c6415bbeb998f2cdee9c8b303b31f8f1cebd48f07860f54cbb8100c724b8c9e4a8d92cd71ecb60811868de14035069c SHA512 183d28406eabef85b826b64d385cd39c8a64c0175f0c0c9a2bad5d40d7d450ec2e353dff827c7819ef1c506348c96b5ccd86186240850366e2e9492be683809f
 EBUILD libsoup-2.66.4.ebuild 2776 BLAKE2B 259436379c1e6248f94c8fd2f2598b5be157efdc6faa4aad1a58b3abec05c147644633d338fd4cd6d99dc2f2ed917b043ef5badc5eaedd6aa6488c79b7ea2451 SHA512 ff6af7154565c638f0236c918e5e448026bf7966d72d138f5b9a319af5e81cb0b32e2de3b1c157cfa2d1acdc0777166176ef40d13f0aeeafdac4b0677a019ef5
-EBUILD libsoup-2.70.0.ebuild 3030 BLAKE2B 414552c85bd72c8a65cd165a6a0b6d4dd1680da27a4e57773d9dd4560a21cbdc880070b335a4689aa82e737b38c3160997c9c01b2d95b1077c09fdfe21fa5db0 SHA512 81c8f85c6ceca2300ed702bf6dc456ccc431356e02619d3a2151dda400928a4a8b864831deebc739bd58432cb51f714b65536f87e90ee7d9ea4633145b5be13e
+EBUILD libsoup-2.70.0.ebuild 3029 BLAKE2B f3e4e9ca3970aef136634fc0a6510a3c9061bc3579ae3f54ea3cfb2b65462f8bc351d481bb4a0a98c82968c0b834186593ffedf76ce1f5a48c50d0131a82514b SHA512 52c822da448ca8fcb1ad4d1db806d0d811c510d7901b44339ac0e4e595cc293223acd9e4c2f82830d40d8d54e552802d9380677b5b7a804982511278d74511c7
 MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 23a4e7177708..3437f138feed 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 4f1cf1d7010f..f2b03f0c767d 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,4 +1,6 @@
 DIST nghttp2-1.40.0.tar.xz 1637004 BLAKE2B 7735ba06cd0655450a6379ea33cc79e557f73b5b4b2ba746564a53e6c305aa656b62da7c3b00dbb70472dffc471271f73af0bcbfadab99406d217d1989ad052a SHA512 3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce
+DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 EBUILD nghttp2-1.40.0.ebuild 1969 BLAKE2B 559beb9693a6fb4df96d19a57fae0884776a53673c8721b8502a72f0854133167ce42f136fdf3ad0a6366f3996f17b8b168d9f44f43d4584f6400a4c9d975e27 SHA512 6caec7f67d01715604b67a1ca1bf668490ae28e0c4b8d5d8a4606e8a92b212288e63279b04ee7fe49e44752e63a8f2965a62319f4511df505c9804b0595b501f
+EBUILD nghttp2-1.41.0.ebuild 1970 BLAKE2B 4f4dfeec5484b29a849cfe0dbf411e702ca13b057fa39633368870701e7bb525b13bd3899d14e3f511dab325acd3b6fc608a3ba54afd3a82922fd2b332f5dada SHA512 892893c81a687c45cdbaaed627de43f62e7b02be7665184906de09ab01d653c537fb54238fdba0f0a6727bd7dba29695bceea78c58fbeb25f5cb3966e7bb94cb
 EBUILD nghttp2-9999.ebuild 1978 BLAKE2B 3681270a1343a533630adecc2b1edb7b32cef71368da48df558e5587d3ac85364a5e556409a920b9a0c695667b0e3bac9da1410ad1319e69d832d8a21a3fd13c SHA512 99ca054a9bf82567ce3620831b7eb42e6283545c62f8c333a5c876962fbf6f1a5b7b4acc1d9decf9307d2a6bcc25ddaaeee83b5c3f25e51a256ee3a4a2df3eed
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
new file mode 100644
index 000000000000..61445988d2d6
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 4037a5872056..7f2aae705303 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -10,6 +10,7 @@ DIST node-v12.16.3.tar.xz 23682432 BLAKE2B 91b97c0de9c76f33d080f3f12a42a15140be6
 DIST node-v12.17.0.tar.xz 23702040 BLAKE2B 4b35c6f7a3c16a7b737bc5b71f075fe6c66c9c4a5cd3ee240a0c1af9cfd4e10c61520d0489169a74354734083b7f7c68b97eefaa6f40e3320ec5b0126d36169f SHA512 0fc8483c6ae8994ff4f4b2465f1b8b1d3c620c90222fb270fe3d317d967294cc9e6bdcc50277fbe0ab28cb3ce9e73ec122c19adf8a686ecc95de3268b82ca4f7
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
 DIST node-v14.3.0.tar.xz 32985344 BLAKE2B 32ee357e109484422c3b22423ab9a593cd5d4611073c820f90c196dae4df2860573cdd06170879f675b738b01885eb2fe0f25c2328841838bf9367324cc981a7 SHA512 3afcc430bad57150baa8d1c0e5ef0f64691ef6549a052be654a86313fe28f31e7fdfeea4d2b3993798a7141bc6d7b1642747d1bc2636139e2f2fd79441580148
+DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
 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
@@ -19,6 +20,7 @@ EBUILD nodejs-12.16.3.ebuild 6203 BLAKE2B 244b4c61b0f6272b26e5664ddfbd67eb6bb863
 EBUILD nodejs-12.17.0.ebuild 6203 BLAKE2B 79828e49fec7611daefdaf87a5153b97feb88495fdbf666c4c7dd61abc6189d98dd978bdc19f1bfb4049fbb6a4dcea29d4ced7feda206a5f2b58c2b3e568c469 SHA512 3f73c09dc1e215985423e217276478b7ac160d85e2aea53feee017fb03a81358382725972e4c039887c50674521f2c37927ceca3c23412bdc415ebd7c4e25cc0
 EBUILD nodejs-14.2.0.ebuild 5855 BLAKE2B d1deb6d6135ef8e9742fe1c2515fd7330b4e20a5bb5b40d26db3d439b20aa028890e9b65f84746b18058ca9372eda48b086792b0dbbe3139214e2239e502ac88 SHA512 4b34a12de3fdf86e6ef92a7dd08a9ced85566ea28ff8c02dee15c76b381e0b93f612a0d5e80fc91f9ce0a0b33328df28c9d2117bdb0ab7bc01fd723ea55e33ce
 EBUILD nodejs-14.3.0.ebuild 5860 BLAKE2B f06c5967350ba2a80010fd7fbdde840cd1357e3c0144bc56120dc8a97db85950d27b1739e13da8cf9352d425a69bf5a583897e777f3506b324248882a0636106 SHA512 f62d937f362a16c3025ccc81c95e1f85d1a85bda1df86b1778faa1bc8da85f69f02f6cd80acd92bd670781690f66ae43c00bfa21f04dd74c3b161839ae367134
+EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 427dff8477ce607ed6e0598074996f9c7798c3ded010b4a3d41bd930ad8a8a9e7529f2be92ccfe0b56f7e38684acf3c19b1c5157ddde56a85dc9c5ee6541a7a7 SHA512 29c9863e61446316ac30af6e5b584a9de0229ae515d834b09d04ed48a8d1fc5119de1c57bbeaecff29e0c7bec0defaa878c80ccf4a28d61c43d9f15a395cc643
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
 EBUILD nodejs-99999999.ebuild 5778 BLAKE2B 9b07315384b4d725acb2839907378a4354bce227f3f920147b295f0d49541da3bb92dc20a2d179d97c9f14e7217db1ee16005af17de09cb31a2744b278cc0cb3 SHA512 5d576f85135cf1ec0ca2c4f7723e9e0d349f5df8ae69b4dbb4183924ee6987c9da91764716e7ed287aa9d73e7d41fb0ce4ddd2e03fb6276c6628e50ec443afd3
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-14.4.0.ebuild b/net-libs/nodejs/nodejs-14.4.0.ebuild
new file mode 100644
index 000000000000..1d198e35d083
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.4.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.37.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-65:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	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" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/onion/Manifest b/net-libs/onion/Manifest
index 26178f14202d..1e1fa62a0f1d 100644
--- a/net-libs/onion/Manifest
+++ b/net-libs/onion/Manifest
@@ -1,5 +1,5 @@
 AUX protos.patch 1239 BLAKE2B e20e0efee1cbbb04caee2d1754164e54545d17ff79a36100b5abc5de2f6174dc49daf776fff137dadb9a298977083a2dccb09286c7f1acaf5c8e8a784fba8712 SHA512 0dd7f95dab267b1df6279fc60869696d506b62756a863c86ade9725dc17e48bc4b71b984d53bce94e88448ab295673fbe27e7687e2807d32841d0ad5ddf6b018
 DIST onion-0.8.tar.gz 344347 BLAKE2B c43bbbf31d29ccc99d2969c7c8dc9aec8d5e514cc785091e3e0e6d1fc1d5db5f8561d5c2c745b4150a493b607c6c271d669e7ca541f72bf4d8872beeba00b220 SHA512 c40a36346de7dee6e98d0b5c38b5e133606046e29bacb06a0055a361013077ec0f6adb04dfcbf2f4ce0b72317c9ed918573299aed8760f069dcfd7c211a302d7
-EBUILD onion-0.8.ebuild 1910 BLAKE2B 2d289f327f7de8b66f384c36822525e1116b5476dd6ac1aeff41b68346a387db0b6257faf7ef46cfae3b8e2d232cf5ac1c7cc99a7e357f2b524c1294e7f11bf2 SHA512 79a92b12bea34fde6df357374e136da2fa42ac51ed0a5167aeba6cfea756b75ac71955422352ed7075968c8786f6153ef09234dbc13dfed818555c3557e1e08f
-EBUILD onion-9999.ebuild 1870 BLAKE2B eb59107fb8dc80f1b93438768586b2722549b5d9111354838e2c22c2222e433bb04a949604c85f6351d5048dc878114d23cf09176d593a9ad0e5db40b9c781fb SHA512 6695440cf94a0a7a803fef66a2dac4546451f3ab3cda9d9372a6096a4b1101631d8abd888935a2f033812d7360d9aa6f831d619ba353789a0fe2327b16b60863
+EBUILD onion-0.8.ebuild 1911 BLAKE2B 062feda3a8e7a1e5321fc3efbaa3aa430b9d1f68db13fd0c0fb446aa697bc5a962cf5a9f7c76c77b35130960f2e78573e826180c9c4ce83b9c35f6525e2a4499 SHA512 9dc32cc05e6d2d198a5b7e87bdf3ff112a6c37e8210ae82f28624ad61de12cdce1e35e1d7f137c796062a15cdd4ba52f6d1bb154aec9af60a940e20c1ba8f7f9
+EBUILD onion-9999.ebuild 1871 BLAKE2B 3569e4734d436378ca13313ac64aaa01a724d9a29e0554e2ab23793ca1988ac3fe91c24d4ede9c14656bf02d09f10cb651b6f556d172b9d09a3870f0f6ba1d6a SHA512 60088584125cb5184500f4621f42891ba48c0a4e0b423dcf8379fc7a5034332c5ef4b5e9edf372caa048573d21301dd050b29ff2df9607e20b5ac6311330f2b3
 MISC metadata.xml 719 BLAKE2B 91253f71648b48cd344267e189fed4f77c1fbe2e8f218ea7751502ed419f1ee7d97fd881234a99368aaf888b6b550325c054f5d65e9cb007735e25ffebb24366 SHA512 1afb4311878a3eef4d13d7fa6c670f2b1b23e0e89d9c50694668cb36c0d05f529da37af25469b3e4ffc34d25780be7f710e82e87c1962056aef9e4e924d1e868
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
index cf77737da1a3..5c53165dda44 100644
--- a/net-libs/onion/onion-0.8.ebuild
+++ b/net-libs/onion/onion-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ fi
 inherit ${SCM} cmake-utils
 
 DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
+HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
index 88e7246cecfe..b1275f87292e 100644
--- a/net-libs/onion/onion-9999.ebuild
+++ b/net-libs/onion/onion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ fi
 inherit ${SCM} cmake-utils
 
 DESCRIPTION="C library to create simple HTTP servers and Web Applications"
-HOMEPAGE="http://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
+HOMEPAGE="https://www.coralbits.com/libonion/ https://github.com/davidmoreno/onion"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 1be5dbbe503f..4e50439c6267 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,4 @@
-DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371
-EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede
-EBUILD qxmpp-1.2.0.ebuild 1305 BLAKE2B 46506d14b2e5a1f1fd297272fd56163f70e5a2fe3bb8e637a82dda32247ca5aa0157c40ac95a5ee8dbb5c90510b7a8f0e2c9127a4a8c0ecb498994ed09a20e14 SHA512 bf3df082bfbfb9add07cbc8e6e7e53cea9f66e5f57cf8b21e8bc7327477a8162421f09e3eedc0277a38e4472662d497ad9076f8dcd4153c76a2b00f2a7fe776b
+EBUILD qxmpp-1.2.0.ebuild 1304 BLAKE2B b09eb5906fd02de48d40125dd6dfd33f4b7ca2f3b8e08fa9f9612051bc56e779a226a2b2b61dba3199a719cc81397886891c8df0fa6c77fc5c3c8396b8795d70 SHA512 ffe1fd8357e4fade7a76fda1131db43cc86a43c51378c9dd82b56906bed9e3dd3444d8458efea489efb373fe2d54a584a247983b0753d0ae7c7fba9145e53ac4
 EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
deleted file mode 100644
index 9a67cc314b2c..000000000000
--- a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
-HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="debug doc opus +speex test theora vpx"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtxml:5
-	opus? ( media-libs/opus )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	vpx? ( media-libs/libvpx:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-src_prepare() {
-	default
-
-	if ! use doc; then
-		sed -e '/SUBDIRS/s/doc//' \
-			-e '/INSTALLS/d' \
-			-i qxmpp.pro || die "failed to remove docs"
-	fi
-	if ! use test; then
-		sed -e '/SUBDIRS/s/tests//' \
-			-i qxmpp.pro || die "failed to remove tests"
-	else
-		# requires network connection, bug #623708
-		sed -e "/qxmppiceconnection/d" \
-			-i tests/tests.pro || die "failed to drop single test"
-	fi
-	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -e '/SUBDIRS/s/examples//' \
-		-i qxmpp.pro || die "sed for removing examples failed"
-}
-
-src_configure() {
-	eqmake5 "${S}"/qxmpp.pro \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="$(get_libdir)" \
-		QXMPP_USE_OPUS=$(usex opus 1 '') \
-		QXMPP_USE_SPEEX=$(usex speex 1 '') \
-		QXMPP_USE_THEORA=$(usex theora 1 '') \
-		QXMPP_USE_VPX=$(usex vpx 1 '')
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	if use doc; then
-		# Use proper path for documentation
-		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
-	fi
-}
-
-src_test() {
-	MAKEOPTS="-j1" # random tests fail otherwise
-	default_src_test
-}
diff --git a/net-libs/qxmpp/qxmpp-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
index 05ba6ca7a0b0..ee138b7ec58f 100644
--- a/net-libs/qxmpp/qxmpp-1.2.0.ebuild
+++ b/net-libs/qxmpp/qxmpp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc opus +speex test theora vpx"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0e623388230e..1d7c7e35f003 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -12,5 +12,5 @@ DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595
 DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
 EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
 EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
-EBUILD webkit-gtk-2.28.2.ebuild 9142 BLAKE2B 9a8478488a0bbf4c7247ecefdddd7454789bfeafd3e86b38f53ba49131ecdf7fffd4d6ad4a5ddbf6377d684152dd85a86b5f72ce246caf50cf8c66b2e26f4842 SHA512 3cd9026118609768b8584137bbf4ee47c8e60f1d678df653d7985e336d530af5767af819e34a5663ee4ee4d0fd9cdddc989489f217e469e92780ca3ded8b1e56
+EBUILD webkit-gtk-2.28.2.ebuild 9147 BLAKE2B 05dc2471e1b80aafa769e3d3252b3fe96490212f8420ad02a5d77532387145bff45fca06a4233e4ae9048a7d7dc34d0aae957af7bb327881ee91e0a073d103c5 SHA512 2c02215bf2697cc35b49bd02d069af8fa376357f69060335977a5eabd46d1e889f74af32461f02cca3fe9a84963b002db01e9ce0cbf5623472a1e5f0dd5e0e99
 MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index bfb9e1492a69..d8c2b014eb30 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index bd55dc266505..5d18f96a3789 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index e1a1a1833916..efbeea637f09 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -3,5 +3,5 @@ AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
 EBUILD smtptools-0.2.3-r1.ebuild 672 BLAKE2B 344305769928c9e3d0fde238870c33611057139b7daec7216c4b6ccdc4499dfb984057500df026080b119b36f128a2bd94bcdbd3a108423fdefa5751d96a969f SHA512 5b2bcf2e8ee213d9820d55ad0512672780c3b29bfc8b9d189064190091b815184f5ac6408e5c45659501e7c6032528860ca3a715e840eb7f0b24019956abc387
-EBUILD smtptools-0.2.3.ebuild 649 BLAKE2B bd56d805ec28e88e94c835e531ca848a41750af3feaec27b110b015ad4277ca4f4c45139275eecb4c153133c5005bd2178e8d50133910ff46c81e06072b8d809 SHA512 a2a6a049d54b9d06bd0d96beddb1aece85fb42e70ccb14d9ef5b80813b9c72d1a5076d36b0f0692e04949b9fd56973aac1eb70cf7d6aa7299379320c71e7ec29
+EBUILD smtptools-0.2.3.ebuild 650 BLAKE2B 54308618cd0518e3039862c431be13d048ee8cc44724d84c5486c988ea45f4990e7b7d843361f555f403df05ef22ca24032d78bfc85a4b9aef975c2ea147725a SHA512 d203f71608ab6dc8d7d6539d9355d3d237f1d235b31eb65df5ff8693ab33233a6c274bbe0649f6d783a35168fa97f096f3091b53979766ac343d7141896b928e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index f5f1dd9f7c5f..b0c9e6eebac5 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 inherit eutils autotools
 
 DESCRIPTION="A collection of tools to send or receive mails with SMTP"
-HOMEPAGE="http://www.ohse.de/uwe/software/smtptools.html"
+HOMEPAGE="https://www.ohse.de/uwe/software/smtptools.html"
 SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2016656d0838..9da107f36dd7 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 9410b53f444c..83be8fef631c 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,5 +1,5 @@
 DIST axel-2.17.7.tar.xz 202632 BLAKE2B 2d799ad39c0742e2edfa09dd19f9d941c54c6136f4d5ec5a95f85d338bdebcc79545205cd1dde6ef25d28c89f494ae3cc278c73e375c9f4a96dabff73b139257 SHA512 ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa
 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
 EBUILD axel-2.17.7.ebuild 1260 BLAKE2B 1f976957b0425607de9728fc358454134191a4d0d136700d144d19f4348bead0e3167221091f9bd458d631f2bc09d5c9b4034175517659249174923bbd87ea69 SHA512 c5e24d64e0b781e7caa596eee0c82ee78a7d3fce9d8557e13a88c89a4eefe414e054ff4d80b5d9672d2cf9155575ae2fadfab15fb12e625daafda57231bf3cd8
-EBUILD axel-2.17.8.ebuild 1057 BLAKE2B 2042f61c7bd50a8ee7d56e659c9968435bce88fb47e25bdf001818dee043910ed3e10239910fc1dd38dc93a7e1738a54de980a4bd42197ae5781e1f96b3f36d3 SHA512 a065e53b30c4e90e7cb7d5692dd189c5d637a8442363289a931af80fd63c3834ac0556ed071825a095647116d267f9857b4ca5ce9915891116e4fa3460270d90
+EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9
 MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce
diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.8.ebuild
index bed3832fba7f..6c2695bbd2a4 100644
--- a/net-misc/axel/axel-2.17.8.ebuild
+++ b/net-misc/axel/axel-2.17.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 854b9abdd8a9..b6b581a2c1ea 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,7 @@
 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-97.4.467.tar.gz 96556504 BLAKE2B 1959c134126870e2d86b925766db9466be49fa0f71caeadac79f529194e85afeb4b45e47507a6786a2dc91cdb1cd976ec02110dac2c9d2abd71d789fd81204ac SHA512 fa056a96c1dd68f8c691c21b73d6d7159472616d2d67611a7ee01cb9b6bc4eeceed04087cb77114d6a62a715cbe82f828c6e75e4e92d3a4ce88ca7bbc2d71dd4
 DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2
-DIST dropbox-lnx.x86_64-97.4.467.tar.gz 100899563 BLAKE2B 0ab7b98d9e1394ce997aa456157a85586addb0c82f47d831721bd36a716cb3117b280e2753040369bc04d5a0360a3861a34e9381dcba747fdb4a38e11d4dd34a SHA512 05ddc063c9dcfb8b9b03f93f0b298b53d90702aef25ce44254efc1e7b21c0e767702c91cbfa3b1876a4c32980f80dd34eaf40453d76d093635df17818f663c9c
 DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19
-EBUILD dropbox-97.4.467.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
-EBUILD dropbox-98.4.158.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
+EBUILD dropbox-98.4.158.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-97.4.467.ebuild b/net-misc/dropbox/dropbox-97.4.467.ebuild
deleted file mode 100644
index fdd08dee9730..000000000000
--- a/net-misc/dropbox/dropbox-97.4.467.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/dropbox/dropbox-98.4.158.ebuild b/net-misc/dropbox/dropbox-98.4.158.ebuild
index 38f892d3ba40..fdd08dee9730 100644
--- a/net-misc/dropbox/dropbox-98.4.158.ebuild
+++ b/net-misc/dropbox/dropbox-98.4.158.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index ca04ef01fcae..3f65065bea41 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -5,6 +5,6 @@ AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c
 DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
 DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
 EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2
-EBUILD gerbera-1.5.0.ebuild 2374 BLAKE2B 0fc28c9d35b1c615a5880b9ecb19cd5d62a7024f2c07069bf1cca20cb79313b1ad0b03e12184f6310ed51cf03cbdddf41e877c263888b15960cf74727fbd4473 SHA512 d0ef6b689356d05365ce0e9e5046f1bc10173b8c8a56d6edee1bd84e6596fb063cf1bfeed2c07060de867efc7f24ce665e5ef61620f21da0b34b3d4e1dfa5ce7
-EBUILD gerbera-9999.ebuild 2309 BLAKE2B af7060d2acf0d50fb86c0a292e578a58be1971b189010b338047bf80b31e3cba3cf5fbe1ea69a6feb063bb1a00c9f5415e0096e44b83ba4cd32b08896f180a9f SHA512 236756bf69dc2f82b99d0297e142f99304e0798bb4f961caea1e2bd35317319ee4c20e43b6075ff0842b01d54d57f6c587c9a43277cc78d3053761b507a45b48
+EBUILD gerbera-1.5.0-r1.ebuild 2376 BLAKE2B 536362d7fddae6d2dc9b1846889e8757635512218edc73a909775b0b230d62429d721580e7cfbe7748faa93e0c1fa4710d778dc7e523e43e06eab027b5575070 SHA512 323b9a355a8691e7a76db7a28f4a151d840552de2f32b200e17e783aaa426b3d96bf0fc94c873db5860ac3f558fda03da2023806ab58a6cadb85a6eb1688bca7
+EBUILD gerbera-9999.ebuild 2311 BLAKE2B 4b344fd4a4d5951b490a97a23e5af37cd45a3a2bb2c7a73e6bf629cef25fbb76a95dad8cda6f1fa08f23761f7be0c7d455ddc8c45565615e2b3a94ac1fdcf79b SHA512 7b4330253af4df08e7aee9a66361f79762711511400cf211e5d4dc6655bf85614e395c853926ffd582e7b252cc83a96195ac4f32e27494f552ea84618b90c977
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.5.0.ebuild b/net-misc/gerbera/gerbera-1.5.0-r1.ebuild
similarity index 99%
rename from net-misc/gerbera/gerbera-1.5.0.ebuild
rename to net-misc/gerbera/gerbera-1.5.0-r1.ebuild
index 3e0553c702d6..df9d236f5d0f 100644
--- a/net-misc/gerbera/gerbera-1.5.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.5.0-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	acct-user/gerbera
 	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
-	dev-libs/spdlog
+	dev-libs/spdlog:=
 	dev-libs/pugixml
 	dev-libs/libfmt:0/6
 	mysql? ( dev-db/mysql-connector-c )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index adb30342a7ad..7a452ed244cc 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	acct-user/gerbera
 	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
-	dev-libs/spdlog
+	dev-libs/spdlog:=
 	dev-libs/pugixml
 	dev-libs/libfmt:0/6
 	mysql? ( dev-db/mysql-connector-c )
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index addb60c2a35b..3e065806868e 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,6 +1,6 @@
 AUX mikutter 136 BLAKE2B ba1a252d63dc3a190f61ad3f0489ac7222a90d48dc01cdaadb24f02d870ef64d0fd20b5c913f8469b590ab4b961accfcb14b7b7d7fa1542fbf0b938dac35024d SHA512 bae3b58b6983c7ad6e0c10f006f4338eb0923b1056b6f74f518a1b3caeeef7c414f8de8dd927420611ae8542dde8507f1c25ca0529e7cd3a17f6ac8fc25e16b0
 DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-3.8.6.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
-EBUILD mikutter-9999.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
+EBUILD mikutter-3.8.6.ebuild 2840 BLAKE2B d01f0074662996140f804692080df7f3e880c0aa57101abdee30a0677063a727f8ecde32e4762933aab0d327ac6cfe469ea6acbaf52df4eb9e9d343f540aa695 SHA512 21215df11bad9e6ed1e112ad5138a8ec0c8fadd9fce5fa8ac28675a924c9d4ba0be597b603d605efeee1ee8c4825067b84dc802098db9b1992917f9d4f35ba08
+EBUILD mikutter-9999.ebuild 2840 BLAKE2B d01f0074662996140f804692080df7f3e880c0aa57101abdee30a0677063a727f8ecde32e4762933aab0d327ac6cfe469ea6acbaf52df4eb9e9d343f540aa695 SHA512 21215df11bad9e6ed1e112ad5138a8ec0c8fadd9fce5fa8ac28675a924c9d4ba0be597b603d605efeee1ee8c4825067b84dc802098db9b1992917f9d4f35ba08
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-3.8.6.ebuild b/net-misc/mikutter/mikutter-3.8.6.ebuild
index 06d5346485a6..54fc8e5670f4 100644
--- a/net-misc/mikutter/mikutter-3.8.6.ebuild
+++ b/net-misc/mikutter/mikutter-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,14 +18,14 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz
+	SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
 	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
+HOMEPAGE="https://mikutter.hachune.net/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 06d5346485a6..54fc8e5670f4 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,14 +18,14 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz
+	SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
 	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
+HOMEPAGE="https://mikutter.hachune.net/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 2d2f7a73f479..299355ad8ae0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,4 +1,3 @@
-AUX remmina-gcc10.patch 911 BLAKE2B 4499abeb5b85d1460c4f00596222ad6dafa1bcf4434c2b6cfa3bbd7f0935cfa2a83e17fd42352437c9f82bf6598c36cd435992253101343599d37911557bb6f0 SHA512 4a54f0c98de0c9f24a11ac6cf935fadc7e832bb6a6bf4ff5b95ab0eaf065dd8d54b39f83f7ba6da31f49ee597a33fa1e8ec3efbf019b806b446d99106efd562c
 DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
 DIST Remmina-v1.4.4.tar.gz 1786300 BLAKE2B b4e13a34319c74f1fc935b1b72307e1dbc74d868e23f6b626e4477ca1253e52c0ba70270862c8e6e8fbfc8f7591a27b9319c41b398d4e1cf01339eb778a677b3 SHA512 2264a2d0f6ba65fbb46a2a8cc0a5c2ccd2f562e737b03cc393e7bed811d6437e76792ce3ec5013b48c9b068a58cf92081a49d05bd9be6781960e8db7e4569e35
 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
diff --git a/net-misc/remmina/files/remmina-gcc10.patch b/net-misc/remmina/files/remmina-gcc10.patch
deleted file mode 100644
index 214a8c887879..000000000000
--- a/net-misc/remmina/files/remmina-gcc10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 27f84d1c0a2e4c2432281f25ef3026bb00bbdc15 Mon Sep 17 00:00:00 2001
-From: Antenore Gatta <antenore@simbiosi.org>
-Date: Sun, 9 Feb 2020 02:34:50 +0100
-Subject: [PATCH] Removing struct declaration utsname as not used - Closes
- #2080
-
----
- src/remmina_stats.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/remmina_stats.c b/src/remmina_stats.c
-index a6eb6f609..3b7cbf0bf 100644
---- a/src/remmina_stats.c
-+++ b/src/remmina_stats.c
-@@ -159,8 +159,6 @@
- #endif
- #include "remmina_stats.h"
- 
--struct utsname u;
--
- struct ProfilesData {
- 	GHashTable *proto_count;
- 	GHashTable *proto_date;
-@@ -864,9 +862,6 @@ JsonNode *remmina_stats_get_all()
- 	json_builder_set_member_name(b, "REMMINAVERSION");
- 	json_builder_add_value(b, n);
- 
--	if (uname(&u) == -1)
--		g_print("uname:");
--
- 	n = remmina_stats_get_os_info();
- 	json_builder_set_member_name(b, "SYSTEM");
- 	json_builder_add_value(b, n);
--- 
-2.24.1
-
diff --git a/net-misc/ris-linux/Manifest b/net-misc/ris-linux/Manifest
index 0e8bd08b7544..f3fa47e53c62 100644
--- a/net-misc/ris-linux/Manifest
+++ b/net-misc/ris-linux/Manifest
@@ -2,5 +2,5 @@ AUX binlsrv.confd 90 BLAKE2B c4cf8149e8fa970f76682701e1aa8248292cfc95f0094537381
 AUX binlsrv.initd 775 BLAKE2B 9bf7fd79566a35ca4ea4836b6b0733ae76322b7780f4346ab74d10e5114c42baf963634d9cf819d0f14f1a0473789f565387c522b3ccc716c7bceec3f9e8ec89 SHA512 2555500d462907daa6c6027b30fb67a32d453dd611ee5a9e71e5ed8cdd2943dbb5ebc0c1ce7de7ce70f0c1158afe475a56156da4ca611c8bd30ea5b95d546419
 AUX setup.py 204 BLAKE2B 82bf28846611f2d4e24b62ccc945359055ee20ce492703da6fd9452fa4475cba507ccf47feef81f6a099afb125466cafbd1ec06bfffdcc39a6f45175a56f4f5e SHA512 a2e3482ae7d4cec63230d0e787c6ff6af8fc749d84aa74de51152bc5f8aa5f9d29b6578a82141fdbc15c61786d7e8a9cfdd14b885d5ed2b62f30033548a4f240
 DIST ris-linux-0.4.tar.gz 21634 BLAKE2B 815b54eec6ff29f06f5d1be0e8eb597c6118ecf7698d6d99e2b887ea8b1919d861feb445f2bf9f58c28c0cbb3304b168f9d3937331e65511023ac6281b4ea309 SHA512 e9eea14b45c060844e22dc3baa9cd15e7d202bcb3cb8b069b084115b05c0700bd563ed6322d675eee9baf72e8d530429d0c3137386377b6785ebc9007dbfd040
-EBUILD ris-linux-0.4-r1.ebuild 788 BLAKE2B 02396d5ea2a9fc31753e91e6b9824a0c786dcedd90cc0b5aaa64403d6d3e4db73d48e9e7bc42f93e0d63096a83524c32852ade5a2467c5e55aa08252c32703e3 SHA512 88e0b2928374fbcbee46c84819baa4cecf1d2768d82a44cfee7e5e75b1d8333e644780ccb2a760beb77f688a2d749119c3df1b57d798cc0dbb1a8b5c8f7d1a60
+EBUILD ris-linux-0.4-r1.ebuild 790 BLAKE2B d15a9513ce381f0f70311db403bf50fead7d0cdb4984c9b791397b3a3c33032923757436641d385cb19cd2d22b99a2e7b3dab6d7f1cb8ee27b51a79e7830228a SHA512 000f2f82c62a4a7bdd7909abc5b5a9d1209973a6a5be6ed5449d597bcb6544ebf2154e9c4c089a6b3d9eee978f215cf8110963a6e6c94c2e921571674b706f85
 MISC metadata.xml 217 BLAKE2B 19c9d1fa32b1387c2578d4acf482cfddbc144decd961796c2dabfe02ad2b11e232eee8fc02c900f176f7cbba0ecc741c66b1a55d3734b2901c40a98194a78433 SHA512 892fa1b0f9fef66cd02147277c70b886bfef9d36817e024d35216a14bd1a2bd640ffb8d6f57bed87cd06b7c4cce17eb3c8fe4255cdc62972b551c73509c0dfe7
diff --git a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
index 850ea2126102..282889fbed0b 100644
--- a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
+++ b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
@@ -9,8 +9,8 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 
 DESCRIPTION="BINL server to doing Windows(r) RIS"
-HOMEPAGE="http://oss.netfarm.it/guides/pxe.php"
-SRC_URI="http://oss.netfarm.it/guides/${P}.tar.gz"
+HOMEPAGE="https://oss.netfarm.it/guides/pxe.php"
+SRC_URI="https://oss.netfarm.it/guides/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index e951dba1a681..213e7ce8b369 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -11,5 +11,5 @@ EBUILD socat-1.7.3.2.ebuild 1520 BLAKE2B 32d8aa672a3a43f6024feb331edf40eabca1264
 EBUILD socat-1.7.3.3.ebuild 1471 BLAKE2B 687c3406bbdf64c937d3c9ac3c390d0ecbd03b88c7fd09f32ec7e7225e24f6758aa5379c538c465e400e55e178c361661568c70c273ce7bc230b1ef35a992401 SHA512 1e41fd0d07fd686f5a7aeda87a998dd7fa83d254ced0bea3b27267fbe2e70fc9d88efe0864c8ef9398ace0f301842f7bc13199535a13be4b608cff8b7a7c84e4
 EBUILD socat-1.7.3.4.ebuild 1477 BLAKE2B ed640d382b632be7e1410061a8b38266500761009b17143a28acdee817b83d68bee5288e2f969cad4e0946f93e4af545ac70f604362b14f7f37977b872580ef8 SHA512 1fef52abadf4ba97fc77764616e5ab1111f8621665dd8f9a137075de2d9f8e8db48aa0d633c3bb925d58f6cc5a1374bc755236eb1a35f64bddc0dee55eba2da4
 EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18
-EBUILD socat-9999.ebuild 1383 BLAKE2B 03bc6cab87aa5f55110b3d2421961b81d02389eedbcb1dcc6f942ef1fdc5171204da8caca26e9e388008dd33f702378d7be00abcacaa37c1e28211e19fddc6df SHA512 308a2f4dda32700072c3812e4226f1e3d356b015c6988aba0d220cac0d6c9cbcfeba2d49a5c55c9149eb068493bd5b31e5eafd34ba036a9b901002e29a8c969a
+EBUILD socat-9999.ebuild 1395 BLAKE2B 0884f6b4f865dc2ff255e5a48a45c0de198b3b926db598d18472758767c6a7e10978a59a88b7ec543bd1f5b8b4a18aa67b42bf59cbd3ecaf2696e83932940b53 SHA512 8836b32f18f8680bf27c26c10ac996d14befcea2f1f2ba6aab2f5e433e757ec51e81a0bebfced410c7e07f3cbd9704af7f349441530e223d132ccb5c78a3cc20
 MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index 2c12dbc3dc4f..7d28699e42fd 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -21,9 +21,11 @@ DEPEND="
 	readline? ( sys-libs/readline:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
+BDEPEND="
+	app-text/yodl
+"
 DEPEND="
 	${RDEPEND}
-	app-text/yodl
 "
 RESTRICT="
 	test
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
index 7d1d153f2507..9fd291410952 100644
--- a/net-misc/spiped/Manifest
+++ b/net-misc/spiped/Manifest
@@ -1,5 +1,5 @@
 AUX spiped.confd 639 BLAKE2B f9def241056bee9ca46de9735fdf9083d3a196476934fe4486b2cb6f19aeef31e5551b112da7b47e511d2732231741865c043a10946c686a7b9aad8d4e1cab01 SHA512 ce2b2f4025ce69ec639e452ed4f4760600e2acd41c29b7ab9c75a7e72bc66cf29c60d417a19f08bd7f7f1cfc7d8582ad6de62738251be3964bcf16ca872887ac
 AUX spiped.initd 649 BLAKE2B 2d516af5fc78d7ae13ca79ae8fe24756f484f6b7892d9acaa0a2fb7a62425d66bd2f7172bcc6b396380542bfe496434e70d6a0b93c0c29d3b5e064b41d4bf655 SHA512 6acdf82ca2ed469e3b69813e59628d3148b7c3600b5af74a82d6c715d812b74ed1effd43d7e644d872f1faea4a553e365f36cf054c4727fdc902446f0b89f52a
 DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a
-EBUILD spiped-1.6.0-r1.ebuild 912 BLAKE2B 21edc507bb9ea1510e553ff189e9a679915d9d2d8391bb032bd8780f36928ffbfa80a3440f75b4c4a2b89e1afc6e4313f573747b28c869236692986cf6484c71 SHA512 f78d65f7360c4291c8c3cb7c8f3d19858c56de144ef5af9e5c75d27773ad1f514604e8b7dfa5c2ec3abc463a1dd0f28c2e16d98b211c8a3335db667b9c8b12bb
+EBUILD spiped-1.6.0-r1.ebuild 1015 BLAKE2B f52f02fb49a2dbfa90382153b0946df3a3dcefc4621fd1260e244a9cafbdad46fd5d7a3e3b4ad9e9b00715bfd58a779b65a767d08985b87d939479dc40db3009 SHA512 373d051016521793faf0abb0764c3e0d0ab8a55e768776fd62536aee5c1c75c9801227e8988f5e8ae16cd5664b5d76f8d5a8dfcdb40c1106777a14a15bf0cd43
 MISC metadata.xml 698 BLAKE2B a87abcb8c6729e90053ae83af7f33e29e5f6e9a4bd3ef53f71554caeb2d2c5c1e49a60cd98cee89ba4984bc31c35496e3fb3d3392b35fdc5c0a8b086490b7937 SHA512 26f7bb3fc9a8fd2f2ecc9a6b249b777bc9761f2058f3aa01a700d745e17a8e1f6aba16a8b013576b6bbb4cad951e7a4e01975c22c1cec9217307723ecaebbb63
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
index b3ab508eb627..7820531c9cd9 100644
--- a/net-misc/spiped/spiped-1.6.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -1,8 +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
 
+inherit toolchain-funcs
+
 DESCRIPTION="secure pipe daemon"
 HOMEPAGE="http://www.tarsnap.com/spiped.html"
 SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
@@ -23,6 +25,10 @@ RDEPEND="
 	${DEPEND}
 	!net-mail/qlogtools"
 
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
 	dobin "${MY_PN}/${MY_PN}"
 	dosbin "${PN}/${PN}"
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 0586ee7a0d56..9177aeb52bed 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -4,5 +4,5 @@ DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b1
 DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d
 EBUILD x2goclient-4.1.2.1-r1.ebuild 1457 BLAKE2B 7d246b2e56ff6d84ddca5d1376d9c95399ebd96ac182b0f4b5969d5006a817f872d3984baf30b595bcf59a11509e330e7d4eb850ff9cc27de75352813d625ee9 SHA512 d31d2a343c5cdd006bf76102f8a9bdd9ed080f13c86ec90807024fe4216155966875d787e0df06b22b3e70db4e0c342fecebbde5c81704ae557c7dc6d0d501d0
 EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94
-EBUILD x2goclient-4.1.2.2.ebuild 1277 BLAKE2B 4f24790b33a649d5d153cdf012ebe37ba82b39238161e29881822fb3e133c35a29569879b7828bdce209e5155683091da0a5bf7bdb6b12268fc488dae9a14716 SHA512 5983bb5a824f0968a3151ac430b9b5b2512b3784a0432c4599cea1f9eaecd4c0cf30f42726d960652d4ba2c727ed989e892e64a8ce7ebf35746bcc9788332a7a
+EBUILD x2goclient-4.1.2.2.ebuild 1275 BLAKE2B 9cf9d6d7ccc697c6a52ab63ab2f519ed7ec2c2b2f3fcd8e54f9855fab786535b821dc17958a42a74a3a7d897e47e53c316336da136dc571916da64f05644b568 SHA512 1e537a1e4205b5ecf1af941758cf1b93bf45a7b9f7187e875515b7bf51d039c6b274bd4dc1b81f786aef462596dc8283d46c2350b7884b771fd529465e7fe6a1
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
index 6e14630de53d..313291619a0b 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ldap"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 1ef3c4f6a21b..41b31a325881 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/vuze-coreplugins/Manifest b/net-p2p/vuze-coreplugins/Manifest
index 23626f5e94a3..4fecf4292101 100644
--- a/net-p2p/vuze-coreplugins/Manifest
+++ b/net-p2p/vuze-coreplugins/Manifest
@@ -1,11 +1,6 @@
 DIST azplugins_2.1.10.jar 313871 BLAKE2B 98d27cdf08adc27dffd6117f436a2868bf02d8b33d97bc6366182f7bd2a26293c79c4ac76aa198211b466cc90757acafd72b85703868acd42d0f748b8fae9708 SHA512 d61d517537e265cfdef5e48a8ad70afca43e1c53edb91e85e7e54296eab838b82510eb48911d545d27e4e014e6a3f599e4c1535a7c5468e69f89a88b178329c2
-DIST azplugins_2.1.7.jar 318260 BLAKE2B 96bce8cac98959ae166bd5644b445bfeb352c5e4187283763a3eae9d42fe183c4f077306e77aa9e3a36b8a6efdd53dfcd09be7c2fccdda5cc709afb75172ff5f SHA512 e439371e386c515f728813189644ab99f5f2404f03877c2e7d83bc2b5ef3b5dbaba8fc8a15ce84a786b7fca3a370447c81d00905ed8c304df1d1c21b0e0aaa4f
-DIST azrating_1.3.1.jar 38172 BLAKE2B b88c6ad4092bd1099d34d3274e6a49a59137cfe967069e2fc4b50eeca1c17d1a2efe19a2a323326f51e918f7d70f91206b047030d7c73060139107c38dc785ac SHA512 8a9916b2736b577d29e82be95eddd0b79814f275b52602495c96dbabaff8128b5697d08a30914b714c26f9f738854822994e70c90a92c97bc9381bd1899b38cc
 DIST azrating_1.5.19.jar 114515 BLAKE2B fbd4251bfa1259d750d655f64e143437d7025badb849cf11e20b0119d8dc6c66e98f9f055c0a4d3830bc0f7fe3b3b5eaa32eefd6b8e9e56b40ba554becbb4eb0 SHA512 e75d331e21cb72b0401e62ab6828dc8c76301f84e1b3c8d01e8cbc1a95eda2a7736925212d4e4dc38239d02cddf864bf544a75f3d6d9ce5bb8cdddbc863ee03a
-DIST azupdater_1.8.17.zip 26023 BLAKE2B 2db0d88bc5aef807d4116bb8a0aacb89aa1ba594492fcc5d1427e66e20327a8883ca672019fce1c84819b262af18a6530fccfc645d1991ab7cf035731311ca87 SHA512 21806270d45afe393ace0b5bffb5e6800a45aecb40cc32bef0f2953182a410f0369084a30897bdb4d68beef176f9b59a209fd54df306c68e9b492c8d3d73cb06
 DIST azupdater_1.9.2.zip 26390 BLAKE2B 9c146beee646cd4a31a1014286d4a2bdbe791b5841c0bc2dca1d0740546f224d34294efcc0ae7a36ae21b8a9e93a442369af8e896255bb11518a5a80b27fff11 SHA512 8a1b37d69e6c955f0e507c5455ae198c162f9de2f1713abd6d47bc9f32e65b6afba15152956f98eca101fbf4dbbecaa5b0f84813dcf11e9b7bf33171ce7432cd
-DIST azupnpav_0.4.6.zip 247837 BLAKE2B 1c4060515b963bc1edab9a8f5195232aec268eabc67830c94ace69868726e89ff697647c1f00056cb551c53b517c672990dcb7693f025f8f4a6c6cf77dde0b4c SHA512 eee392cf82aae37b2689ce086fb00727728064552ca31bbf228d3d76407c15f92d30527b979dfc555dbf3a1ead65d991c55d8c517c0f5c93d5a3890b88bfa6b1
 DIST azupnpav_0.5.7.zip 264998 BLAKE2B 70a8864c61a9b9c3520ae04b0576678c768c619de1f822cfa7968617d7d37597077126b7b562d7a6ebd7458fa8a4e1fecd733be2db41ebe2aec7b8825d00f669 SHA512 f58fa8a3e26d204080a8567240bcbac2868233137ddb073c2ca0c91c17ace5f7a07cebfb1eef04e7fb18eb9287418329b5ca742681806fce78a975e0053ddf1c
-EBUILD vuze-coreplugins-4.8.1.2.ebuild 1978 BLAKE2B dc7a4e6e4032b9bdc95a25e57b5013dc71c8f2c6bd3f13d8e111d096821cba74d4ebccc5a9f3e9a6cc60ecd974732168a8df033ea84047b56c0287ff58582ada SHA512 e3190df7d088dc28a7c935249596798f3a519920f3adea77827bffab9755d6b71569a93d27356faaf8abdf7190c646f7b5983d5c23b57abaea589204e86f552d
 EBUILD vuze-coreplugins-5.7.6.0.ebuild 1465 BLAKE2B 2d00105dcf43f7697b524963fe4024bd6fa585b2e717d334cced43b7989d87cb6ca7429fae5e7cbb4143c3b7e0145d8724c8bf68fc51eb0aaec179446501c4e1 SHA512 8e86902565dc2cff3eb0da593a695c5b82af808bd172959683e86e14bb875fd910f44c4116134a2d554e6b7083c1d535e6a77bf08df7bc6252b744c2b4efec92
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
deleted file mode 100644
index d1859913ad00..000000000000
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# eventually this should be built from source...
-
-EAPI=5
-
-# don't forget to update these when bumping the version
-PLUGINS_V=2.1.7  # http://www.vuze.com/plugins/details/azplugins
-RATING_V=1.3.1   # http://www.vuze.com/plugins/details/azrating
-UPDATER_V=1.8.17 # http://www.vuze.com/plugins/details/azupdater
-UPNPAV_V=0.4.6   # http://www.vuze.com/plugins/details/azupnpav
-
-PLUGINS_DIST=azplugins_${PLUGINS_V}.jar
-RATING_DIST=azrating_${RATING_V}.jar
-UPDATER_DIST=azupdater_${UPDATER_V}.zip
-UPNPAV_DIST=azupnpav_${UPNPAV_V}.zip
-
-ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
-
-DESCRIPTION="Core plugins for Vuze that are included in upstream distribution"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="
-	${ALLPLUGINS_URL}/${PLUGINS_DIST}
-	${ALLPLUGINS_URL}/${RATING_DIST}
-	${ALLPLUGINS_URL}/${UPDATER_DIST}
-	${ALLPLUGINS_URL}/${UPNPAV_DIST}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="~net-p2p/vuze-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir -p plugins/{azplugins,azrating,azupdater,azupnpav} || die
-	cp "${DISTDIR}"/${PLUGINS_DIST} plugins/azplugins || die
-	cp "${DISTDIR}"/${RATING_DIST} plugins/azrating || die
-	cd "${WORKDIR}"/plugins/azupdater && unpack ${UPDATER_DIST} || die
-	cd "${WORKDIR}"/plugins/azupnpav && unpack ${UPNPAV_DIST} || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/vuze/
-	doins -r "${WORKDIR}/plugins"
-}
-
-pkg_postinst() {
-	elog "Since version 4.0.0.2, plugins that are normally bundled by upstream"
-	elog "(and auto-installed in each user's ~/.azureus if not bundled)"
-	elog "are now installed into shared plugin directory by the ebuild."
-	elog "Vuze may warn that shared plugin dir is not writable, that's fine."
-	elog "Users are recommended to delete the following plugin copies:"
-	elog "~/.azureus/plugins/{azplugins,azrating,azupdater,azupnpav}"
-}
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 990e292492d0..2eb2a71ebf3a 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -9,9 +9,6 @@ AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 BLAKE2B 547ab6aa8e964280f72bc1
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
 AUX vuze-5.7.6.0-unbundle-commons.patch 5156 BLAKE2B 641a0264521e97d808046a9d76cb362302dd25679a6e8df6878646d59f04b1a6cc0ab1fd7e83d8f76cb7250b9b2fbd64cf1efbbbc4eb14a0432f2eceea3c22c7 SHA512 f4c5082b618a2feb9c19bb1ddc53e7a61f1511d804488ce279e3c3174fc185d93d31316de58d185e3f6a6f19af11d587c9b11c4361c3f07622c11843eff6b51c
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
-DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
-DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
-EBUILD vuze-4.8.1.2-r1.ebuild 4000 BLAKE2B 5ce11619ce22b732bd1f7c0f38c5d48f72cce4bce2092ccc93bc261b6888b40d24cf0bd1e2a120549c2adddd9576226faa9049105a0b81df188eb49f3d094593 SHA512 bffeac4eaab07b89d9e80cdfa3483cd0d3027f4fc53d5e70177c6e07cecc06f64a606fc8daf06fa2dfbeba84e96fc4ecbd82666203bc939347e021e0931da706
 EBUILD vuze-5.7.6.0.ebuild 4107 BLAKE2B dea72150fc73f0bcc623218d4af88c87317901c56917b4135332672aadd553724e947344ca147fee312043072b3edf91efe4b0ff62b2d192299fb4876ee32867 SHA512 7166554a864d0aa7b7a77d596e0045695acc55a1d8cb7ec36f720d75b0bb8a0c462a8623ceec3c4f75ac3b1b7d8c45cae7c56d79630c2bc99097d708dd8e2d08
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
deleted file mode 100644
index 4f332aa97f4e..000000000000
--- a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
-
-MY_PV=$(replace_all_version_separators "")
-
-PATCHSET_VER="4.5.0.2"
-PATCHSET_DIR="${PN}-${PATCHSET_VER}-gentoo-patches"
-PATCHSET="${PATCHSET_DIR}.tar.bz2"
-SRC_TARBALL="Vuze_${MY_PV}_source.zip"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/Vuze_${MY_PV}/${SRC_TARBALL}
-	mirror://gentoo/${PATCHSET}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-# bundles parts of commons-lang, but modified
-# bundles parts of http://www.programmers-friend.org/
-RDEPEND="
-	dev-java/json-simple:0
-	dev-java/bcprov:1.40
-	>=dev-java/commons-cli-1.0:1
-	>=dev-java/log4j-1.2.8:0
-	>=dev-java/swt-3.7.2-r1:3.7[cairo]
-	>=virtual/jre-1.5"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.5"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-src_unpack() {
-	unpack ${PATCHSET}
-	mkdir "${S}" && cd "${S}" || die
-	unpack ${SRC_TARBALL}
-	# this is no longer needed
-	rm "${WORKDIR}"/${PATCHSET_DIR}/0006-Remove-the-use-of-windows-only-Tree2-widget.patch || die
-}
-
-java_prepare() {
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	# hopefully that's just a packaging mistake
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}"/build.xml . || die "failed to copy build.xml"
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PATCHSET_DIR}/
-
-	### Removes OS X files and entries.
-	rm -rf "org/gudy/azureus2/platform/macosx" \
-		   "org/gudy/azureus2/ui/swt/osx" || die
-
-	### Removes Windows files.
-	rm -rf ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	### Removes test files.
-	rm -rf org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-
-	### Removes bouncycastle (we use our own bcprov).
-	rm -rf "org/bouncycastle" || die
-
-	### Removes bundled json
-	rm -rf "org/json" || die
-
-	### The Tree2 file does not compile against Linux SWT and is used only on Windows.
-	### It's runtime-conditional use is thus patched out in the patchset.
-	rm -rf "org/eclipse" || die
-
-	mkdir -p build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.7,bcprov-1.40,json-simple,log4j,commons-cli-1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates via ebuilds"
-
-	elog "Vuze has been formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration"
-	elog "options will be placed in '~/.azureus/gentoo.config'."
-	elog "If you need to change some startup options, you should"
-	elog "modify this file, rather than the startup script."
-	elog "Using this config file you can start the console UI."
-	elog
-
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 02b268a84e10..9d4a37197168 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index b17ffeca3a4b..08e2e5514f01 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,21 +1,18 @@
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
-DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
 DIST haproxy-1.8.25.tar.gz 2184002 BLAKE2B d6ea39af0109eee679d87dde258038bbb38ccf12796b2e6a7172067fce6bd0f10485e2a3d89ca5b3596529db4e34d511bbb194b019c7403703cb636573b0438d SHA512 655eb4056989a3fee321ea9278a2085b0a999e522293f1f6229ebb8d17f3d33cb78abb4fd55a06d0218082e632b2d42de105575d0acd0c1b49996d4b45aa78e8
-DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 DIST haproxy-1.9.15.tar.gz 2480346 BLAKE2B 9ebdef0cb038324b1cbe74198e73fd7f3adf5d1c6ec4000fb02e2640fe79e4b64257bfb5d6da5f1ee73486969a47e13f386313d1923893d290ef368775a08d79 SHA512 618799c9c9c5ce2c9e42aaf22abe6018d1071a72ce54273c330538007d44568a29f643d53e4861d26dbc4fc5acd1b927361948dfc1c846574d6183b6ae81429c
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
-EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
+DIST haproxy-2.1.5.tar.gz 2708469 BLAKE2B 7a05d1223589d38d9b86e09b1b0bbefac0b20a5727bbc672b7a27758a8881dcb024215b0d9354b1a453bc395337a70f9b6fd42b2497ee90afc9164de4fabd4d5 SHA512 4f939dcf1b10eb2f33aace1df3e5ae2f4fcb8b063a94924234250047492c51bfe5fb5eba2b9f43694ef0563d4caf3259727bff8e2d4453698e80e92c91a493e4
 EBUILD haproxy-1.8.25-r1.ebuild 4806 BLAKE2B af3c97529af6f1f5e13344ef66c8cddca311cf0c52d9a02dccf5031ef51f090cb7ab356002d78161f1182e84d1da381b08ff2b678e455b27c82f0a6efc414c24 SHA512 07beb412bb20437d94ff8e829741845400ed58f32e5ecc358cbd13ea777b802bf8ce188d7b9b6a9db43bad7bcc1b6136055ed23677ce6b57c8097f03ca607fdc
-EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.15-r1.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34
-EBUILD haproxy-1.9.15.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7
 EBUILD haproxy-1.9.9999.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34
 EBUILD haproxy-2.0.14-r1.ebuild 5345 BLAKE2B df4570054d3ed94729d8d1b7414a61798973c716f68631ce4f487902e4d0f04ab0fb93cf45b5104c8c4b9541787f12c1cb00e72809447b9a6484ca15322e00e7 SHA512 6bad2f674656e9ed6277c691962cab5add403d6b4ceb7a65f5b7d4e6da4fdf50888c6b9f9a6aee74b8de0dc8f433e93b7c1c0e337a90f64f9be2a3389190ca85
 EBUILD haproxy-2.0.14.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
 EBUILD haproxy-2.0.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
 EBUILD haproxy-2.1.4-r1.ebuild 5345 BLAKE2B df4570054d3ed94729d8d1b7414a61798973c716f68631ce4f487902e4d0f04ab0fb93cf45b5104c8c4b9541787f12c1cb00e72809447b9a6484ca15322e00e7 SHA512 6bad2f674656e9ed6277c691962cab5add403d6b4ceb7a65f5b7d4e6da4fdf50888c6b9f9a6aee74b8de0dc8f433e93b7c1c0e337a90f64f9be2a3389190ca85
 EBUILD haproxy-2.1.4.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
+EBUILD haproxy-2.1.5.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.1.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.13.ebuild b/net-proxy/haproxy/haproxy-1.8.13.ebuild
deleted file mode 100644
index 7f78d78c47ae..000000000000
--- a/net-proxy/haproxy/haproxy-1.8.13.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.8.9.ebuild b/net-proxy/haproxy/haproxy-1.8.9.ebuild
deleted file mode 100644
index 92c291b81061..000000000000
--- a/net-proxy/haproxy/haproxy-1.8.9.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ppc x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.9.15.ebuild b/net-proxy/haproxy/haproxy-2.1.5.ebuild
similarity index 84%
rename from net-proxy/haproxy/haproxy-1.9.15.ebuild
rename to net-proxy/haproxy/haproxy-2.1.5.ebuild
index 9c532b354464..d1c45681b560 100644
--- a/net-proxy/haproxy/haproxy-1.9.15.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -20,8 +20,8 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
@@ -45,7 +45,9 @@ DEPEND="
 	zlib? ( sys-libs/zlib )
 	lua? ( dev-lang/lua:5.3 )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -63,9 +65,6 @@ haproxy_use() {
 }
 
 pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
@@ -75,9 +74,7 @@ pkg_setup() {
 src_compile() {
 	local -a args=(
 		V=1
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
+		TARGET=linux-glibc
 	)
 
 	# TODO: PCRE2_WIDTH?
@@ -100,7 +97,17 @@ src_compile() {
 	# For now, until the strict-aliasing breakage will be fixed
 	append-cflags -fno-strict-aliasing
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
 	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
@@ -149,12 +156,12 @@ src_install() {
 	if use examples ; then
 		docinto examples
 		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
+		dodoc doc/seamless_reload.txt
 	fi
 
 	if use vim-syntax ; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
+		doins contrib/syntax-highlight/haproxy.vim
 	fi
 }
 
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 29d020cbf000..cabcd5c2b197 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,5 @@
 DIST mitmproxy-4.0.4.tar.gz 27131713 BLAKE2B 2748b0f3b66e1f5840aae792a1b4cd8ef8efa3673fa24bc0c3e15474b36d68c0f6b2203cf629b6444545b8c6223752232b2ce8526290fe5d74916946e8917a03 SHA512 e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3
+DIST mitmproxy-5.1.1.tar.gz 27223155 BLAKE2B 38369eb07c41bde9f8e8c246ab5cc4fc6edfcd222f353624f4d2ae193f176228471aafdadd1b65238ccd808d778a69e1d140035be9116b87a75c286493747fe8 SHA512 ac5cd82d4d89590b57625661c493aca6a702605c612ea1acd9e0d0806067d47f60085ee68260bba2a10dc343410ae6a76ea1575287a0e312e4467a4e8485c6e1
 EBUILD mitmproxy-4.0.4.ebuild 2550 BLAKE2B e2cb3a6e0b8704f23101c6138423d9b3610f6ebe9b41c82ee9f27cfdcc7c50ad140800ae795b7377cf63ab610874a8572c225b1431746a009c53d4b00053a354 SHA512 de62cf136268d834b84f0b21a206666d2f4cdb26ea856df22304f4bb21bc42420eb9785f4dcede78a8b6bc97162788af863d1ac94e478bf52b6f3eb6fcee79c8
+EBUILD mitmproxy-5.1.1.ebuild 2888 BLAKE2B 0519da8953dc11a9d3c3a9cbc79ea3719cf298148d00f3f0dff9cefac2c43c83379fe86840d6492caf2cec9e5b1cc7076e9537b5570d394f49fa51700b69aac2 SHA512 bb6e9efc1ae729586c3f8571eb9b40da6056d999a9eb87e41ea70fc096e659c57b59c81b99184767902bc3898eb17d91b11d2ab6a238e1467b9873b53e544153
 MISC metadata.xml 239 BLAKE2B 9ce254c9d79c1823be126f0737ead27524b2690a447914d59f3cad0ec3c549b2020fd9b31e50f67054b819c2264791cec5befd5602be80b4c0b0cb86b50d615d SHA512 70f4cee52fc1b316d727f8d0a423b718e78fb5b6d78ec321fc2aea5ba5dc5b08cc0142846a6d4b1cbe478f5a6322254222b08843a72e0307ecfd053cdb801c03
diff --git a/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild b/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
new file mode 100644
index 000000000000..1e3fcc5ed4b7
--- /dev/null
+++ b/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
+HOMEPAGE="https://mitmproxy.org/"
+SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/brotlipy-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
+	>=dev-python/click-6.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/hyperframe-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
+	>=dev-python/ldap3-2.5[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/wsproto-0.11.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.50.8[${PYTHON_USEDEP}]
+		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.3[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+		>=dev-python/zstandard-0.8.1[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# loosen dependencies
+	sed -i '/>/s/>.*/",/g' setup.py || die
+
+	# fix brotli dependency
+	sed -i 's/Brotli/brotlipy/g' setup.py || die
+
+	# remove failing tests
+	sed -e 's/test_iframe_injector/_&/g' \
+		-i test/examples/test_examples.py || die
+
+	sed -e 's/test_find_unclaimed_URLs/_&/g' \
+		-i test/examples/test_xss_scanner.py || die
+
+	rm test/mitmproxy/addons/test_readfile.py || die
+
+	sed \
+		-e 's/test_mode_none_should_pass_without_sni/_&/g' \
+		-e 's/test_mode_strict_w_pemfile_should_pass/_&/g' \
+		-e 's/test_mode_strict_w_confdir_should_pass/_&/g' \
+		-i test/mitmproxy/net/test_tcp.py || die
+
+	sed \
+		-e 's/test_verification_w_confdir/_&/g' \
+		-e 's/test_verification_w_pemfile/_&/g' \
+		-i test/mitmproxy/proxy/test_server.py || die
+
+	# needs pytest-asyncio
+	rm test/mitmproxy/tools/test_main.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die
+}
diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest
index ec5430a2db6d..9b1062ac9e14 100644
--- a/net-proxy/rejik/Manifest
+++ b/net-proxy/rejik/Manifest
@@ -1,4 +1,4 @@
 DIST banlists-2.x.x.tgz 116100 BLAKE2B 401d3cd995b7e2adcb28055c4f107799a87397a1ed06c698d70b2a4b755565759d7f56eb70a8d59a5ea04cdc51c6142d6bd03ebdd414133fd71792c66c5fe54e SHA512 068d01685e01679b2726da1cbc5f31f6aba54ab2194e8ab145bd2409e7fc71e3662445a8274b08746e5cdeadea2197f5a72a1abef98ec91267df851615b188b3
 DIST redirector-3.2.10.tgz 45407 BLAKE2B 735cab04b58d62a5772b2da540f1f358d20a1bf4612ab1d838066e9319bf28e3288a988e2fbebd5a7f7e6ad3912a59f3fadbed3bddf99b557ee562cd45779751 SHA512 6e82341e402b149464b048e763cfa6f7bc514bae48514b482eded9288af9705942fbfd2e11b5701d3540489ec5ccab358848108fe15f25c5ab2915e44f3f1033
-EBUILD rejik-3.2.10.ebuild 2319 BLAKE2B ee8f1987add7220f92e7cbb706efeaca3b889b770df37a015836e557f513d88871a0ed9a5b3152100e9dbfca753d1a39e7e88adb72ebf6373619545fb6bc8c2a SHA512 65cfce70cf0562e9b3efaf0eb8b83a1774e811c03bc77b964489e35cef81dae3c189e6f8de98f3e300ccc76e9bc0cc43f8444db4f98a1ef34edd75701b26ffbe
+EBUILD rejik-3.2.10.ebuild 2321 BLAKE2B a1ba8d0b9de4bbf51f59cb772658fc83341001aa070d36b2456149e924d52ece8fe555094eb2bf1ebaa4dba37b9c4a1f2efcbd9a0d94cf06df2535eb79c7887c SHA512 5242e4266c01094dbd75e44ceee73292a07836d17cb586cf41c13c2af814d2d466d83db489d87c218c7c1491c18f419c3a287b4f1b186b2ccc5bcecd2c99b7ba
 MISC metadata.xml 345 BLAKE2B ced7a93f69f79d0f576c3249172a0557eca3002ba2b2c4bfeaed9f24d9bdce2e0cd10081ca67e96e3f2b944fe1a5c16bc2de4aba1a5ab14e274d89362be2089e SHA512 c45ec66f94f72f5a1faae645214953c4941e98e442625775fc25a2010345a31e61db086f1498344a64dd026764037a7a6d277655ab578ff32d7e9167d5eece57
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index f5fc802fb246..2c60bc8a830f 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.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="4"
@@ -6,8 +6,8 @@ EAPI="4"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A squid redirector used for blocking unwanted content"
-HOMEPAGE="http://rejik.ru/"
-SRC_URI="http://rejik.ru/download/redirector-${PV}.tgz
+HOMEPAGE="https://rejik.ru/"
+SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
 	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
 
 LICENSE="GPL-2"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index eb6b586e1146..27d8e3899e8c 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 284f66cca0ed..7fc2c9df90d5 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -10,8 +10,9 @@ AUX broadcom-sta-6.30.223.271-r4-linux-4.15.patch 1343 BLAKE2B ca87ae817cefd6436
 AUX broadcom-sta-6.30.223.271-r4-linux-4.7.patch 3897 BLAKE2B ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f SHA512 f61ecfb6b8c5a377c7a4da7549c9ec75677782fa2f97e64de0df1259e0ec3b993cfa3eaa4ff50331703ee18ef28f2af0d09839dd3b63ed994e6b29cbfe8ed73f
 AUX broadcom-sta-6.30.223.271-r4-linux-4.8.patch 1835 BLAKE2B 7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900 SHA512 e5959921b6f0cd5d61d7ed568f549b0920f394458c28257c05064b89d7067ce11c8e44ed0e5a48a65bd041c6193d9ae2d02fca2f5efbfb787d3f9001786a4578
 AUX broadcom-sta-6.30.223.271-r5-linux-5.1.patch 829 BLAKE2B 7bb59009307d423e72832d14114b7e6bd016717ace260174b2b9dbc909ec7eb962aec88d930f34ee6c09165e937a2cc271eac7e6b214fe8161a8f76af1aaa83c SHA512 e8780fbff3ed0640b30b44ca777d56bdcf8b23702d4fa827c843919658f022090ca3e2533541f577e7b49133cb2bb3d6ec85bcc9c023a82bea892e231f01a550
+AUX broadcom-sta-6.30.223.271-r5-linux-5.6.patch 3056 BLAKE2B 3842420d177c7faf6ac86e00acd5365cb6499ad82071cf7e37f2b765463c945f9634e73126520934011ee63aefee51937d8ff0baa3b206fc5902f2b15fe151e0 SHA512 9edd068851acf534efa424e9b3b3157e75d029f799c1f3a383eb0a9678fee56d6c01817a055e2fa405bba0c25fa2db89b4665a30a9fd35d4e58056bf85cadabc
 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663
 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17
-EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3763 BLAKE2B 923c9cf82aa607b7a980c2e8608cdba9ba7c2f1ed76da5f16f648e7a2f6e35e29d32c5264999c78c14b5984aed5bdfd6616d5d17b9988de61740cb443a880281 SHA512 b11a485700e3efb06c310a3b296414dce84ce248db166f8efb04254128e7efc5132ecdf4adcf11cb5c254701f590812a850de7d4c8aa0bca79284eeb514afd55
+EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3817 BLAKE2B 4817e0b2188686ba4af9982cfa269898348f25a2d18f1f8547f929fb94f52ae60b95a9fb3e3316500bdf8a5f5556c3ae818b4e5c3a15e87e56292cdfc1150014 SHA512 936c80d538fa007c564a268d2db37cd982c287e5c7be6b31ce4895e38d4cfb5b573750d1b0f0f93a6ebceda19991ff983aef17f5c503d9d8e4be4dfbee93a9e5
 MISC metadata.xml 249 BLAKE2B 4a3b51bf90b3ec35dd72dca3b3c73fb89d3e3d08c0989cd7939205ae9d655200886882c2de26146caac3f42ff06ab4a898b85325bd80e69f39491bf4c34ae89e SHA512 4211cb5a85b6a437c0d1727891123af70f296e685c9d59ead2032abbe19d3828fb83d59e559056455ad8b9aadd6136141ab7f9edaff2d55ce2d86b1d698722ce
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
index 91581b52a4e4..b84669a99696 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-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=7
@@ -84,6 +84,7 @@ PATCHES=(
 		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
 		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
 		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch"
 )
 
 src_install() {
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch
new file mode 100644
index 000000000000..71264346f86e
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch
@@ -0,0 +1,88 @@
+From: Herman van Hazendonk <github.com@herrie.org>
+Date: Tue, 31 Mar 2020 17:09:55 +0200
+Subject: [PATCH] Add fixes for 5.6 kernel
+Origin: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/merge_requests/1
+
+Use ioremap instead of ioremap_nocache and proc_ops instead of
+file_operations on Linux kernel 5.6 and above.
+
+<rosh> Patch amended to adapt i386 arch.
+---
+ src/shared/linux_osl.c |  6 +++++-
+ src/wl/sys/wl_linux.c  | 21 ++++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+index b24a973..9bce9b1 100644
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
+@@ -946,7 +946,11 @@ osl_getcycles(void)
+ void *
+ osl_reg_map(uint32 pa, uint size)
+ {
+-	return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++		return (ioremap((unsigned long)pa, (unsigned long)size));
++	#else
++		return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ }
+ 
+ void
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index ab7b883..10621c2 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -590,10 +590,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
+ 	}
+ 	wl->bcm_bustype = bustype;
+ 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++	if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
++		WL_ERROR(("wl%d: ioremap() failed\n", unit));
++		goto fail;
++	}
++	#else
+ 	if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
+ 		WL_ERROR(("wl%d: ioremap() failed\n", unit));
+ 		goto fail;
+ 	}
++	#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ 
+ 	wl->bar1_addr = bar1_addr;
+ 	wl->bar1_size = bar1_size;
+@@ -780,8 +787,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	if ((val & 0x0000ff00) != 0)
+ 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 		bar1_size = pci_resource_len(pdev, 2);
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++		bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
++			bar1_size);
++		#else
+ 		bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
+ 			bar1_size);
++		#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ 	wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
+ 		pdev->irq, bar1_addr, bar1_size);
+ 
+@@ -3354,12 +3366,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static const struct proc_ops wl_fops = {
++	.proc_read	= wl_proc_read,
++	.proc_write	= wl_proc_write,
++};
++#else
+ static const struct file_operations wl_fops = {
+ 	.owner	= THIS_MODULE,
+ 	.read	= wl_proc_read,
+ 	.write	= wl_proc_write,
+ };
+-#endif
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */
+ 
+ static int
+ wl_reg_proc_entry(wl_info_t *wl)
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 431a684b38e1..021418417b47 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
 DIST chirp-daily-20200430.tar.gz 896763 BLAKE2B a0f318499e76ff9c297c4eeff381650d98ea03d20a0d20d7751485376a9299ba0f59aa88340a0f23cdf4bc70f0038b5376c2c78beb3bc593a09f7a7af22b9021 SHA512 f7b0d6d23df2b85d714c2fabefcc32cf5f30ceb7daca6a5982d47962a1fe4d4b210729d0d78cef28af4f21fcfbc9e4d0e6585b5e841220e9f8b5a7fcad1dd2b0
-EBUILD chirp-20200430.ebuild 1145 BLAKE2B 4a70c363ba60697332975eb4e70f83fa90f9ee7819a45d8c41978a7baa6a874eaafbd10f39050281a23e2be7f884168942fe8b7206dfa12761e0c994d7311a29 SHA512 1b59ac9bb05ade9654392d141f89a4b9cf68e284e0903f01ea1b969b4a88729d730d06b682f62ddd95384750ffcaf3c564aaee7a9caa0dec4e5a3cb443f0eb07
-EBUILD chirp-99999999.ebuild 1145 BLAKE2B 70b7ad1dfee4f5f36f19712b96101ea7369a5af8c56893871a7a72de72aee3eb2f7e75f5e80dd21bb6cc6a6959fa88f3e985080cb48110f046801929cbdb34dd SHA512 aa67f1abdc2e015ac1f48b6bf411be3ea0772962013a83a684cd1dec0dec6e67f383b8b3fbad8202c230574e3285362bd813471a0ad35eb8b839d8d1e0f61a4d
+EBUILD chirp-20200430.ebuild 1147 BLAKE2B eaf2ad93713dbe5900ca388cf84e1beae4d03093fcfbd07fca7a04d857d95d6028fcf2e24d0f77ee06186f190b1862b183af5e21803693f04f31e9b31d779890 SHA512 79b5ca20ec1dc2bdb92c6d24ff496fe0685593fd66dba5c0f8d75660d310dbb6e8e2922d0585ef37bbbd4fe7bad2a827d44fa4ce86eb98a648ad8bd2b94debe1
+EBUILD chirp-99999999.ebuild 1147 BLAKE2B eaf2ad93713dbe5900ca388cf84e1beae4d03093fcfbd07fca7a04d857d95d6028fcf2e24d0f77ee06186f190b1862b183af5e21803693f04f31e9b31d779890 SHA512 79b5ca20ec1dc2bdb92c6d24ff496fe0685593fd66dba5c0f8d75660d310dbb6e8e2922d0585ef37bbbd4fe7bad2a827d44fa4ce86eb98a648ad8bd2b94debe1
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20200430.ebuild b/net-wireless/chirp/chirp-20200430.ebuild
index b82274bfdd51..461b1ed5328b 100644
--- a/net-wireless/chirp/chirp-20200430.ebuild
+++ b/net-wireless/chirp/chirp-20200430.ebuild
@@ -12,14 +12,14 @@ fi
 inherit distutils-r1 xdg-utils ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
+HOMEPAGE="https://chirp.danplanet.com"
 
 RESTRICT="test"
 if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-daily-${PV}"
 fi
 LICENSE="GPL-3"
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
index 0bfe51e65750..461b1ed5328b 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,14 +12,14 @@ fi
 inherit distutils-r1 xdg-utils ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
+HOMEPAGE="https://chirp.danplanet.com"
 
 RESTRICT="test"
 if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-daily-${PV}"
 fi
 LICENSE="GPL-3"
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index c915634d2d4a..9e069e5e67a6 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,6 +1,4 @@
-DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
 DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
-EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-EBUILD dump1090-3.7.2.ebuild 1565 BLAKE2B 8963955f5180a8ec16b3fd406a4b66b671a7e391d41cb30c717e41416c87b323879e835b1fd34c257e0c8e73e8d9c27aeec41b6bb091a357198d0043d3248afa SHA512 ed26737b326570a5af8e6c1725b6f65380c2cf056c1c8fc07cdaa0a5ecb325e8add1b33348681bf9d57f75603e881751ee7e881b5eb7e260185f09ae556129fe
-EBUILD dump1090-9999.ebuild 1558 BLAKE2B c300d6d813531d99ee7e9bae8213dfdfa908b90adda44618ab0da162c89b0ccd4f623f90bcdf6b0ae5cec5f1e485c5abad39297d29c02087d27be0275f965a83 SHA512 290bf679ed1b7ed989f8212e32794a91fd255d2bf4d09648383af6620cb6cffc28752731c45c2c8394581f66361eb5a1b61478d8df8cc2360575689a0e60032c
+EBUILD dump1090-3.7.2.ebuild 1543 BLAKE2B ef4ea5495cd0a264c993ba40bc0a2d564f497b56b8248dfbbb4323bb293159017ac729eb5e17bcdcecd7e56bd04a001a9613e6fc986e3d6b8932039bfccaf272 SHA512 d70dbea5cef1ea41cfbfa430f8800057e12f5bb2a265368d5e7b6310f5386e2a4ed042ed971738efc242df37e098228371c999cf7596bd179d38a48cf58efd6a
+EBUILD dump1090-9999.ebuild 1545 BLAKE2B f4ad78598d6b99c66fa7eb716ecdda2d2091fb1a3e3722d9922f961a6ed58f8ea699c98a1fab6e6fbb4c10a20630955648851defcbeffd9e028b94e74e9fdbe5 SHA512 bc82f2db887f9290883bc82948a43793f5c953fc77dd3bdfb9a58dd405d71444204421bbfaef7767120b46d26379cc1376e8bd30d6706b05f24ad72c9c51630f
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
deleted file mode 100644
index 556e4a14a698..000000000000
--- a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="simple Mode S decoder for RTLSDR devices"
-#Original repo
-#HOMEPAGE="https://github.com/antirez/dump1090"
-#Repo that has actually been touched recenly
-HOMEPAGE="https://github.com/mutability/dump1090"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mutability/${PN}.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-wireless/rtl-sdr
-		virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		UNAME="Linux" \
-		DUMP1090_VERSION=${PV} \
-		CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
-		EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
-		LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
-}
-
-src_install() {
-	dobin ${PN}
-	dobin view1090
-	dodoc README.md
-
-	insinto /usr/share/${PN}/html
-	doins -r public_html/*
-
-	insinto /usr/share/${PN}/tools
-	doins -r tools/*
-
-	newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
-	newdoc debian/nginx/dump1090-mutability nginx.conf
-}
diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild
index bb2497770e1e..742de05fd100 100644
--- a/net-wireless/dump1090/dump1090-3.7.2.ebuild
+++ b/net-wireless/dump1090/dump1090-3.7.2.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://github.com/flightaware/dump1090"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS="amd64 x86"
 else
 	KEYWORDS="amd64 x86"
 	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index a34578ba1b3d..f0099d87455f 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-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
@@ -16,7 +16,6 @@ HOMEPAGE="https://github.com/flightaware/dump1090"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 0ecb89c0ca90..b242b17fd321 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,12 +1,11 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
 AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
-DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
-EBUILD gnuradio-3.6.5.1-r3.ebuild 5339 BLAKE2B 40342241899afb64e9ef4bd4c3ddf74e488dfcef7290c733589868bc17cb12bb9f4dadfccb987817c278921e2606a5fbec15a136823839df696c689cda104548 SHA512 d7427110295bbe6c561ff98b859725498b93e4a479e73e17a6e0dbf766ef9c3d5e18f66ab61ed98c01ef4655d225d45c49f0d9be5e26f9f7cce5e990531535c4
+DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
 EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
-EBUILD gnuradio-3.7.9999.ebuild 7383 BLAKE2B c6178e81d4a1a982a8cc9a305faad53cbd04836a4a2ddc6aa6f10785f09ab40d3c3ac5d4a8a41b1dbd0ee5529409e8b7b1ca869525a56a424dcfe535597f6bd0 SHA512 566f559aed55f2e8f58d4818c90722b20a13d242d155a0512e17c923a4beab9aaa1c1c86290618cba78c7ec3868b7414518c1df428e36b2cb649631179222853
-EBUILD gnuradio-9999.ebuild 7340 BLAKE2B 3184d2a662f4b5b1974bd3b520e3d03a04098b23196f5cd346dbda30a4a05e3b801231dcd171e8aa3f5075452574d73a50d97e6473f88f4ad8cb9d56bf0df930 SHA512 74975e565a74ac889d37f299a2bcdc06a87f9e6fb63da0d9fbfea4df3dab3812c82f1740736042f09223e695302fd4bd7cbe43503bebee2dac33bb1df898b7e9
-MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
+EBUILD gnuradio-3.8.1.0-r1.ebuild 5995 BLAKE2B cb288a4e5610db280d7f508c22084a94c8a7482333a9e9704b28f6bf71c8b32f25f68c9fcd1d4488cd230fca8fd5bc965d8956259090d031116678820ec1686d SHA512 27c9e8e47489fd91464217756626848b04c749a181ff71e8f983a227d3a70e52e8d4c687d25c4b6671654fc12956cb226249525164d07345c81001aab462e14c
+EBUILD gnuradio-9999.ebuild 6019 BLAKE2B e620da24a69f4b285e34752cac338dff0343a0f77501f8fcd93c76aa860328cc55b8b128ea37fcb6318fcdcb97888edf43dd083f6786cc284ccbafc7fee465f0 SHA512 babb6b819b29a57497b56f555adf45ffc688747dab5f1a19a82297eb1801a5b75a129abda8115d7f5495e675afc2248764002553d5fa47afc2c2c7451b53d1ac
+MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
deleted file mode 100644
index a38d393dfebb..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		analog? ( filter )
-		digital? ( filter analog )
-		pager? ( filter analog )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-	')
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-util/cppunit
-	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
-	)
-	grc? (
-		$(python_gen_cond_dep '
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
-	wavelet? (
-		sci-libs/gsl
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-		doc? (
-			>=app-doc/doxygen-1.5.7.1
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
-"
-
-src_prepare() {
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	mycmakeargs=(
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		-DENABLE_GR_QTGUI=OFF \
-		-DENABLE_GR_WXGUI=OFF \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
deleted file mode 100644
index f8ecf5a77873..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint-3.7"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-		!<=dev-libs/boost-1.52.0-r6:0/1.52
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		wxwidgets? (
-			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	#zeromq missing deps isn't fatal
-	python_export PYTHON_SITEDIR
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI=OFF
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
new file mode 100644
index 000000000000..3fd0a24eac18
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils desktop
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
+	)
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
+			)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test()
+{
+	virtx cmake_src_test
+}
+
+pkg_postinst()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 7bbe445db144..aa068b0e06b5 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -13,107 +13,101 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="pybind"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint"
-fi
 
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt5? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
 
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
 	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
 	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
-		dev-libs/log4cpp )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
-	zeromq? ( >=net-libs/zeromq-2.1.11
-			dev-libs/gmp:= )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		)
-		qt5? (
-			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			x11-libs/qwt:6[qt5(+)]
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
 			)
-		)
-	')
-	"
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
 
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
 DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
 	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
@@ -122,52 +116,35 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	gnome2_environment_reset #534582
+	xdg_environment_reset #534582
 
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
-	python_export PYTHON_SITEDIR
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
 		-DENABLE_PYTHON=ON
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
 		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
 		-DENABLE_GR_CHANNELS="$(usex channels)"
 		-DENABLE_GR_DIGITAL="$(usex digital)"
 		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
 		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
 		-DENABLE_GR_FEC="$(usex fec)"
 		-DENABLE_GR_FILTER="$(usex filter)"
 		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
 		-DENABLE_TESTING="$(usex test)"
 		-DENABLE_GR_TRELLIS="$(usex trellis)"
 		-DENABLE_GR_UHD="$(usex uhd)"
@@ -175,21 +152,18 @@ src_configure() {
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
 		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DDESIRED_QT_VERSION="$(usex qt5 5)"
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples ; then
 		dodir /usr/share/doc/${PF}/
@@ -205,7 +179,7 @@ src_install() {
 		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
 	fi
 
-	# We install the mimetypes to the correct locations from the ebuild
+	# Remove duplicated icons, MIME and desktop files and installation script
 	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
 	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
 
@@ -220,46 +194,30 @@ src_install() {
 	fi
 
 	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
 }
 
 src_test()
 {
-	ctest -E qtgui
+	virtx cmake_src_test
 }
 
 pkg_postinst()
 {
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
 	if use grc ; then
 		xdg_desktop_database_update
+		xdg_icon_cache_update
 		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
 	fi
 }
 
 pkg_postrm()
 {
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
 	if use grc ; then
 		xdg_desktop_database_update
+		xdg_icon_cache_update
 		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
 	fi
 }
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index c1685236ff6d..5d03b8a37dbf 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="filter">enable filter signal processing blocks</flag>
 		<flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
 		<flag name="log">enable logging to console and files</flag>
+		<flag name="modtool">enable modtool for editing GNU Radio modules and components</flag>
 		<flag name="noaa">enable NOAA POES HRPT receiver blocks</flag>
 		<flag name="pager">enable pager signal processing blocks</flag>
 		<flag name="performance-counters">enable block performance counters</flag>
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index fc5035429423..593891db1828 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,7 +1,7 @@
 AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
 DIST gqrx-2.12.1.tar.gz 1334839 BLAKE2B 9ad8ab710675f4b42ff652d642026aba00dad63867f836662054aaab89cc7788874cc0f47de531257ee901f3bc58a6e6d5aef3c5a4fe30ae367d24fcd87ae763 SHA512 28d3da6c4ff750cf580db658aee267162a64103e9dac1d212f70df6bc602c8d50ccb7aaf88c7e976cfa235b884e02b4994e679f69aed640485c44ed07f183cc9
-EBUILD gqrx-2.11.5-r1.ebuild 1459 BLAKE2B eb187a1ae71a56d79159e3aaf6b15ccc48d81e372b665db9eec4573fbce301cb184fbc3091715fcb9b74c9d285c93c994d4b448d268ad50a00f0e31ae9936c91 SHA512 889b96b65b854bd48949298bb2739b684b1f3db1db6c37e04653afbc1de1af5536967b002fc5145a23059ba19f9c2faa76b43eb980168f397664975d089e28c8
-EBUILD gqrx-2.12.1.ebuild 1395 BLAKE2B eba3edcfa3ce0dba98ca2e7271b0ac9e65600a1def80ef1bb41f85ebaacff29bba2a763ba183271e415e7ce6a776f47316197297fdefba594db504de4816900f SHA512 8697e7b3e7601201ad72ade7515ca64993e853bf4c38b04edea36bb485f8ed325d5d7df04aaaf4a8abee68bb8efbd8367c28195a9ddcd04cce5df91d0e117754
-EBUILD gqrx-9999.ebuild 1395 BLAKE2B eba3edcfa3ce0dba98ca2e7271b0ac9e65600a1def80ef1bb41f85ebaacff29bba2a763ba183271e415e7ce6a776f47316197297fdefba594db504de4816900f SHA512 8697e7b3e7601201ad72ade7515ca64993e853bf4c38b04edea36bb485f8ed325d5d7df04aaaf4a8abee68bb8efbd8367c28195a9ddcd04cce5df91d0e117754
+EBUILD gqrx-2.11.5-r1.ebuild 1460 BLAKE2B 88cf1bfa99c38b3b4bf74de16b0cd3d624f24fe9a7d8801ea0fc1e79114fea5c2eac6ec441fa6da08a31317b87c7a7266063b4867b3c33d32f7a5b37961fe041 SHA512 4dda5191329758fd82c199a595e44a2e2aae879ecc603ff975e87121713a628f6a1e7d8a78456d77bdb20c6f9804eda1dcf3314e97c5a1fc21ed6d3e78dd2aa4
+EBUILD gqrx-2.12.1.ebuild 1396 BLAKE2B 92ba0267d2583fb7d303bfd738a052870b9c3b867a1cacb0a805175d2788917ebd00556e0319f6d6ad1d6a5894bbfca578cf2c3cb89bf269d05e2d5d200b2589 SHA512 dea8b2cf69f669556478326aac9c6c7212795b16503c1c7808fe556692249edb63941ff345420f0f19f65861340503994a381a3bd0a645dfd21dd36a4004f389
+EBUILD gqrx-9999.ebuild 1396 BLAKE2B 92ba0267d2583fb7d303bfd738a052870b9c3b867a1cacb0a805175d2788917ebd00556e0319f6d6ad1d6a5894bbfca578cf2c3cb89bf269d05e2d5d200b2589 SHA512 dea8b2cf69f669556478326aac9c6c7212795b16503c1c7808fe556692249edb63941ff345420f0f19f65861340503994a381a3bd0a645dfd21dd36a4004f389
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
index 827cbf70e3de..982b78c3a0f2 100644
--- a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
+++ b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils eutils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
+HOMEPAGE="https://gqrx.dk/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
diff --git a/net-wireless/gqrx/gqrx-2.12.1.ebuild b/net-wireless/gqrx/gqrx-2.12.1.ebuild
index 0c8ea0281cd0..5497f6b12fd5 100644
--- a/net-wireless/gqrx/gqrx-2.12.1.ebuild
+++ b/net-wireless/gqrx/gqrx-2.12.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
+HOMEPAGE="https://gqrx.dk/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index 0c8ea0281cd0..5497f6b12fd5 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
+HOMEPAGE="https://gqrx.dk/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 12909b33d6fd..be91a7f66642 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,6 @@
-DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96
-EBUILD gr-ieee802154-0.0_p20180402.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
-EBUILD gr-ieee802154-9999.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
+DIST gr-ieee802154-0.0_p20190606.tar.gz 195541 BLAKE2B f565808788c463816633774362be0bf6e6900db52051ef4f8e2eed5b110c7b9edcf05458f8a4a8e3afef59c4a76101a5606ea9c9023ad922162ee9466cc7e343 SHA512 b430ee6c16356307566619cd50258c3fd05ca198a67f0b47eea6b8d1038de6cc070823dd7392a56c4308cd74495802b4b52a4a425ce43ce4afb56386ec5fa39a
+DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86
+EBUILD gr-ieee802154-0.0_p20190606.ebuild 1351 BLAKE2B 268f659fe1b7219fa2e515613fcbe0052637b847996193e436e87d7866783c54ae30d85a43657c030fe73b0f1f7d87558b936044e3abe85b3706ae4e85da1ec1 SHA512 68fa564c2187038c01221086ca7a7a86413c5bb6199a276d289722eb81fbe1a3f2e3803577aaeb1253ec6afbc6d5d5fdb3d22b6f9bfa75c3e384b69afad75183
+EBUILD gr-ieee802154-0.0_p20191006.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
+EBUILD gr-ieee802154-9999.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
similarity index 80%
rename from net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
rename to net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
index e99620f1b2aa..89e8afbf67b3 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
@@ -1,7 +1,7 @@
 # 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 cmake-utils python-single-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
 else
-	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	COMMIT="d3d94023c71af9e6d7721f7412fba88ff5325234"
 	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -23,15 +23,13 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,10 +38,14 @@ src_prepare() {
 	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
new file mode 100644
index 000000000000..48499a6bf347
--- /dev/null
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.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,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
+HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
+	KEYWORDS=""
+else
+	COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17"
+	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-libs/gmp
+	sci-libs/volk
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#although cppunit is not used, it fails if it isn't there, fix it
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index e99620f1b2aa..48499a6bf347 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
 else
-	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17"
 	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -23,15 +23,15 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
+	dev-libs/gmp
+	sci-libs/volk
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,10 +40,19 @@ src_prepare() {
 	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index b54aa8912b65..69cebe5eca97 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,4 +1,6 @@
 DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
-EBUILD gr-iio-0.3-r2.ebuild 789 BLAKE2B 3bfd3e8b59f16c7c68840a1fcb4741ff29e1d48e08d1ceb0f39b9f9f8ca7dcf201cceeedad2b935d2c5c4bd8516e6363a3faee350150dbc541fc014d01b556b2 SHA512 e33665008b48fc3473516ccc5682f309de134e2e3f7d76842931fbdf52990ee532fb6dbbc0c9f702f749828ade080eaedd90612e5ba8630f0c269b81b8cae50e
-EBUILD gr-iio-9999.ebuild 789 BLAKE2B 3bfd3e8b59f16c7c68840a1fcb4741ff29e1d48e08d1ceb0f39b9f9f8ca7dcf201cceeedad2b935d2c5c4bd8516e6363a3faee350150dbc541fc014d01b556b2 SHA512 e33665008b48fc3473516ccc5682f309de134e2e3f7d76842931fbdf52990ee532fb6dbbc0c9f702f749828ade080eaedd90612e5ba8630f0c269b81b8cae50e
+DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
+EBUILD gr-iio-0.3-r3.ebuild 787 BLAKE2B 09d0be1cc71419bd6860607576addfde2c65eff09cc7f60182467dcee686d6a044fe033a653b1db27971d68eee94a6ba7c4f6f7827ecc08191798a0f50a89938 SHA512 688f3b54237474f15eaa535b37025c0173cfd5034d78ef30524634700182a464f35f6c3805bf03cbc2de693a3dc0a902e475b61cc3c3894685fd4af7fb1d24ef
+EBUILD gr-iio-0.3_p20191219-r1.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
+EBUILD gr-iio-9999.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 MISC metadata.xml 434 BLAKE2B 565c3b42597436890ea7bc2d5b13d16720480e8932878c73bc3efe0708ca6ad2e900b7595248dfc0e25fbca17ad3f216bdfc02c0f29519013db5ac8137a09a7c SHA512 1e970d2cfc935f25ad3cde099739a9574c8bcae6a4e8c59d7aba6bd01319155d9bfc80124d2dad649f24aa7a937bdad7cc843525282f72b10e5e999eca7a4f49
diff --git a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
similarity index 90%
rename from net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
rename to net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
index ed62ac0d9684..cc5dd36528ff 100644
--- a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
+++ b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -22,7 +22,7 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:=
+	=net-wireless/gnuradio-3.7*:=
 	dev-libs/boost:=
 	net-libs/libiio:=
 	net-libs/libad9361-iio:="
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
new file mode 100644
index 000000000000..b86aad9b816d
--- /dev/null
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio IIO Blocks"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+	EGIT_BRANCH="upgrade-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	=net-wireless/gnuradio-3.8*:=
+	dev-libs/boost:=
+	net-libs/libiio:=
+	dev-libs/gmp
+	sci-libs/volk
+	net-libs/libad9361-iio:="
+
+DEPEND="${RDEPEND}
+	sys-devel/flex:=
+	sys-devel/bison:=
+	dev-util/cppunit:=
+	dev-lang/swig:0"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
index ed62ac0d9684..b86aad9b816d 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -1,20 +1,23 @@
-# 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
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNU Radio IIO Blocks"
 HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+	EGIT_BRANCH="upgrade-3.8"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="GPL-3+"
@@ -22,9 +25,11 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:=
+	=net-wireless/gnuradio-3.8*:=
 	dev-libs/boost:=
 	net-libs/libiio:=
+	dev-libs/gmp
+	sci-libs/volk
 	net-libs/libad9361-iio:="
 
 DEPEND="${RDEPEND}
@@ -32,3 +37,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison:=
 	dev-util/cppunit:=
 	dev-lang/swig:0"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index ad4fed5e84b7..d5240d4f0ee5 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,4 +1,6 @@
-DIST gr-iqbal-0.37.2.tar.xz 71340 BLAKE2B 1605c520a7ff0088a24ea79e181b36261cdf849438aa3ef4a499228a372297017d3bbc4c96279f9b1bceb7b690aa7b6081b6e970a337e03c766dab5149fff199 SHA512 00037a535219ebe3b5244d4a09355cc74bf17aa6a935bff135e9d7c7c7f6bc1c8b7a29edc02132dbacda2c41efa3613c09e6fdc222472e58d88c4c076736842e
-EBUILD gr-iqbal-0.37.2.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
-EBUILD gr-iqbal-9999.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
+DIST gr-iqbal-0.37.3.tar.gz 105924 BLAKE2B 25eddc718e2b6d5c679a0d6f199d9d49ff69b535502bf9449d7561ae8c172014a5058cee7ef692a36ec518408747d63d01a23c963f45a5d4b5f58175c49f5bbc SHA512 04ac24e2cc8ebf458088e4d8b005818d3f2496fdc801779dc276c21ee751520039078d5157022a886494f8d62b586d69c703e83fb0539e775ce95e3ca34cf374
+DIST gr-iqbal-0.38.1.tar.gz 106392 BLAKE2B 009f36dcf34127e80d8afa91196906a2b2dc8696dd16f9e7d6d9011d9baf2e4c2dfac78eb1acabcbe52dd88ce08b15f8da407b141585f2c60fd63549218576e0 SHA512 b2f74bba560478b746ad1b11d70202fa2d396462f4806918379543fc69a915346745b34f9ffb2914091ec677295f6f378a5b22641c26aa37c5e23092623b5cee
+EBUILD gr-iqbal-0.37.3.ebuild 708 BLAKE2B b02d0481770d6b05038a0eec9b5f69bcb02866e6436229f523cc204faace02ba17f0350e3ecff4d3827d3a10e6d3ada25a7fb16523f81ef268ec29df5002f2fe SHA512 d93be823cf734ce2a96aa0fe7ea4a25dc590c1fd90f5320caf340b9dfda90c2da1108d5b0195dd6ea3a949ca1d38b194ab32f60d6fb65147ef158d9dbf6cf1e1
+EBUILD gr-iqbal-0.38.1.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
+EBUILD gr-iqbal-9999.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
similarity index 69%
rename from net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
rename to net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
index 1ed8501d81d5..c1920c8ed5ed 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
@@ -1,7 +1,7 @@
 # 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 cmake-utils python-single-r1
@@ -11,11 +11,9 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -23,9 +21,9 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
new file mode 100644
index 000000000000..716aaa6176fc
--- /dev/null
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.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 cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio I/Q balancing"
+HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
+else
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	net-libs/libosmo-dsp:=
+	dev-libs/boost:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN="$(usex doc)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 1ed8501d81d5..716aaa6176fc 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit cmake-utils python-single-r1
 
@@ -11,21 +11,31 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE=""
+IUSE="doc"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN="$(usex doc)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 73da69406661..c43557d7aff7 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,6 @@
-AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
-DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
-EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2205 BLAKE2B 4120f8b37dca5a30a842b6a6d37ce8dd36b04ac8bb55a034b6578bc3fa089962041bdf948ff06e1c8f0004076d8f4e094c9d6e1d8aa04908511f0e49d0c87642 SHA512 6954a1bba9e4f3f5010722e095803c00ff2125d03ba806f255546d655d25eb89ba88c485aeead5cd8505a1cdbee64dab04b521d62f5140b84d912b6a236794d3
-EBUILD gr-osmosdr-0.1.5.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
-EBUILD gr-osmosdr-9999.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
-MISC metadata.xml 1064 BLAKE2B 5f01d598ec69e9f78d594a33487b58242049b020461fbae3e2eaf51d4d894c01c9bc73af28b101bc855e09567c16176d56fbe52b77b7cb719ce2d8ef3f6459a9 SHA512 8f4b7a3cbdf0b0edb3e707cb8c44d5e40e72dc87d36312865647996181c419f4a67c6783110abbdb150264ca9e49cca3264ba39098acf0b05955dff3fdf29072
+DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
+EBUILD gr-osmosdr-0.1.5-r1.ebuild 1926 BLAKE2B a61337ac088431d18e5e2bd04b0bcf8c60b1519e07c0b86a61dbb23e74346796fdf1ff6a16258365f88f2bab3628934fafd8774d728c5f50befb2d68e3f9a5ce SHA512 3ebb20e9c58fd195b6c59d885cd0f4f6cc88af32dabd0cc2da2567eb0aa997cdbf72b616ad375350faa43c87bc3c4baae7dc3160d8e80c468bd47985c7c4383c
+EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+EBUILD gr-osmosdr-9999.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+MISC metadata.xml 965 BLAKE2B 6dbc466abe93e1ffef58f8f07ac4326ced3e9399c86fcb3135c16293065d0c9dfca6584e527b1d60f4fbaee6322ff6ed7a5c5a8ae20c8f985d0488a94352e8ea SHA512 2c744ddfec67ffd438ea76afc037e6ff7480d5349b63e00ac74dff191f33f3f9ecde08ee167b568b64a7dea33d3efbf67be582f1613bd8f8a5e0d29275a8da77
diff --git a/net-wireless/gr-osmosdr/files/csete-iio.patch b/net-wireless/gr-osmosdr/files/csete-iio.patch
deleted file mode 100644
index 678a8599d058..000000000000
--- a/net-wireless/gr-osmosdr/files/csete-iio.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-From 0eaf819be8a40896dfc3d810685a609a867a42e9 Mon Sep 17 00:00:00 2001
-From: Alexandru Csete <oz9aec@gmail.com>
-Date: Mon, 13 Feb 2017 01:05:50 +0100
-Subject: [PATCH] Add PlutoSDR source through gr-iio
-
----
- CMakeLists.txt                      |   1 +
- cmake/Modules/FindGnuradioIIO.cmake |  34 ++++
- cmake/Modules/FindIIO.cmake         |  28 +++
- lib/CMakeLists.txt                  |   8 +
- lib/config.h.in                     |   1 +
- lib/device.cc                       |   8 +
- lib/plutosdr/CMakeLists.txt         |  39 +++++
- lib/plutosdr/plutosdr_source_c.cc   | 262 ++++++++++++++++++++++++++++
- lib/plutosdr/plutosdr_source_c.h    | 105 +++++++++++
- lib/source_impl.cc                  |  18 ++
- 10 files changed, 504 insertions(+)
- create mode 100644 cmake/Modules/FindGnuradioIIO.cmake
- create mode 100644 cmake/Modules/FindIIO.cmake
- create mode 100644 lib/plutosdr/CMakeLists.txt
- create mode 100644 lib/plutosdr/plutosdr_source_c.cc
- create mode 100644 lib/plutosdr/plutosdr_source_c.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 296456d..7871f39 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,6 +159,7 @@ endif()
- find_package(GnuradioIQBalance)
- find_package(UHD)
- find_package(GnuradioUHD)
-+find_package(GnuradioIIO)
- find_package(GnuradioFCD)
- find_package(GnuradioFCDPP)
- find_package(LibOsmoSDR)
-diff --git a/cmake/Modules/FindGnuradioIIO.cmake b/cmake/Modules/FindGnuradioIIO.cmake
-new file mode 100644
-index 0000000..d3c011a
---- /dev/null
-+++ b/cmake/Modules/FindGnuradioIIO.cmake
-@@ -0,0 +1,34 @@
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_GNURADIO_IIO gnuradio-iio)
-+
-+FIND_PATH(
-+    GNURADIO_IIO_INCLUDE_DIRS
-+    NAMES gnuradio/iio/api.h
-+    HINTS $ENV{GNURADIO_IIO_DIR}/include
-+        ${PC_GNURADIO_IIO_INCLUDEDIR}
-+    PATHS /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    GNURADIO_IIO_LIBRARIES
-+    NAMES gnuradio-iio
-+    HINTS $ENV{GNURADIO_IIO_DIR}/lib
-+        ${PC_GNURADIO_IIO_LIBDIR}
-+    PATHS /usr/local/lib
-+          /usr/local/lib64
-+          /usr/lib
-+          /usr/lib64
-+)
-+
-+if(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+  set(GNURADIO_IIO_FOUND TRUE CACHE INTERNAL "gnuradio-iio found")
-+  message(STATUS "Found gnuradio-iio: ${GNURADIO_IIO_INCLUDE_DIRS}, ${GNURADIO_IIO_LIBRARIES}")
-+else(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+  set(GNURADIO_IIO_FOUND FALSE CACHE INTERNAL "gnuradio-iio found")
-+  message(STATUS "gnuradio-iio not found.")
-+endif(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_IIO DEFAULT_MSG GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
-diff --git a/cmake/Modules/FindIIO.cmake b/cmake/Modules/FindIIO.cmake
-new file mode 100644
-index 0000000..bb87a4b
---- /dev/null
-+++ b/cmake/Modules/FindIIO.cmake
-@@ -0,0 +1,28 @@
-+########################################################################
-+# Find the IIO userspace library
-+########################################################################
-+
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_IIO iio)
-+
-+FIND_PATH(
-+    IIO_INCLUDE_DIRS
-+    NAMES iio.h
-+    HINTS $ENV{IIO_DIR}/include
-+        ${PC_IIO_INCLUDEDIR}
-+    PATHS /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    IIO_LIBRARIES
-+    NAMES iio
-+    HINTS $ENV{IIO_DIR}/lib
-+        ${PC_IIO_LIBDIR}
-+    PATHS /usr/local/lib
-+          /usr/lib
-+)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(IIO DEFAULT_MSG IIO_LIBRARIES IIO_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(IIO_LIBRARIES IIO_INCLUDE_DIRS)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index c05b8d9..936d84b 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -174,6 +174,14 @@ if(ENABLE_UHD)
- GR_INCLUDE_SUBDIRECTORY(uhd)
- endif(ENABLE_UHD)
- 
-+########################################################################
-+# Setup IIO component
-+########################################################################
-+GR_REGISTER_COMPONENT("IIO Devices" ENABLE_IIO GNURADIO_IIO_FOUND)
-+if(ENABLE_IIO)
-+GR_INCLUDE_SUBDIRECTORY(plutosdr)
-+endif(ENABLE_IIO)
-+
- ########################################################################
- # Setup MiriSDR component
- ########################################################################
-diff --git a/lib/config.h.in b/lib/config.h.in
-index 42e72f1..0fe2731 100644
---- a/lib/config.h.in
-+++ b/lib/config.h.in
-@@ -10,6 +10,7 @@
- #cmakedefine ENABLE_RTL
- #cmakedefine ENABLE_RTL_TCP
- #cmakedefine ENABLE_UHD
-+#cmakedefine ENABLE_IIO
- #cmakedefine ENABLE_MIRI
- #cmakedefine ENABLE_SDRPLAY
- #cmakedefine ENABLE_HACKRF
-diff --git a/lib/device.cc b/lib/device.cc
-index 025a22b..77b271f 100644
---- a/lib/device.cc
-+++ b/lib/device.cc
-@@ -54,6 +54,10 @@
- #include <uhd_source_c.h>
- #endif
- 
-+#ifdef ENABLE_IIO
-+#include <plutosdr_source_c.h>
-+#endif
-+
- #ifdef ENABLE_MIRI
- #include <miri_source_c.h>
- #endif
-@@ -162,6 +166,10 @@ devices_t device::find(const device_t &hint)
-   BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
-     devices.push_back( device_t(dev) );
- #endif
-+#ifdef ENABLE_IIO
-+  BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
-+    devices.push_back( device_t(dev) );
-+#endif
- #ifdef ENABLE_MIRI
-   BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
-     devices.push_back( device_t(dev) );
-diff --git a/lib/plutosdr/CMakeLists.txt b/lib/plutosdr/CMakeLists.txt
-new file mode 100644
-index 0000000..b335885
---- /dev/null
-+++ b/lib/plutosdr/CMakeLists.txt
-@@ -0,0 +1,39 @@
-+# Copyright 2012 Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Radio
-+#
-+# GNU Radio is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GNU Radio is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Radio; see the file COPYING.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street,
-+# Boston, MA 02110-1301, USA.
-+
-+########################################################################
-+# This file included, use CMake directory variables
-+########################################################################
-+
-+include_directories(
-+    ${CMAKE_CURRENT_SOURCE_DIR}
-+    ${GNURADIO_IIO_INCLUDE_DIRS}
-+    ${IIO_INCLUDE_DIRS}
-+)
-+
-+set(iio_srcs
-+#    ${CMAKE_CURRENT_SOURCE_DIR}/iio_sink_c.cc
-+    ${CMAKE_CURRENT_SOURCE_DIR}/plutosdr_source_c.cc
-+)
-+
-+########################################################################
-+# Append gnuradio-osmosdr library sources
-+########################################################################
-+list(APPEND gr_osmosdr_srcs ${iio_srcs})
-+list(APPEND gr_osmosdr_libs ${GNURADIO_IIO_LIBRARIES} ${IIO_LIBRARIES})
-diff --git a/lib/plutosdr/plutosdr_source_c.cc b/lib/plutosdr/plutosdr_source_c.cc
-new file mode 100644
-index 0000000..009d4b2
---- /dev/null
-+++ b/lib/plutosdr/plutosdr_source_c.cc
-@@ -0,0 +1,262 @@
-+/* -*- c++ -*- */
-+/*
-+ * Copyright 2017 Dimitri Stolnikov <horiz0n@gmx.net>
-+ *
-+ * GNU Radio is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3, or (at your option)
-+ * any later version.
-+ *
-+ * GNU Radio is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with GNU Radio; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+#include <boost/assign.hpp>
-+#include <iostream>
-+
-+#include "arg_helpers.h"
-+#include "osmosdr/source.h"
-+#include "plutosdr_source_c.h"
-+
-+using namespace boost::assign;
-+
-+plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args)
-+{
-+  return gnuradio::get_initial_sptr(new plutosdr_source_c(args));
-+}
-+
-+plutosdr_source_c::plutosdr_source_c(const std::string &args) :
-+    gr::hier_block2("plutosdr_source_c",
-+                   gr::io_signature::make(0, 0, 0),
-+                   gr::io_signature::make(1, 1, sizeof(gr_complex)))
-+{
-+  uri = "ip:pluto.local";
-+  frequency = 434000000;
-+  samplerate = 2500000;
-+  decimation = 0;
-+  bandwidth = 2000000;
-+  buffer_size = 0x4000;
-+  quadrature = true;
-+  rfdc = true;
-+  bbdc = true;
-+  gain_auto = false;
-+  gain_value = 50;
-+  filter = "";
-+  filter_auto = true;
-+  _freq_corr = 0.0;
-+
-+  dict_t dict = params_to_dict(args);
-+  if (dict.count("uri"))
-+    uri = boost::lexical_cast< std::string >( dict["uri"] );
-+
-+  std::cerr << "Using PlutoSDR URI = " << uri << std::endl;
-+
-+  _src = gr::iio::pluto_source::make(uri, frequency, samplerate,
-+                                     bandwidth, buffer_size,
-+                                     quadrature, rfdc, bbdc,
-+                                     "manual", gain_value,
-+                                     filter.c_str(), filter_auto);
-+
-+  connect( _src, 0, self(), 0 );
-+}
-+
-+plutosdr_source_c::~plutosdr_source_c()
-+{
-+}
-+
-+std::vector< std::string > plutosdr_source_c::get_devices()
-+{
-+  std::vector< std::string > devices;
-+
-+  std::string args = "plutosdr,label='PlutoSDR'";
-+
-+  devices.push_back( args );
-+
-+  return devices;
-+}
-+
-+std::string plutosdr_source_c::name()
-+{
-+  return "PlutoSDR";
-+}
-+
-+size_t plutosdr_source_c::get_num_channels()
-+{
-+  return output_signature()->max_streams();
-+}
-+
-+osmosdr::meta_range_t plutosdr_source_c::get_sample_rates( void )
-+{
-+  osmosdr::meta_range_t rates;
-+
-+  rates += osmosdr::range_t( 2500000 );
-+  rates += osmosdr::range_t( 5000000 );
-+  rates += osmosdr::range_t( 10000000 );
-+  rates += osmosdr::range_t( 20000000 );
-+
-+  return rates;
-+}
-+
-+double plutosdr_source_c::set_sample_rate( double rate )
-+{
-+  samplerate = (unsigned long) rate;
-+  set_params();
-+
-+  return samplerate;
-+}
-+
-+double plutosdr_source_c::get_sample_rate( void )
-+{
-+  return samplerate;
-+}
-+
-+osmosdr::freq_range_t plutosdr_source_c::get_freq_range( size_t chan )
-+{
-+  osmosdr::freq_range_t range;
-+
-+  range += osmosdr::range_t( 70.0e6, 6000.0e6, 1.0 );
-+
-+  return range;
-+}
-+
-+double plutosdr_source_c::set_center_freq( double freq, size_t chan )
-+{
-+  frequency = (unsigned long long) freq;
-+  set_params();
-+
-+  return freq;
-+}
-+
-+double plutosdr_source_c::get_center_freq( size_t chan )
-+{
-+  return frequency;
-+}
-+
-+double plutosdr_source_c::set_freq_corr( double ppm, size_t chan)
-+{
-+  _freq_corr = ppm;
-+  set_params();
-+
-+  return ppm;
-+}
-+
-+double plutosdr_source_c::get_freq_corr( size_t chan)
-+{
-+  return _freq_corr;
-+}
-+
-+std::vector<std::string> plutosdr_source_c::get_gain_names( size_t chan )
-+{
-+  std::vector< std::string > gains;
-+
-+  gains.push_back( "RF" );
-+
-+  return gains;
-+}
-+
-+osmosdr::gain_range_t plutosdr_source_c::get_gain_range( size_t chan)
-+{
-+  osmosdr::gain_range_t range;
-+  range += osmosdr::range_t( -10, 77, 1 );   // https://wiki.analog.com/resources/tools-software/linux-drivers/iio-transceiver/ad9361#rx_gain_control
-+
-+  return range;
-+}
-+
-+osmosdr::gain_range_t plutosdr_source_c::get_gain_range( const std::string & name,
-+                                                         size_t chan)
-+{
-+  osmosdr::gain_range_t range;
-+
-+  range += osmosdr::range_t( -10, 77, 1 );
-+
-+  return range;
-+}
-+
-+bool plutosdr_source_c::set_gain_mode( bool automatic, size_t chan )
-+{
-+  gain_auto = automatic;
-+  set_params();
-+
-+  return automatic;
-+}
-+
-+bool plutosdr_source_c::get_gain_mode( size_t chan )
-+{
-+  return gain_auto;
-+}
-+
-+double plutosdr_source_c::set_gain( double gain, size_t chan )
-+{
-+  gain_value = gain;
-+  set_params();
-+
-+  return gain;
-+}
-+
-+double plutosdr_source_c::set_gain( double gain, const std::string & name, size_t chan )
-+{
-+  gain_value = gain;
-+  set_params();
-+
-+  return gain;
-+}
-+
-+double plutosdr_source_c::get_gain( size_t chan )
-+{
-+  return gain_value;
-+}
-+
-+double plutosdr_source_c::get_gain( const std::string & name, size_t chan )
-+{
-+  return gain_value;
-+}
-+
-+std::vector< std::string > plutosdr_source_c::get_antennas( size_t chan )
-+{
-+  std::vector< std::string > antennas;
-+
-+  antennas += get_antenna( chan );
-+
-+  return antennas;
-+}
-+
-+std::string plutosdr_source_c::set_antenna( const std::string & antenna, size_t chan )
-+{
-+  return get_antenna( chan );
-+}
-+
-+std::string plutosdr_source_c::get_antenna( size_t chan )
-+{
-+  return "A_BALANCED";
-+}
-+
-+double plutosdr_source_c::set_bandwidth( double bw, size_t chan )
-+{
-+  if (bw == 0.0)
-+    bw = 0.8 * samplerate;  // auto bandwidth
-+
-+  bandwidth = (unsigned long)bw;
-+  set_params();
-+  return bandwidth;
-+}
-+
-+double plutosdr_source_c::get_bandwidth( size_t chan )
-+{
-+  return bandwidth;
-+}
-+
-+void plutosdr_source_c::set_params( void )
-+{
-+  unsigned long long freq = ((double)frequency * (1.0 + _freq_corr * 0.000001));
-+
-+  // FIXME: gain_mode string can be manual / slow_attack / fast_attack / hybrid
-+  _src->set_params( freq, samplerate, bandwidth, quadrature, rfdc, bbdc,
-+                    gain_auto ? "fast_attack" : "manual", gain_value,
-+                    filter.c_str(), filter_auto );
-+}
-diff --git a/lib/plutosdr/plutosdr_source_c.h b/lib/plutosdr/plutosdr_source_c.h
-new file mode 100644
-index 0000000..efac91f
---- /dev/null
-+++ b/lib/plutosdr/plutosdr_source_c.h
-@@ -0,0 +1,105 @@
-+/* -*- c++ -*- */
-+/*
-+ * Copyright 2017 Dimitri Stolnikov <horiz0n@gmx.net>
-+ *
-+ * GNU Radio is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3, or (at your option)
-+ * any later version.
-+ *
-+ * GNU Radio is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with GNU Radio; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+#ifndef PLUTOSDR_SOURCE_C_H
-+#define PLUTOSDR_SOURCE_C_H
-+
-+#include <gnuradio/blocks/float_to_complex.h>
-+#include <gnuradio/blocks/short_to_float.h>
-+#include <gnuradio/hier_block2.h>
-+#include <gnuradio/iio/pluto_source.h>
-+
-+#include "source_iface.h"
-+
-+class plutosdr_source_c;
-+
-+typedef boost::shared_ptr< plutosdr_source_c > plutosdr_source_c_sptr;
-+
-+plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args = "");
-+
-+class plutosdr_source_c :
-+    public gr::hier_block2,
-+    public source_iface
-+{
-+private:
-+  friend plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args);
-+
-+  plutosdr_source_c(const std::string &args);
-+
-+public:
-+  ~plutosdr_source_c();
-+
-+  static std::vector< std::string > get_devices();
-+
-+  std::string name();
-+
-+  size_t get_num_channels( void );
-+
-+  osmosdr::meta_range_t get_sample_rates( void );
-+  double set_sample_rate( double rate );
-+  double get_sample_rate( void );
-+
-+  osmosdr::freq_range_t get_freq_range( size_t chan = 0 );
-+  double set_center_freq( double freq, size_t chan = 0 );
-+  double get_center_freq( size_t chan = 0 );
-+
-+  double set_freq_corr( double ppm, size_t chan = 0 );
-+  double get_freq_corr( size_t chan = 0 );
-+
-+  std::vector<std::string> get_gain_names( size_t chan = 0 );
-+  osmosdr::gain_range_t get_gain_range( size_t chan = 0 );
-+  osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );
-+  bool set_gain_mode( bool automatic, size_t chan = 0 );
-+  bool get_gain_mode( size_t chan = 0 );
-+  double set_gain( double gain, size_t chan = 0 );
-+  double set_gain( double gain, const std::string & name, size_t chan = 0 );
-+  double get_gain( size_t chan = 0 );
-+  double get_gain( const std::string & name, size_t chan = 0 );
-+
-+  std::vector< std::string > get_antennas( size_t chan = 0 );
-+  std::string set_antenna( const std::string & antenna, size_t chan = 0 );
-+  std::string get_antenna( size_t chan = 0 );
-+
-+  double set_bandwidth( double bw, size_t chan = 0 );
-+  double get_bandwidth( size_t chan = 0 );
-+
-+private:
-+
-+  void set_params(void);
-+
-+  gr::iio::pluto_source::sptr       _src;
-+
-+  std::string   uri;
-+  unsigned long long frequency;
-+  unsigned long samplerate;
-+  unsigned long decimation;
-+  unsigned long bandwidth;
-+  unsigned long buffer_size;
-+  bool quadrature;
-+  bool rfdc;
-+  bool bbdc;
-+  bool          gain_auto;
-+  double        gain_value;
-+  std::string   filter;
-+  bool          filter_auto;
-+
-+  double _freq_corr;
-+};
-+
-+#endif // PLUTOSDR_SOURCE_C_H
-diff --git a/lib/source_impl.cc b/lib/source_impl.cc
-index a28f314..2a153bc 100644
---- a/lib/source_impl.cc
-+++ b/lib/source_impl.cc
-@@ -56,6 +56,10 @@
- #include <uhd_source_c.h>
- #endif
- 
-+#ifdef ENABLE_IIO
-+#include <plutosdr_source_c.h>
-+#endif
-+
- #ifdef ENABLE_MIRI
- #include <miri_source_c.h>
- #endif
-@@ -144,6 +148,9 @@ source_impl::source_impl( const std::string &args )
- #ifdef ENABLE_UHD
-   dev_types.push_back("uhd");
- #endif
-+#ifdef ENABLE_IIO
-+  dev_types.push_back("plutosdr");
-+#endif
- #ifdef ENABLE_MIRI
-   dev_types.push_back("miri");
- #endif
-@@ -216,6 +223,10 @@ source_impl::source_impl( const std::string &args )
-     BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
-       dev_list.push_back( dev );
- #endif
-+#ifdef ENABLE_IIO
-+    BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
-+      dev_list.push_back( dev );
-+#endif
- #ifdef ENABLE_MIRI
-     BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
-       dev_list.push_back( dev );
-@@ -316,6 +327,13 @@ source_impl::source_impl( const std::string &args )
-     }
- #endif
- 
-+#ifdef ENABLE_IIO
-+    if ( dict.count("plutosdr") ) {
-+      plutosdr_source_c_sptr src = make_plutosdr_source_c( arg );
-+      block = src; iface = src.get();
-+    }
-+#endif
-+
- #ifdef ENABLE_MIRI
-     if ( dict.count("miri") ) {
-       miri_source_c_sptr src = make_miri_source_c( arg );
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
similarity index 96%
rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
rename to net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
index 69775452090e..53e6a3392760 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.7*:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
similarity index 65%
rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
rename to net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
index eb6cdd6fe1d5..f77ffadc343b 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -11,51 +11,41 @@ HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
 else
-	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
-	#git clone git://git.osmocom.org/gr-osmosdr.git
-	#cd gr-osmosdr
-	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
+	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iio? ( net-wireless/gr-iio )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	eapply "${FILESDIR}/csete-iio.patch"
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
+		-DENABLE_AIRSPY="$(usex airspy)"
 		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
 		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IIO="$(usex iio)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
 		-DENABLE_MIRI="$(usex mirisdr)"
 		-DENABLE_PYTHON="$(usex python)"
@@ -74,5 +64,7 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 69775452090e..f77ffadc343b 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -19,11 +19,12 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
@@ -33,8 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -45,7 +45,6 @@ src_configure() {
 		-DENABLE_FILE=ON
 		-DENABLE_AIRSPY="$(usex airspy)"
 		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
 		-DENABLE_HACKRF="$(usex hackrf)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
 		-DENABLE_MIRI="$(usex mirisdr)"
@@ -65,5 +64,7 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index daafe681c99c..68a1bf0f0a5c 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
 	<flag name="fcd">Build with Funcube Dongle support</flag>
 	<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
-	<flag name="iio">Build with Industrial IO support for devices such as Analog Devices Pluto</flag>
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index aa9f2d43f7b2..35b24c2c72ff 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,2 +1,6 @@
-EBUILD gr-paint-9999.ebuild 917 BLAKE2B 03c173165eedabead625e867712e792f48bd99b0fe7a39b0760bebc699458866e1ca7836a063c995a4e3556aff20ee74cf0c7e493a82692d5a3331dbc97561dd SHA512 128a122b5ebd7782a6cf693554730f53931dbc9d0288be192149a06300a56fefb01f4d46610df41c1bb2739ffec6a13a4e7eeaa1a675db22ac30b1c50efc9f16
+DIST gr-paint-0.0_p20200418.tar.gz 2129751 BLAKE2B 8767ff1ec791352dc701d0f7f68bbbd4088073379b4116ff2dbf2120b5e6e9b1a87ba0b0554a8489dc9b93cdb2ea5e3a8596b09482512fd1b10ea25d5b5c0fe9 SHA512 5f52e2baa090ed80d8a5b75846821b47163dcc055b94201fb59788bd85769a4e3f8c18654de45e68cb4088681b2db8b2327b5d14f176872bfe8bb2e01d7b6bfb
+DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
+EBUILD gr-paint-0.0_p20200418.ebuild 1098 BLAKE2B 1578dfee76801a9d4c8896794771cd913d25e6e700e89b3adfe4acfa72f4c16ea56827e61bb94949f1b50da968ffbe6df544a142d99c1b62b21e4a404ce1d90a SHA512 7fbd7d8090c1bf535702245e15eaaf0192dd9098657e4f918250d5f6957ddda066ea62a028a70df1e184161929802392fb3ea3a0913a3d99e7fcebac2e93287f
+EBUILD gr-paint-0.0_p20200517.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
+EBUILD gr-paint-9999.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
new file mode 100644
index 000000000000..d8339979c4e2
--- /dev/null
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200418.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=( python2_7 )
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
+else
+	COMMIT="e36b2c638061d14f1b3c3bf3e889a8c99c273930"
+	SRC_URI="https://github.com/drmpeg/gr-paint/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64"
+fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
+HOMEPAGE="https://github.com/drmpeg/gr-paint"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	=net-wireless/gnuradio-3.7*:=[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick
+"
+BDEPEND="
+	dev-lang/swig
+	dev-util/cppunit
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
new file mode 100644
index 000000000000..132442bd9f33
--- /dev/null
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200517.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=( python3_{6,7,8} )
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git"
+else
+	COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e"
+	SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}38-${COMMIT}"
+	KEYWORDS="~amd64"
+fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
+HOMEPAGE="https://github.com/drmpeg/gr-paint"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+#< drmpeg> What tests?
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-libs/gmp
+	sci-libs/volk
+	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick
+"
+BDEPEND="
+	dev-lang/swig
+	dev-util/cppunit
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index 7f891f888a4e..132442bd9f33 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git"
 else
-	KEYWORDS=""
+	COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e"
+	SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}38-${COMMIT}"
+	KEYWORDS="~amd64"
 fi
 inherit cmake-utils python-single-r1
 
@@ -21,12 +24,16 @@ SLOT="0"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+#< drmpeg> What tests?
+RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
-	net-wireless/gnuradio:=[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/gmp
+	sci-libs/volk
+	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	media-gfx/imagemagick
@@ -45,3 +52,8 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
diff --git a/net-wireless/hostap-utils/Manifest b/net-wireless/hostap-utils/Manifest
index eb184b4c5d5f..a32e9178c884 100644
--- a/net-wireless/hostap-utils/Manifest
+++ b/net-wireless/hostap-utils/Manifest
@@ -1,4 +1,4 @@
 AUX hostap-utils-0.4.7-makefile.patch 860 BLAKE2B e1f27d3da73e6cf0c9a6b2eb7ebf738e8dc67f0f815edceb8c317472f72abb7e72b29870a2be82e74a35084cb0dbc12eec5e11a6770baeb3d0a4295db40b7ac9 SHA512 a84f1c078538b6df6542b67e71e0ec97e7d3cd2624f0cbd56e5ff6f976b0504f4f0e2b6fd148148d36133aaa406fb31acde7d45d1e1c2f25f015c430128b97f0
 DIST hostap-utils-0.4.7.tar.gz 60782 BLAKE2B 6e56488df1bde9de13724df39606a8eb125a67d9f1b14e80fd58cc8ff5c5fd703713e565db49d82d00acacc0275c9ca38d38d81a026ccc30d27db82bf3d351a8 SHA512 1a54c5d84b02d2dc96c33d6463af775212e09a20ac85367184636d364f17a09e48f937417dd9c43148663d242b3fc5f2f13835ec5331bd0600ef31797c414d44
-EBUILD hostap-utils-0.4.7-r1.ebuild 606 BLAKE2B 02cc2fe590dbb87faf75a8e04badbf9c65357c66f15b17465a57934f714bbfbea69efc669998b4eaf0146d0261a83b5a59c36c03c334b8e3eb61543d34d17d77 SHA512 529434d9594023ecbaeae3c57d377ec49ff01889d88d64126f268483790fb22dc8cbad59c4a17c59b7db550e4ce0b5971837713ef106005d24eb355d88424dd5
+EBUILD hostap-utils-0.4.7-r1.ebuild 608 BLAKE2B 599923bb1a7eb7e452483cd9ce502f798c10a9580081d0103e3f51d0e1e18e2d8a1d8abf66dd7cf2c295f85e635a32dd1749440a9165b21fedb6e2c8a8c811c5 SHA512 3e671ea30f0c37092a6091ac82c21b617c7b4f73dbe10a00c685a773428a7b5b3eaf0c85b111513fd8e38b55df5195938306fcc5169464a188dcb97d1efadab3
 MISC metadata.xml 236 BLAKE2B edac1ea2c31bb8a5e334f9ce1ab76a4413aee84aa851f109afec729418c9e8164356c3faf55e1beb0317769da9642e645b94852d92b7cefa67c3a92a28f5cf2e SHA512 d002364fc624df1993a205281bab483edac8d8c5fe9831be50050b1f29fcb6f002a8d55e0aed6eab931f0c934084abe28d5ff922045045c524562006d10ee3af
diff --git a/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild b/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
index 81d045aa4f29..d19fb6ee3ac5 100644
--- a/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
+++ b/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Utilities for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products"
-HOMEPAGE="http://hostap.epitest.fi/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+HOMEPAGE="https://hostap.epitest.fi/"
+SRC_URI="https://hostap.epitest.fi/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 30413b10de47..28c7ee40a5bd 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,28 +1,8 @@
 AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
 AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
 AUX uhd_man_pages_optional_compress.diff 3357 BLAKE2B b1b46def45f4ddad84af04245b5a257bba9e9334ca40aa7712579b51f0f8094fd2a94bb0377368e16fc627d2164678f5aa11d729601b9732c51ac340947b6add SHA512 c5915d57366d50ccbad0cb4a57855a403e4951765595e5f8c9ab5f05fa4ef3b0f7778a242bc097f925f9e90d955ac04aea4d8a5af64d1bdefc19edf85c59d3ab
-DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
-DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
-DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
-DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
-DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
-DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
 DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
-DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
-DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
-DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
-DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
-DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
-EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
-EBUILD uhd-3.11.0.0.ebuild 3926 BLAKE2B 11ff172917ab996d5b02d200ace57b65a6c0761a3c7a68eee8c951c179ac1036ea93b6b928f24a8681a5de885e603c17834667038c1b123f6e9e743281ad4f77 SHA512 3c59fb15a18589526cb6ec3a66ce18dd2ea84c4c5e8546f67e4a53bb2d2f1467840f8578e351b3d04e9b12df184c4316860620e86712b6ba568fd2d3adccbd85
-EBUILD uhd-3.12.0.0.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada252c28aa748988c2bec1763ed118772cf9f80b3824915b4e3f6988d33aaca5e6021356b3996c20d0cd6ca9360 SHA512 cdc2a0caadf7f4907a1f550d784e94ba5ca802bcb63203e3db6ea1e35adcf61ab47567a0a9865b02354d2b0342d61f62200dd9ebf625b837a085bf014fac0244
-EBUILD uhd-3.13.0.1.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada252c28aa748988c2bec1763ed118772cf9f80b3824915b4e3f6988d33aaca5e6021356b3996c20d0cd6ca9360 SHA512 cdc2a0caadf7f4907a1f550d784e94ba5ca802bcb63203e3db6ea1e35adcf61ab47567a0a9865b02354d2b0342d61f62200dd9ebf625b837a085bf014fac0244
-EBUILD uhd-3.13.1.0.ebuild 3559 BLAKE2B 400f807fd8627dd8cc9545c1e180058f9d4a3475fe24730a5aac571a8759ebdb80cfac9ca09bf73556bc83812d7679fc6929788e5abb1d70cfb8947543391c24 SHA512 61845e49ea0002cc82e1a4bc0d30e174f3148cc3b8d2e08d88beb518484a782446476274f9170c4a7ab6563ee2cd4d452193fad8b79228108990cab957a8e25e
-EBUILD uhd-3.14.0.0.ebuild 3559 BLAKE2B 400f807fd8627dd8cc9545c1e180058f9d4a3475fe24730a5aac571a8759ebdb80cfac9ca09bf73556bc83812d7679fc6929788e5abb1d70cfb8947543391c24 SHA512 61845e49ea0002cc82e1a4bc0d30e174f3148cc3b8d2e08d88beb518484a782446476274f9170c4a7ab6563ee2cd4d452193fad8b79228108990cab957a8e25e
-EBUILD uhd-3.14.1.1.ebuild 3560 BLAKE2B c1726a482dddd447c3fd7489327df27c347d10e5645e16589a58269573dee36d607b1495e4af8600e95a2b9a26ac9c9bf42445df86d6e6f42a57cea36bd7364a SHA512 c8d99f46a12d8c47565163cabc66da914a56db3a4d61c71ea02e4686ffb719fa12465259c117bbd77449b297842ec6554635b436c5cb870ed926f1e29bc201c4
-EBUILD uhd-3.15.0.0-r1.ebuild 3869 BLAKE2B a9fa5020e023c1a216f9a7c719a0f81642bec090b932c55affbd87489b1c5fbe9366c8609d61665ff89b63c6ddcf456f14996019817e37d85feb27d378989c05 SHA512 767734c0377c2163238dbabfe16672ed6552d06e32068b215cede6ca38ce2f2332bbcc8b311be3f2ef7f1a9021ed9b15871a281a03a926ad2c106789a7932ab5
+EBUILD uhd-3.15.0.0-r1.ebuild 3849 BLAKE2B 2f07a36bf1aab4b2a205924211a09d8c5e36ea1286f0c7be31ec3a9268c5e908e04b6cf2257facc9f5281dbeaf6f139324124657a8747e71b228b82f2391ba50 SHA512 7ebba9f77014d4200e9f47dba66420139d5d1a80237eb004c974fcaffea713ba3ceda7d201ff005626f2acedbf8066824fb1e3082e321cc5ec2fb53374725507
+EBUILD uhd-3.15.0.0-r100.ebuild 3855 BLAKE2B d629eadd24b66af929ea50b16dee609702c92db053a3e22f983bbb31a7efd7824786596469cb8911b06eb91f620e8ba084bf1dcbced2e9f4086ceb2fa3ae7c71 SHA512 ff2b004b63a87c72850a5d27b60827baf9e4e91c30c7dceb07cf22b35f33db3948b296d2f92d5c53b1efd45e07ca1ed79e11a1ee9d1ed0251f2bf3056544b35e
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/uhd-3.10.3.0.ebuild b/net-wireless/uhd/uhd-3.10.3.0.ebuild
deleted file mode 100644
index 9a1c22cdf241..000000000000
--- a/net-wireless/uhd/uhd-3.10.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).$(get_version_component_range 4).tar.gz \
-	http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	dev-lang/orc
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/mako
-	dev-python/cheetah
-	app-arch/unzip
-"
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.11.0.0.ebuild b/net-wireless/uhd/uhd-3.11.0.0.ebuild
deleted file mode 100644
index f24e3c0eb34d..000000000000
--- a/net-wireless/uhd/uhd-3.11.0.0.ebuild
+++ /dev/null
@@ -1,133 +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 versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_${PV}_images.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host"
-
-src_unpack() {
-	unpack EttusResearch-UHD-${PV}.tar.gz
-	mkdir images || die
-	cd images || die
-	unpack uhd_${PV}_images.tar.xz
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.12.0.0.ebuild
+++ /dev/null
@@ -1,131 +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 versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.0.1.ebuild b/net-wireless/uhd/uhd-3.13.0.1.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.13.0.1.ebuild
+++ /dev/null
@@ -1,131 +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 versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.1.0.ebuild b/net-wireless/uhd/uhd-3.13.1.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.13.1.0.ebuild
+++ /dev/null
@@ -1,131 +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 versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.14.0.0.ebuild b/net-wireless/uhd/uhd-3.14.0.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.14.0.0.ebuild
+++ /dev/null
@@ -1,131 +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 versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index 0bc67971a97c..9e805a23f6d1 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -78,7 +78,6 @@ src_configure() {
 		-DENABLE_C_API=ON
 		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
 		-DENABLE_TESTS="$(usex test)"
diff --git a/net-wireless/uhd/uhd-3.14.1.1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
similarity index 85%
rename from net-wireless/uhd/uhd-3.14.1.1.ebuild
rename to net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 3d733a2b4f07..d598931abd15 100644
--- a/net-wireless/uhd/uhd-3.14.1.1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 #not sure why, but eapi 7 fails
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
 
@@ -33,11 +33,20 @@ RDEPEND="${PYTHON_DEPS}
 	usb? ( virtual/libusb:1 )
 	dev-libs/boost:=
 	sys-libs/ncurses:0[tinfo]
+	$(python_gen_cond_dep '
+	|| (
+		dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	dev-python/mako
+	$(python_gen_cond_dep '
+	dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')
 	app-arch/unzip
 	app-arch/gzip
 "
@@ -52,16 +61,15 @@ src_unpack() {
 }
 
 src_prepare() {
-	cd ..
-	eapply "${FILESDIR}"/uhd_man_pages_optional_compress.diff
-	cd host
-
 	cmake-utils_src_prepare
 
 	gnome2_environment_reset #534582
 
 	#this may not be needed in 3.4.3 and above, please verify
 	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+
+	#rpath is set for apple and no one else, just remove the conditional
+	sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
 }
 
 src_configure() {
@@ -70,7 +78,6 @@ src_configure() {
 		-DENABLE_C_API=ON
 		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
 		-DENABLE_TESTS="$(usex test)"
@@ -87,11 +94,14 @@ src_configure() {
 		-DENABLE_N230="$(usex n230)"
 		-DENABLE_MPMD="$(usex mpmd)"
 		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
+	python_optimize
 	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
 	if [ "${PV}" != "9999" ]; then
 		rm -rf "${ED}/usr/bin/uhd_images_downloader"
@@ -133,7 +143,4 @@ src_install() {
 	fi
 	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}/images"
-
-	#fix doc location
-	mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
 }
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 07f73eb7ba3c..809333b0dbf4 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,4 @@
-DIST urh-2.8.4.tar.gz 12639483 BLAKE2B 2db083e8c0203c15cbb4f89e9a844095d5f7728eb8e4629a0050df47310f891f8e12107ec8083cba5c028861d5a72d7c3f8235c10047a40efeebce33e1d94428 SHA512 8ded9d065cd4773b1a5d26b47838d7586b22fc142d0101388bd6aa5c638cf858452857191ca5de553b1a62397fb814c0f1839175647ec41cec32e216a6244ce6
-EBUILD urh-2.8.4.ebuild 1275 BLAKE2B 70519ed863a549365a02727ec16cd89bcecd93f2489047ea557d9aa3817009bfefb82cad7f73270913c292ff926d6a21cf87e814b2009b2542889857736a68ea SHA512 2a20211be19396d4180c36709f7a6da8630d8cc11b2add92c963368d13d257864e3a8168c2cc1409e742f3fc4717eb2e76fde220bf390c6abd043cb9892b42a9
-EBUILD urh-9999.ebuild 1275 BLAKE2B 70519ed863a549365a02727ec16cd89bcecd93f2489047ea557d9aa3817009bfefb82cad7f73270913c292ff926d6a21cf87e814b2009b2542889857736a68ea SHA512 2a20211be19396d4180c36709f7a6da8630d8cc11b2add92c963368d13d257864e3a8168c2cc1409e742f3fc4717eb2e76fde220bf390c6abd043cb9892b42a9
+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
diff --git a/net-wireless/urh/urh-2.8.4.ebuild b/net-wireless/urh/urh-2.8.8.ebuild
similarity index 97%
rename from net-wireless/urh/urh-2.8.4.ebuild
rename to net-wireless/urh/urh-2.8.8.ebuild
index c4b387c055b5..f325027fcad3 100644
--- a/net-wireless/urh/urh-2.8.4.ebuild
+++ b/net-wireless/urh/urh-2.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index c4b387c055b5..f325027fcad3 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0edbfa8e5284..5b0a2ff1708c 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index dbd2dac3aa66..906f70348c0c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-02)
+# Avoid unkeyworded deps, we really need a minimal install
+# for imagemagick.
+media-gfx/inkscape cdr visio
+
 # Mart Raudsepp <leio@gentoo.org> (2020-04-25)
 # gnome-base/gnome-shell not keyworded on alpha
 # anymore, bug #677176
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 47ef29e7a98a..2e207b5eb9aa 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-02)
+# Avoid unkeyworded deps, we really need a minimal install
+# for imagemagick.
+media-gfx/inkscape dia
+
 # Jimi Huotari <chiitoo@gentoo.org> (2020-05-17)
 # Mask until 'app-arch/lxqt-archiver' is keyworded.
 lxqt-base/lxqt-meta archiver
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 85640b81ef0c..0ddff0f479bb 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -28,14 +28,6 @@ vpx
 appindicator
 ayatana
 
-# Michał Górny <mgorny@gentoo.org> (2018-07-16)
-# Python 3.7 support requires fresh versions of packages which are stuck
-# at keywordreqs.
-# bug #661306: dev-python/pytest
-# bug #661320: dev-python/twisted
-python_targets_python3_7
-python_single_target_python3_7
-
 # Matt Turner <mattst88@gentoo.org> (2018-05-26)
 # Unmask systemd since it is keyworded here.
 -systemd
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 448e386051dc..24e8d845eb52 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-01)
+# Stable depgraph is not yet clean.
+python_targets_python3_7
+python_single_target_python3_7
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/gstreamer is not stable for hppa
 gstreamer
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index dd2742470510..8efed476a5f6 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-02)
+# Avoid unkeyworded deps, we really need a minimal install
+# for imagemagick.
+media-gfx/inkscape cdr visio
+
 # James Le Cuirot <chewi@gentoo.org> (2020-04-23)
 # Requires media-libs/mesa[llvm], which is masked.
 dev-python/pyopengl test
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index e3c71ebef97d..6e29154ca398 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-03)
+# Fails to build, needs more work
+www-client/firefox clang
+mail-client/thunderbird clang
+
 # James Le Cuirot <chewi@gentoo.org> (2020-04-23)
 # Requires media-libs/mesa[llvm], which is masked.
 dev-python/pyopengl test
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 6aa3349d69de..a420106865d6 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-03)
+# clang is keyworded and works on ppc64
+-clang
+
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (2017-05-07)
 # There is no luajit support on ppc64 userland. Bug #608326.
 luajit
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index fd78cefa944b..781eb4b92fcd 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-22)
-# Build deps are not keyworded
-media-fonts/noto-emoji buildfont
+# Georgy Yakovlev <gyakovlev@gentoo.org (2020-05-03)
+# works on ppc64
+sys-devel/llvm -gold
 
 # Jimi Huotari <chiitoo@gentoo.org> (2020-05-17)
 # Mask until 'app-arch/lxqt-archiver' is keyworded.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 7f2f31e5f3ba..f8772e81be33 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-02)
+# Avoid unkeyworded deps, we really need a minimal install
+# for imagemagick.
+media-gfx/inkscape cdr visio wpg
+
 # Michał Górny <mgorny@gentoo.org> (2020-05-06)
 # dev-vcs/mercurial is broken on SPARC and setuptools_scm tests
 # lack proper skipping (to be fixed).
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index f548b7ef51d6..fc5f3e900dfd 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -40,11 +40,6 @@ x11-libs/pangox-compat
 # Bug #650320
 dev-perl/Net-SMTP-SSL
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-28)
-# Backport specific to Python 2.6.  No modern package should be using
-# it.
-dev-python/unittest2
-
 # Michał Górny <mgorny@gentoo.org> (2020-03-25)
 # Provides 'pytest' command to setup.py that is entirely redundant.
 # Strip the dependency, run pytest directly (preferably
@@ -53,7 +48,7 @@ dev-python/pytest-runner
 
 # Matt Turner <mattst88@gentoo.org> (2020-03-17)
 # Deprecated GNOME 2 era packages
-# Bugs #640022, #713010
+# Bugs #640022, #713010, #726784
 dev-python/pygobject:2
 gnome-base/gnome-vfs
 gnome-base/libbonobo
diff --git a/profiles/package.mask b/profiles/package.mask
index d882e85a75aa..df301645d9b9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,54 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron Bauman <bman@gentoo.org> (2020-06-03)
+# py2 only. dead upstream. m-n. rdep.
+# Masked for removal in 15 days
+app-cdr/sync2cd
+app-text/getxbook
+app-text/pdfsandwich
+dev-python/assets
+dev-python/bz2file
+dev-python/kid
+dev-python/jaxml
+dev-python/python-urljr
+dev-python/selectors34
+dev-python/stomper
+dev-python/YURL
+media-gfx/exact-image
+x11-themes/fvwm-crystal
+
+
+
+# Stefan Strogin <steils@gentoo.org> (2020-06-03)
+# Masked for testing
+>=dev-libs/libressl-3.2.0
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-03)
+# Very bad quality (upstream) package.  Stuck on py3.6.  No revdeps.
+# Removal in 30 days.  Bug #718762.
+dev-python/dnslib
+
+# Aaron Bauman <bman@gentoo.org> (2020-06-02)
+# py2 only. dead upstream. m-n.
+# Masked for removal in 30 days
+app-misc/webcomics-collector
+net-misc/pytvshows
+net-news/rawdog
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-02)
+# libgnomeui revdeps with no sign of upstream porting away or doing anything.
+# No maintainer. Bugs #726826, #726822. Masked for removal in 30 days.
+app-misc/cbrpager
+app-misc/ignuit
+
+# Joonas Niilola <juippis@gentoo.org> (2020-06-02)
+# Last snapshot is from 2+ years ago, which doesn't build. Latest 
+# upstream commit won't build with in-tree efl versions. Has a bug 
+# open and unanswered for 2 years, so this package seems unmaintained
+# in Gentoo. Removal in ~30 days. Bug #656098
+x11-themes/terminology-themes
+
 # Jonas Stein <jstein@gentoo.org> (2020-06-01)
 # Last rite package due to missing/unclear license.
 # Removal after 2020-08-01
@@ -83,7 +131,6 @@ dev-python/toro
 # Outdated.  Not touched since the initial commit.  Lacks py3.7 support.
 # No reverse dependencies outside the three packages.
 # Removal in 30 days.  Bug #708270.
-dev-python/Rx
 dev-python/graphql-core
 dev-python/gql
 
@@ -157,12 +204,6 @@ dev-python/symboltype
 <sys-fs/zfs-kmod-0.8.3
 sys-kernel/spl
 
-# Stephan Hartmann <stha09@googlemail.com> (2020-05-20)
-# Dev channel releases are only for people who
-# are developers or want more experimental features
-# and accept a more unstable release.
->=www-client/chromium-84
-
 # Amadeusz Żołnowski <aidecoe@gentoo.org> (2020-05-11)
 # Masked for removal in 30 days.  Unmaintained upstream.
 sys-boot/plymouth-openrc-plugin
@@ -193,11 +234,6 @@ dev-python/ramlfications
 # for about a decade. Masked for removal in 30 days. Bug #720150
 x11-libs/libXxf86misc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-03)
-# Last release in 2015, not compatible with >=media-gfx/gimp-2.10.0
-# Masked for removal in 30 days.
-media-plugins/gimp-lensfun
-
 # Piotr Karbowski <slashbeast@gentoo.org> (2020-05-03)
 # Obsolete input drivers, use x11-drivers/xf86-input-libinput
 # or x11-drivers/xf86-input-evdev instead.
diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index 85a7eabccb1f..4b1478682762 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -191,7 +191,7 @@ cygwin-rebase-merge() {
 
 		[[ ${mode} == 'pending' ]] || exit 0
 
-		find "./${pendingdir}" -maxdepth 1 -type f \
+		find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \
 			-exec mv -f -t "./${mergeddir}/" {} +
 	)
 	[[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed."
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2bdc52691488..8afa3b0f2372 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -489,7 +489,7 @@ app-emulation/docker-credential-helpers:gnome-keyring - Build secretservice help
 app-emulation/docker-credential-helpers:pass - Build pass helper for the pass utility.
 app-emulation/dosemu:fluidsynth - use media-sound/fluidsynth for MIDI emulation
 app-emulation/faudio:dumpvoices - FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.
-app-emulation/faudio:ffmpeg - FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: media-video/ffmpeg (note: this feature is not supported by media-video/libav).
+app-emulation/faudio:ffmpeg - FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: media-video/ffmpeg
 app-emulation/faudio:test - Build and run faudio testsuite.
 app-emulation/faudio:utils - Build all faudio utilities.
 app-emulation/faudio:xnasong - Build support for optional XNG_SONG component (note: this not required by app-emulation/wine-staging, app-emulation/wine-vanilla for faudio XAudio support).
@@ -1130,7 +1130,6 @@ app-shells/bash:mem-scramble - Build with custom malloc/free overwriting allocat
 app-shells/bash:net - Enable /dev/tcp/host/port redirection
 app-shells/bash:plugins - Add support for loading builtins at runtime via 'enable'
 app-shells/bash-completion:eselect - Support blacklisting of completions via 'eselect bash-completion'. This enables custom Gentoo patching of upstream completion loader.
-app-shells/dash:vanilla - Support echo -n, and enable echo -e all the time (unsupported)
 app-shells/mksh:lksh - variant that uses POSIX-compliant arithmetics with the host “long” data type and is automatically in POSIX mode when called as /bin/sh
 app-shells/pdsh:rsh - This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.
 app-shells/shish:diet - Use dev-libs/dietlibc
@@ -3135,7 +3134,6 @@ games-board/freedoko:net - Enable network game support
 games-board/freedoko:openclipartcards - Install the openclipartcards card set
 games-board/freedoko:pysolcards - Install the PySol card set
 games-board/freedoko:xskatcards - Install the XSkat card set
-games-board/grhino:gtp - Install the GTP (Go/Game Text Protocol) frontend
 games-board/pasang-emas:extras - Install some extra themes
 games-board/pioneers:help - Enable gnome ingame help via scrollkeeper
 games-board/pysolfc:extra-cardsets - Install extra cardsets
@@ -4442,7 +4440,6 @@ media-plugins/audacious-plugins:bs2b - Enable Bauer Bauer stereophonic-to-binaur
 media-plugins/audacious-plugins:cue - Support CUE sheets using the libcue library
 media-plugins/audacious-plugins:fluidsynth - Support FluidSynth as MIDI synth backend
 media-plugins/audacious-plugins:gme - Support various gaming console music formats
-media-plugins/audacious-plugins:gtk - Build with GTK interface instead of Qt5
 media-plugins/audacious-plugins:http - Support HTTP streams through neon
 media-plugins/audacious-plugins:qtmedia - Enable playback via dev-qt/qtmultimedia
 media-plugins/audacious-plugins:scrobbler - Build with scrobbler/LastFM submission support
@@ -4534,7 +4531,6 @@ media-sound/aqualung:systray - Enable system tray support
 media-sound/ardour:phonehome - contact ardour.org at startup for new announcements
 media-sound/ario:idle - Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14
 media-sound/asunder:mac - Support for creation of Monkey's Audio files (APE)
-media-sound/audacious:gtk - Build with GTK interface instead of Qt5
 media-sound/audacity:id3tag - Enables ID3 tagging with id3tag library
 media-sound/audacity:lv2 - Add support for Ladspa V2
 media-sound/audacity:midi - Enables MIDI support
@@ -5023,7 +5019,9 @@ media-video/mjpg-streamer:output-http - Small HTTP server plugin which sends WWW
 media-video/mjpg-streamer:output-rtsp - Plugin which provides a mechanism to take snapshots with a trigger from a UDP packet
 media-video/mjpg-streamer:output-udp - Plugin receiving content over UDP and storing to a directory
 media-video/mjpg-streamer:www - Installs WWW content
+media-video/motion:mariadb - Add mariadb database support
 media-video/motion:mmal - Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.
+media-video/motion:supervise-daemon - Add experimental suppport for OpenRC's supervise-daemon process supervision
 media-video/motiontrack:multiprocess - Enables multi-process support (SMP/cluster) for motiontrack programs
 media-video/mplayer:bl - Blinkenlights video output
 media-video/mplayer:bluray - Enable playback of Blu-ray filesystems
@@ -7009,6 +7007,7 @@ net-wireless/gnuradio:fec - enable block for convolutional encoding using the CC
 net-wireless/gnuradio:filter - enable filter signal processing blocks
 net-wireless/gnuradio:grc - enable GNU Radio Companion graphical tool to design signal processing flow graphs
 net-wireless/gnuradio:log - enable logging to console and files
+net-wireless/gnuradio:modtool - enable modtool for editing GNU Radio modules and components
 net-wireless/gnuradio:noaa - enable NOAA POES HRPT receiver blocks
 net-wireless/gnuradio:pager - enable pager signal processing blocks
 net-wireless/gnuradio:performance-counters - enable block performance counters
@@ -7026,7 +7025,6 @@ net-wireless/gr-osmosdr:airspy - Build with Airspy support
 net-wireless/gr-osmosdr:bladerf - Build with Nuand BladeRF support
 net-wireless/gr-osmosdr:fcd - Build with Funcube Dongle support
 net-wireless/gr-osmosdr:hackrf - Build with Great Scott Gadgets HackRF support
-net-wireless/gr-osmosdr:iio - Build with Industrial IO support for devices such as Analog Devices Pluto
 net-wireless/gr-osmosdr:iqbalance - Enable support for I/Q balancing using gr-iqbal
 net-wireless/gr-osmosdr:mirisdr - Build with Mirics MSi2500 + MSi001 SDR support
 net-wireless/gr-osmosdr:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
@@ -8075,6 +8073,7 @@ sys-boot/refind:hfs - Builds the EFI binary hfs filesystem driver
 sys-boot/refind:iso9660 - Builds the EFI binary iso9660 filesystem driver
 sys-boot/refind:ntfs - Builds the EFI binary ntfs filesystem driver
 sys-boot/refind:reiserfs - Builds the EFI binary reiserfs filesystem driver
+sys-boot/silo:tilo-only - Install only the tilo netboot tool
 sys-boot/vboot-utils:libzip - Use dev-libs/libzip.
 sys-boot/woeusb:minimal - Install only woeusb tool
 sys-cluster/ceph:babeltrace - Add support for LTTng babeltrace
@@ -8836,6 +8835,7 @@ x11-apps/igt-gpu-tools:chamelium - Enables support for building Chamelium tests
 x11-apps/igt-gpu-tools:man - Build and install man pages
 x11-apps/igt-gpu-tools:overlay - Build the intel-gpu-overlay utility
 x11-apps/igt-gpu-tools:runner - Build the test runner
+x11-apps/igt-gpu-tools:tests - Build and install tests
 x11-apps/igt-gpu-tools:valgrind - Support valgrind annotations
 x11-apps/igt-gpu-tools:xv - Enable intel-gpu-overlay xv backend
 x11-apps/mesa-progs:egl - Build EGL utilities
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index b1ed48d86c91..c84a5e29cdf4 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/mopac7/Manifest b/sci-chemistry/mopac7/Manifest
index 8ac390352af4..978cbe206d0a 100644
--- a/sci-chemistry/mopac7/Manifest
+++ b/sci-chemistry/mopac7/Manifest
@@ -2,6 +2,5 @@ AUX Makefile 458 BLAKE2B dab61e16f1382f173c1f46b8bf1331cd27c5f26ad0d4a6ad9b13f29
 DIST dcart.f 11044 BLAKE2B 7414804ecfab9a7cbddee664b85e6e2e8c1d8fe1e1f73d480dd1a387c5e349d26ec4ae1a37f27e38b7c051fcce2c1bdf77de12ec628298fd3edf79040a8a0c5a SHA512 788a184fd8419ff742e49c1a652d5ea093f9114dbe4f272665b8fb9eeac2afb7f7042628c288f2b81d0f54d8a7ef2f400490cd3aff39dda59a6d70a0deab5b80
 DIST gmxmop.f 38956 BLAKE2B e411feca5104e91ae8fd2008de61d18cc214beb3b2a7aa09a80269fb935e27ba1b1cb89fa30eedbfc4f6c4734c22d932e57d5905c175ae9f56c4affee7b0ca04 SHA512 38bb2e5749c4d3c8c24f15682f72e40cb4edb6517c7916cecee1d21675b1870c0fe331ba2ec40312408dec473141e7742d1e155d4b64f1c2a25bfa4e11885194
 DIST mopac7-1.15.tar.gz 764547 BLAKE2B 6e037862007221955d0ad65f3c002a3d2e461950a2bc0efac9d195cf1d9d856842d02bc380ce236c3d48f863a144875950f5c86f8f3ac936b8b098472f7f7a0d SHA512 e0ccd643caa6dbd7e156867530d79e50e10243f5e3b5f8bc57781e68e1daf26f2a0e6987fff00afe07eb0fcb98cbd9f01e4cfa5d20acc0d8ab3cca632968636e
-EBUILD mopac7-1.15-r1.ebuild 1817 BLAKE2B 2b3df9f719350adf9ee767fd99def28c0f63d8eda49253fbbd6c0d00c2c22109cefd45cf2d9f60bd2808f82c1d0840c3c43cc1cc698e1e0429214c3d16eedbf9 SHA512 f540feba5eacff866a1ead1d1d2cf81a5ac07759e2298010748cadb9c7b7cf1cbb869f38be3dfa4532e5b9c2aafafb90e57bf3c25a594998a2480a574a479fbf
-EBUILD mopac7-1.15.ebuild 2044 BLAKE2B c4fa6bd512e0006c179cd58a3584c1343d088b5ba95f434c133f145f26882711f47effdbe5fe6c3dad50e63d43a01d667ca934c427078bb5d6f083f9383cc7d5 SHA512 55135a37436fc479539a769b8d0dd7a604cf9fe522243fe5105b4eed6862efaa9c333ede5cdf87b58e49110d41e4d445e80de2c991d38b28529bb610666cc8c7
+EBUILD mopac7-1.15-r1.ebuild 1816 BLAKE2B 6fe72656e446e1ef3e6a4c543c6a8703e8965ba751e1934c6c4673806283dc7a4bf41d121cc6e7a756fb4e599006ea368f75e753b8a5ec97cda8680e76a5d3bc SHA512 5e75215a6e8d2f18b01bab66d28b754cb0a9406051b089ac4415bed12a2425d1a15a9387668e680e51f33d29b782619f48acd50bf440a83b8e4ea57d458a4cf7
 MISC metadata.xml 434 BLAKE2B 011dd4486a917b69a58d398027b3af606bae6a6ea2b470b2f3f3d15f64b6db46a8a77ae4a52d78249ac8917d1a25bcbbcb5af62bea6677c5d4b433e47e9a8356 SHA512 77b3e0b69436a4f199c5ae3d9382c9b6cf2049ffd98144a2dc291495de9e8daa9deb6141d77b917f6e29902ad862c9044e7661ca7f0ae5e4fc68983857b3f6f2
diff --git a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
index 1decbcf89b24..98848fcad10d 100644
--- a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE="gmxmopac7 static-libs"
 
 DEPEND="dev-libs/libf2c"
diff --git a/sci-chemistry/mopac7/mopac7-1.15.ebuild b/sci-chemistry/mopac7/mopac7-1.15.ebuild
deleted file mode 100644
index 9ee026f0d21b..000000000000
--- a/sci-chemistry/mopac7/mopac7-1.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools fortran-2 toolchain-funcs
-
-DESCRIPTION="Autotooled, updated version of a powerful, fast semi-empirical package"
-HOMEPAGE="https://sourceforge.net/projects/mopac7/"
-SRC_URI="
-	http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz
-	http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f
-	http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux"
-IUSE="gmxmopac7 static-libs"
-
-DEPEND="dev-libs/libf2c"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Install the executable
-	sed -i \
-		-e "s:noinst_PROGRAMS = mopac7:bin_PROGRAMS = mopac7:g" \
-		fortran/Makefile.am \
-		|| die "sed failed: install mopac7"
-	# Install the script to run the executable
-	sed -i \
-		-e "s:EXTRA_DIST = autogen.sh run_mopac7:bin_SCRIPTS = run_mopac7:g" \
-		Makefile.am \
-		|| die "sed failed: install run_mopac7"
-
-	eautoreconf
-}
-
-src_configure() {
-	#set -std=legacy -fno-automatic according to
-	#http://www.bioinformatics.org/pipermail/ghemical-devel/2008-August/000763.html
-	FFLAGS="${FFLAGS} -std=legacy -fno-automatic" econf
-}
-
-src_compile() {
-	emake
-	if use gmxmopac7; then
-		einfo "Making mopac7 lib for gromacs"
-		mkdir "${S}"/fortran/libgmxmopac7 && cd "${S}"/fortran/libgmxmopac7
-		cp -f ../SIZES ../*.f "${FILESDIR}"/Makefile . || die
-		emake clean
-		cp -f "${DISTDIR}"/gmxmop.f "${DISTDIR}"/dcart.f . || die
-		sed "s:GENTOOVERSION:${PV}:g" -i Makefile
-		emake FC=$(tc-getFC)
-		if use static-libs; then
-			emake static
-		fi
-	fi
-}
-
-src_install() {
-	# A correct fix would have a run_mopac7.in with @bindir@ that gets
-	# replaced by configure, and run_mopac7 added to AC_OUTPUT in configure.ac
-	sed -i "s:./fortran/mopac7:mopac7:g" run_mopac7
-
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS README ChangeLog
-	if use gmxmopac7; then
-		cd "${S}"/fortran/libgmxmopac7
-		dolib.so libgmxmopac7.so*
-		if use static-libs; then
-			dolib.a libgmxmopac7.a
-		fi
-	fi
-}
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 1f4e55620fe5..fcffc5ef7882 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,5 +1,5 @@
 DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
 DIST pymol-2.3.0.tar.gz 10448674 BLAKE2B 0d508587d880ce7f2e8a0481bf664e6bfe6eb1d68b0f48b9266cde756824bd8c0144d7243e958bbc5e571d60fca9dafff125d81a8a3d32107e78ad2ff8dffc05 SHA512 e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133
 EBUILD pymol-2.3.0-r2.ebuild 3189 BLAKE2B b696daab150edc9c5b69e330f68d0a79bb825d39d69e6b149a90be7f12a3956525b91373f330e528178b2732b84b86f6e9ae1624c8cad48eb1580e81b4bde38a SHA512 4c4c4e94c768325728584e6c424e7c7d87e4daab291c0f6bad2c6f527645056d0b9b4fefc822543542f27431f51a1f1a6cda1ab7fb9136d0f44a11c6129060be
-EBUILD pymol-2.3.0-r3.ebuild 3003 BLAKE2B 8e629b5cd104f6fcf1ba885c59f41e4f9ccd564af9d2a6cd273eb5e1faf5af84b2d550dd7157e2f856788f8d96a7cc212aa8a84cfd4320a8500ac28f93b305f2 SHA512 c41a31a5123bdadeb8da8f6fb6ac0cbbc81ef3ecf49ecbbf3c8b4884c01f1bf1c04f63c0872aadca85adb831d8510ec0d7a41f18c0da923524c2380ec2d4d1e6
+EBUILD pymol-2.3.0-r3.ebuild 3005 BLAKE2B 697c52ef412f18a8088c82c6f71ef7b10ffb28201aaaf5b651cfad512ce1f3340f74292dc54e9005e5c153d50bf8d3c9de1df1a71516c5258b4a6256fc9b9429 SHA512 9f248137b6cd1c4a0233c83738597e42b43b65f1331c6a19a841a36719328996fc9902f599848d791963f41e65dc9f7c76f967dae26286488a49b5cfd13572d1
 MISC metadata.xml 439 BLAKE2B 68df7dfc8ca3d4d4b18b419532bade69491f2e9362f10ae2397c804132b7fc9cd08dcf9703c0a89c44588c570e0c0c1bb9bffb7394d51faf1283142dbc5f70b3 SHA512 f5a3eded9b12fa715ba2e6e10b41c75d9bd823ca0dd40acbffc3f5bfc4b36c687f720b1a4e119b4540a31faf849985778cbd72b0b2cd35af8c52ca0f808d71e4
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
index 675c8b368801..58c0d6707c41 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 desktop eutils flag-o-matic xdg-utils
 
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 1c180a2cb5aa..fcf8a883ef5a 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -20,7 +20,7 @@ EBUILD votca-csg-1.4.1.ebuild 3204 BLAKE2B e447a6859d7ee4d722701f96634667529bd18
 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.ebuild 2362 BLAKE2B f3ebb73d4522cce0955e8dd2f3287641444c8a87fde1dc061df6248ff86d57b0e5d97f96cf0dc501d99aefded328db787b81a6d5be779a4b9a5a79d2491fa132 SHA512 0e1091a8c1f71efa1b23a49a1b0c486ccd61d5004bbe608a2987d3b43a3a59891acbfcdf6ebd69f603fcdecb16393d9694938946418ecbdc959b617a96bc87eb
+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
 MISC metadata.xml 676 BLAKE2B b3f2e43f5cb505876216b0a329410c9cef1b44a9bbd7e1c61faa4acd00dbe87ea0cebb00ed78dc00b9e1d2b08b95e3c40d25fecc0738c992a3f933e430f94e2b SHA512 14ecd498eeeed1576923d8da9bc5dc98e47c1d162173b7f2419ad367fa84e227555bd0365709be8a456dc5388ea6fa6734fa7df3c82fd4efcd1cf3460c7e12a1
diff --git a/sci-chemistry/votca-csg/votca-csg-1.6.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6.ebuild
index 9bf490211948..4c670640b3d2 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.6.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.6.ebuild
@@ -13,12 +13,12 @@ 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"
+	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"
+	KEYWORDS="amd64 x86"
 	PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
 fi
 
diff --git a/sci-chemistry/votca-csgapps/Manifest b/sci-chemistry/votca-csgapps/Manifest
index e2d09c71dd79..0725ec6c70d5 100644
--- a/sci-chemistry/votca-csgapps/Manifest
+++ b/sci-chemistry/votca-csgapps/Manifest
@@ -8,7 +8,7 @@ EBUILD votca-csgapps-1.4.1.ebuild 653 BLAKE2B 208ae3538fcf42296a4a1077d222a9d6f7
 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.ebuild 669 BLAKE2B b24c7f6916662d353d3e12092910135e3636b2b1af3c71a3fce67b08d5e07163d9c92aa17c40651e551821ff607fef74b699e335d0617a8118acedc11c9a75d9 SHA512 ca0b60c3a9312b908fc1409fdc856bc50adb7044e3a6180b634b9c211d7000df22d804646d253219643e094f04142da0730558f625bb1bacb142f62bcfed9c4e
+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
 MISC metadata.xml 457 BLAKE2B 9d392be6c061ebd3d975308065fcdec4ee061268f4b8b79e122b183d2e4f7259fdb9e165b8b3f030f1edbbc4f112757b1de7a50929ac112d5633143f9585699a SHA512 42a8ccad09d35dd4677b70005606582207747ae39d62a7ea75e2f5de28f887fee4265c8ae3b38e5cdb3017cc84c8902e2a525ae31fa5dd0aa00369e9b428f563
diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
index 4ba5c5475010..c39800ede650 100644
--- a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
+++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
@@ -9,12 +9,12 @@ 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"
+	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"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Extra applications for votca-csg"
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index 22ca06585de3..b03751e4b961 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -12,7 +12,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.ebuild 985 BLAKE2B c6ea7437abcc76329adb154e4b44cea93ba995806adb256ca5202a5def1d93b6ea5e26d5b1e4dc448a2e0133ae61467e4dece925a72f606b2e9660c1d19f4353 SHA512 20fb591b48b726464c2a96938f65ad4e8583b8c258195e9ad86ea192bbb932322e514f014c8b5c9fb0dea49fcb0169efd10f2c9d4211e1336522d3ca25e13a1f
+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
 MISC metadata.xml 453 BLAKE2B 51ee11d9c55f15fd0382a7c422d1c12364901a5ac257f57d04b91b8ca77acf9c1eb709879bfc6042b577961352cbc4e31b01ece3a8c650eaffa9b4ebc6d385fb SHA512 892c8f84df6bd19e969b372def9a485be9121d8f7ab410b532529980298e57d0705f73fac409d8f251449cf2119dd3f28133e08d21d0e73b27d5ec0e9a3f205e
diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild b/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
index cf0e82016729..08dd38193e01 100644
--- a/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
+++ b/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
@@ -10,12 +10,12 @@ 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"
+	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"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Votca excitation and charge properties module"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index e420843eca01..febc8c498404 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/dcw-gmt/Manifest b/sci-geosciences/dcw-gmt/Manifest
index 7c0a6b627b4f..2b30f4220e19 100644
--- a/sci-geosciences/dcw-gmt/Manifest
+++ b/sci-geosciences/dcw-gmt/Manifest
@@ -1,3 +1,3 @@
 DIST dcw-gmt-1.1.4.tar.gz 21117179 BLAKE2B d5aebb5251ddcb82a6df28a9ac0a8e37ad45a8ef48bdf5e777c85f7194af7710e83e7ff3a204a9325d7b9c62ad3e3d41008f106c127a8d710f29a4b9bcb10c13 SHA512 3ea64ce9cc162030b40da859e8617e6c724c3529a57d2e6ae8dc311b4397532d8946aac7f66f49707dc85d046e892faa77bf1293a66c949fdf0473028dc4beeb
-EBUILD dcw-gmt-1.1.4.ebuild 452 BLAKE2B d3e7f24b15e1ef1f7740acb65e009923887aee91d407c38e7e93ba88320da60026838b1be6740987c5759422845b6d9a40b56291764fe6108d7fa7a33bcde21a SHA512 41b2af742de6c3df1b64da6df7b757f2ca3a02a44b9021d31a233748db7a57e2bf06cacdd58249954bbacea1e1ee37dcfd239405644aa57d394bc624ae496f4d
+EBUILD dcw-gmt-1.1.4.ebuild 451 BLAKE2B afd13b43c9c51358599df8fa3730f8734542195b15293cb8708b34d2f68a52f99beb3232d9a417ae63c357b294d939101edcf9af6eb946025f04e4587da5a696 SHA512 64308f4bc0a6e18fc286708473ffe52a1bdded53da2d60519a4d5e2dd7feaa3479f8d5968a6e23ad7aef4ecceca34fdb414bb2d9ccfcf9f4a0f0a07e09286508
 MISC metadata.xml 834 BLAKE2B 910f79b5689fa225893efbfbb480174ccf45af11386a2a895674ff7f82b67c89b27b6c6167211c81ab15dc73da99cbe08c044f10d7a505cd66852655fff174f5 SHA512 c76481284ec83209a6768cc867d2199678780dda888b699d56e5ebba68c90d0a0d246fff8cbbe1dc03199df23fe5aa68210320c46ebda90de0b6389a8eafe2cf
diff --git a/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
index d9fa317632b7..3d11416ab7ba 100644
--- a/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
+++ b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.soest.hawaii.edu/pwessel/dcw/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_install() {
 	dodoc README.TXT ChangeLog
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 3fd56d53605f..5536c6e33199 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -4,5 +4,5 @@ DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279
 DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945
 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
 EBUILD gmt-4.5.18-r1.ebuild 1967 BLAKE2B 7a19509a881a2e0dd91170846e1cb7b30ade83cfacf73e6afc0f02dfd361eaf0bf1348fd9c04a0020f7627fb8a3faa65064450b25e80ad14b2e264c3f25f87a9 SHA512 365ecb57d47a055b2a823483399bfeb52071cf60895f08dcd960fda354a4e225557a22f9f6acae882c8326f0625f166468c6e3d55e6398a4849e9ef3547a64b9
-EBUILD gmt-5.4.4.ebuild 2941 BLAKE2B 659a81a0040cacbd5cd96294f5cb25507b9c887c6b5057ae2a1ce328f441c2158d38140b95622ab842446da70045e279a958c952ad678f5ba676d39c98157d12 SHA512 97ee30a3f636ec1b27b67f8ae19eca7eefade26acb2bc8c2f991c0f6165247f09aeb80dd2e311d64628868de8dd470bc88be152d1e33c188f7a66db0e718f6dc
+EBUILD gmt-5.4.4.ebuild 2940 BLAKE2B 5f778aa40c91b1317203198c25ad40f5dcbe887bb93a84a10fa3406cd9d68f69edfc282b3fe982fc926722f5be4cea102e9cd7d10dcb7cdb30673fc7caec1b0b SHA512 db057f08220c4a4ca7d4402c3f18403574ccc4e6607d6b2692d2e952dda74be36a131f813d9d470639e1c0624025dfb2563085c00dd1d57bf68d6d534150290d
 MISC metadata.xml 918 BLAKE2B d3c35d50145d54df689dba5e34f4feaf6a45a202b99f271b467b9d6faecf630e1136ceb0c46076fe4023b6b8913567c8463ff7fb1d0227d4314ab5b784c62c65 SHA512 47680e3a33b2460205a41ad12da27770803d81d42e85ade54250d75eceb9ec797334ebfd5af6b620bbd99a1ee63b3106ce75c5c101b6abf29e1dfa05c8ded048
diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
index a7b032d1fa8e..31d9c0f51243 100644
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gmt/${P}-src.tar.xz"
 
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
 
 REQUIRED_USE="?? ( pcre pcre2 )"
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 02463bbc619c..3777514ffd56 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -9,5 +9,5 @@ EBUILD gpxsee-7.20.ebuild 1329 BLAKE2B 0519cac214de89aaf141f90bc9a47432e11c76446
 EBUILD gpxsee-7.23.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
 EBUILD gpxsee-7.25.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
 EBUILD gpxsee-7.26.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
-EBUILD gpxsee-7.29.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
+EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.29.ebuild b/sci-geosciences/gpxsee/gpxsee-7.29.ebuild
index c5b1bd5f1e11..3df0021a02e3 100644
--- a/sci-geosciences/gpxsee/gpxsee-7.29.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.29.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gpxsee.org/"
 SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="dev-qt/qtwidgets:5
 	dev-qt/qtgui:5
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0db2dcda370d..feb7dd584a59 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index a65f45059888..f3d01a84db48 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 576 BLAKE2B d1764b2aa02fc114ad8bb562d1c44a6669cf3ee7442ca12cfeb2dc16476a06eba50d38a49627a33aa984c8e5c0a2147b62874c568c72d357a48be104a8b9882a SHA512 cc43c214d7d31a7d2da737f513f580a9c391aa8a8cd0050065be569d5ddd8dcca6458ec9d789454b31efffe2dfae34d54b8b433f0105843ff78f1fbc05973a2c
+EBUILD btf-1.2.6.ebuild 583 BLAKE2B c16851dd487b6d30936c4dc242bf6832477bf3e770c19e8da3a195c8fcfbdd77b45f9dbf0c040147b5ea01912dbe6e385aafd64ff6691ebc7b333c9ed4987bdd SHA512 7131c4cd6d69b6dfb13acf854475cd943a63bcc7d3898c187f2b04a1a25ce4acd4c1f0871ae11423133a6545cdcd4d2b765bbfae1b3deb6f58cbaafd1d406905
 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 085477593c5c..6d1b0659d374 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 ~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/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 0fb37542e657..04e5bc622aac 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 804 BLAKE2B d8b006c157f231ea2921db2ef6c385cb04616869125a5b8cc75635f8ad8cb001bbfac734745babacb4447c5209564a2d02d1b6e7423ca759c5957e4b5b5b06ba SHA512 d3ae803a2617814ffcd4cab52e830a2412e9a6395889d1da17af9461b60e99c57d5d7d6e6136820ba9f6d7e24d2478e733fc547b4dae2d02559fe51a63546cce
+EBUILD cxsparse-3.2.0.ebuild 811 BLAKE2B c3b57bd6d8cbb18f08d37cbac82eaf2f74739b296fae3e932d4f27dae73cfd7e3307bc3f532f7790c6457e25af07c3fb663bf8bfc6c6e11fc67575ed3b42c3de SHA512 1e88738b5bb8ad0a57774f7c6fa37ef426127c34854611388879e7158fc1a7e144a59347a47790223a7b6f77ec87f50cb9f3771c2781faa6bfae863b42110193
 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 5c8ca14041e8..0abd3b6775cb 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 ~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/geos/Manifest b/sci-libs/geos/Manifest
index 8b53b73baefd..0d329cd938cf 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,3 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-EBUILD geos-3.8.1.ebuild 1112 BLAKE2B afa7d180906c86844c2b0f7a9b7305b30b32b91fef8f691449830e720a3547018440e323918e2453c8f138e7b2390246f97c83ba999a4cb6c5afa353ed2ae57a SHA512 78a60b83eed54e0882b2b168a85558c3fe6b24e208b8f6a70c9971f9e9015ad108ec6d591e898ae058e320478d702edecda44e9ed0c6f4ae14b76b2900f87278
+EBUILD geos-3.8.1.ebuild 1113 BLAKE2B 7e7529e6272b6d9eeeec6230c0f945a368b55b3094e304372dceeab5e846c80350331b687300243a24c92e3b265ef5fbf136a972abecf28e940a31e71399dfda SHA512 c95a5d2a6d67b2abb3fb2d227abacf836496404220e67008dda3e28f60fa4aefd5e9fb86a96380445a97442ee16f937cf2c2d368c9581b968af8dfc58ab09619
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
index d8be59bbb02f..baade73842c7 100644
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
+HOMEPAGE="https://trac.osgeo.org/geos/"
 SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 35489902da5d..1efb1aed9801 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 645 BLAKE2B ce3bd69512dea6bc4afb5f0ea3bca390a2fbac4ac03bd76389fb33c1a8c69604752150a0c36d498db35f7bae2a812eaf93d2a8073c95d3f4454b53c00f47ad33 SHA512 47a63ca14063291a78a73688d29b9c7be4d9da51f4de705c1fb045e859db62ef5282fdf2140d397da224ffe3b228d4e57e391677aa413a67f71b3bda1016e4e9
+EBUILD klu-1.3.9.ebuild 652 BLAKE2B acc4ec5d390bf989f0eecfdff60b8183faec3badcf44f0fade78314f5b40ce26c12cab521e608a9935314dbbbd1d20a8691792190596dd1bcfb5e984bdf15804 SHA512 d29ddc8c1ae5eea76cd2e84bd7e4eebeaa3cf1ec365bf5e98f3d45afdcc696b32bb1f00ed41ac968e7afc6b041ac9701fb27c01e345dde36551c9697db37b668
 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 42c4aa31b6d3..3222f16c3e55 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 ~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/lapack/Manifest b/sci-libs/lapack/Manifest
index 1846f5710017..f4c10efc1db9 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 EBUILD lapack-3.8.0-r1.ebuild 3018 BLAKE2B 6db2da7db3213d7899b2becf2eebf348443d0730b5e3277545380aafdbc93bab9b75d5fa398e1daa7a4b4ed9740bb93138d3206c37ea6df89bc11b1e5d610cc4 SHA512 4e7762e8298aa856aeadb5496d578efcdef2b2ee3163b8ac8ad5423746a8a878475aa9629912bb2ddf00ebb81be68f4a0f2a67a098a052420dd1824a3d19fe6f
-EBUILD lapack-3.8.0.ebuild 2960 BLAKE2B 8e5bf248f8b35220f9c0f342cd346d13768903c085ac1cd0f50031c9c119aedf10be81c0dfafe3759b91dd7d4033728160c0b54ff108931426b7eeb5ad773464 SHA512 5e2d5833d072d1e66c9d36dbc0d3ad4f27a8032e8dd5ca2b9d535bdd1dac9d69d63968eb7b0654a21cb80ce72f0cf6c2ec61f09bbc9caeae732784f8e8619149
+EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 3167f4c22b5e..7b7241aeb315 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 33ba31a112a5..5e4a5bb54696 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 637 BLAKE2B ca028428a52d47a0f16f77398073eea94994b370d363ce43603b35f074cd268a7a38417bfa64701812742c982ec323423c6955aa694220fd044a23fe4a222075 SHA512 67d028cdafcbeaec9c77eae218a0dde6d9444b46b41a0e1f9b8bf81952f565074498f4266dcad9c02d78c3417c813cee4d74ffcba0c14731ea657d6d0d73fe3b
+EBUILD ldl-2.2.6.ebuild 644 BLAKE2B 446abc2d8bd61598da6c5dc998482c0f0e266eef983a002a4c2ab0079bab980f8fded0df818ef72fff922925eeb1fda1f3d5648715b91d1f0c2adc74cd4de99c SHA512 3f4d63be8724d4a7c4246e441833b99bdf72937c556d387804d7ab7d44d8aa5ee0274b07c7c9b7dbf2471add2412d7110404d3a399d2c929466645cfa29b92d0
 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 6a1f2acf3873..97dc7300636b 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 ~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/libxc/Manifest b/sci-libs/libxc/Manifest
index 29ff4811076e..8b8774454d36 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -2,6 +2,6 @@ DIST libxc-2.1.3.tar.gz 750044 BLAKE2B 6d6bb348bd8f7e25d6a3857fc40f0d7d3a7fe22c0
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
 EBUILD libxc-2.1.3.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
-EBUILD libxc-2.2.3.ebuild 1398 BLAKE2B 245a0bdd3b8c224e65414780d098bc56c6cf008ae5071d3c1d58855f2cfe413f9ea32233ab4ac84815b14f6aecc670d5b9c37fb1029fcb3039167ae450d74849 SHA512 a012b81405faa47c0130a86cb472065c31606080158b06411b933e82c79a12388313760871109c7234ba13ba853b137192479ee3698ebb463bc539d4a9978682
+EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
 EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.2.3.ebuild b/sci-libs/libxc/libxc-2.2.3.ebuild
index a7776b7b1e8d..377fce27feed 100644
--- a/sci-libs/libxc/libxc-2.2.3.ebuild
+++ b/sci-libs/libxc/libxc-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="fortran static-libs -test"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/sci-libs/orocos-bfl/Manifest b/sci-libs/orocos-bfl/Manifest
index 41acf77aab0c..bccb1fdf372b 100644
--- a/sci-libs/orocos-bfl/Manifest
+++ b/sci-libs/orocos-bfl/Manifest
@@ -1,3 +1,3 @@
 DIST orocos-bfl-0.8.0-src.tar.bz2 212899 BLAKE2B 86e4161ffd627a8546a70ce0a577aa965475e70429861578e46aa4e67ca06c42784790c65c712ad7da80b6e414901731b222f712a7983f112b4026f9c3acdd15 SHA512 045bbc415feec66206774a8bdea3843a7edf233d221bd639b1dcc01906386ff55f114a9685e1008b741ae895e6aef33641a1eab67cb106d23a085d77f1a937d5
-EBUILD orocos-bfl-0.8.0.ebuild 1305 BLAKE2B c2a386d9f649d426cf1c51df88c0ecf8e88d58cb6cc4047740533a8731f0ac29328cab3352d491b28695294dd59ffafc631a78abbc3cbbc3fe26fd99b3c9b359 SHA512 4c81ad611714506c0340f3d6cb493f1d4cd510dccffc774f05864d8fed5c4343280147b87f9d1c1f5657c350953ed8fd6ac6ebd2320ec3a6cf155c6cb7c9a9f1
+EBUILD orocos-bfl-0.8.0.ebuild 1307 BLAKE2B f2557d604813f731232e194419022b4f0678b89989af981599506ae158bc87bcab2277ba31213fa9b57b7a879d7d8c1a96ee9aeeaa3040eab4ca11cc2299596d SHA512 c5deb5cdfa05654b01852c4f19063b942d5253b582b995cccfa55722351a06565b6df01cb0eedaf43738185207754487338d8c218462a445a1b0088cf57edb8c
 MISC metadata.xml 603 BLAKE2B 18aa0b2928931ace7b5af80d4efa46d1f63023e9c30f45499a0cf416cfe74927570292d95641eed606a4d66858460d3a7f6de43ba061a5049e1aee2758e7ee8a SHA512 e4c29ba5a7a3cbe373fcbb4b69ca3ce99e6e092585f3d27af31469949f4ca28a6bf2d4b1850271ddc7c7bc2c70b43bf27411e9fcdef2039c3e0f0949523ded6c
diff --git a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
index 9b1481d44678..bc79a85db067 100644
--- a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
+++ b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="Bayesian Filtering Library"
-HOMEPAGE="http://orocos.org/bfl"
-SRC_URI="http://people.mech.kuleuven.be/~tdelaet/bfl_tar/${P}-src.tar.bz2"
+HOMEPAGE="https://orocos.org/bfl"
+SRC_URI="https://people.mech.kuleuven.be/~tdelaet/bfl_tar/${P}-src.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 29473615bef2..6a76399448fc 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,6 +1,6 @@
 DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 BLAKE2B 46b7bdb62c09e9077b84d914b4d780995f27d486d9c734ef2ee1f8b8c2219265cdba5e63830225e2435b5760b79f00d478670e95b71666959afa773f8bcfe5ce SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.3.1-r1.ebuild 1645 BLAKE2B 3e62191752f89fac3d0834f487152fe96aee63324c3084a7561e0133316c204beccacb70090eb7ffb7cafbdc9a473d4eda7504d6082677c48b96712961ea5951 SHA512 5fae87c172ceee4806ff38fadafab94cfbe5b586109917356a18be4a7cab30e1e9d3726a71ba3865330aecc81b3dfd43c2555b3dc76354bc573c321ff75204fd
-EBUILD orocos_kdl-1.4.0.ebuild 1648 BLAKE2B f5191706dc5cf443c3088dcf96d2ffb705f5934c8fd9258fb009ebc7309f13f0433379cf98ea128cbc23037b0235e79ef9cc650dab271d8584457c1082362d0b SHA512 c68229f5e2687697826d8d89305c78b948398b56041098d3856e53aefdb28a6bf137900a0f6b27e9ff47da03e9e9190c07896ead1323ddc994aea05a10d6917d
-EBUILD orocos_kdl-9999.ebuild 1648 BLAKE2B f5191706dc5cf443c3088dcf96d2ffb705f5934c8fd9258fb009ebc7309f13f0433379cf98ea128cbc23037b0235e79ef9cc650dab271d8584457c1082362d0b SHA512 c68229f5e2687697826d8d89305c78b948398b56041098d3856e53aefdb28a6bf137900a0f6b27e9ff47da03e9e9190c07896ead1323ddc994aea05a10d6917d
+EBUILD orocos_kdl-1.3.1-r1.ebuild 1646 BLAKE2B da6283dc04b4edaf59a88818764dab2d65756c3702a6cafe67a495e767be7932a89d8fc4f0f3fc32c0ea6f49841a1dddad0f117f043a44f6ebbb91e7ec047707 SHA512 bbeb90da6a14f6d7d1656535207bacce3385b300fcfa017acda21d674a9f8fcbf752bb020a82432d397484c3344cddaea1836c57946a6f71a4c3a8117ca4e5e0
+EBUILD orocos_kdl-1.4.0.ebuild 1649 BLAKE2B 724d04a6ba1eb9726a0321f090d8300f5d77ef675fad7656a4b94e5885409fbb92c71b89f1301969d2c007bb2d3c0901c05667ea1b51f6c5d63b834a6a894634 SHA512 fdb4f9996afac17294ce5c00390e91f9709025f746cb6551123f279e1b899e352054007f13ba140ae07ee7633987bed292fa0ccc9d510022e192957c89d6bc4f
+EBUILD orocos_kdl-9999.ebuild 1649 BLAKE2B 724d04a6ba1eb9726a0321f090d8300f5d77ef675fad7656a4b94e5885409fbb92c71b89f1301969d2c007bb2d3c0901c05667ea1b51f6c5d63b834a6a894634 SHA512 fdb4f9996afac17294ce5c00390e91f9709025f746cb6551123f279e1b899e352054007f13ba140ae07ee7633987bed292fa0ccc9d510022e192957c89d6bc4f
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
index a2d743e268b4..e45b79724fb4 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc test examples models"
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
index d3860db1a16d..80637a8fa224 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.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=5
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
 IUSE="doc test examples models"
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index d3860db1a16d..80637a8fa224 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
 IUSE="doc test examples models"
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 06b7fc018af0..8567aff42fbb 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 1016 BLAKE2B 68f3fda3615507c1318381e36bd626433f459c81df300ed6fe4ec046bfe64031d2df48185082484e7aed40db328883700e4a4e559d6d0380ec9e52aabbb66373 SHA512 b4d87d842d2a9af276c4ee00e43294021209c2dcad61ff6a11dec09fab471a64f918ee08b2dd127e82c81ae93c72c695d30c1a2f3ec9a6852cea4f1d3eaf279f
+EBUILD spqr-2.0.9.ebuild 1023 BLAKE2B ed6a0ac25f2429914de6698a642d81581925c3d508158c85d939d0d97ccd1bf078f0a24496c0a690e744e99a688cb3f266c0ffe58007220cf78ca897ffec2033 SHA512 a5b32420ecc94feac2372975f6115e5e25e15a3e1ea9f44cf4a87ae577b67f1548da01ff34e62b70b87b3aa5fb75b7c41ec09fc29c3d6e28f441e2b556c7e45e
 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 342617b94340..b29415ba3f9c 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 ~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 020a9d46280f..1a4832e7b92a 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 773 BLAKE2B 8d71d61679e73442355959a70431986ad38915a7489ed693a06dece32f39dde4a6888a76d68bd22b255486c095070f5aed61e0434b86aa50a8fc441b6be9f25c SHA512 520851e7268837838983b29c3ed740a80e8941fea40ebf397924e665b9e24c28421336a55f51ca0cc854bf1a67ae1eef6963fb6e32d04d197e0fe7e113840820
+EBUILD suitesparse-5.4.0.ebuild 780 BLAKE2B 15cc7b93a9e063f453b4f51bdd87781b89626a495eb520e2a0b35f57942df906787ba49c2ad3483bcc0801606288653a830ce9b1e0303343c6676cb6bfc49a58 SHA512 2204fc147fb22de262f24cb90feace1a837542aa28ac135fdd2c1448d55cb3c8f818478355080a63356164e70362d51e2c98b5444d0e34bf5deafeb0d8a2c50e
 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 afae8da50f4c..fc9edc66953d 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 ~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/ta-lib/Manifest b/sci-libs/ta-lib/Manifest
index df3c7661b457..3c4a5c8c9499 100644
--- a/sci-libs/ta-lib/Manifest
+++ b/sci-libs/ta-lib/Manifest
@@ -1,4 +1,4 @@
 AUX ta-lib-0.4.0-asneeded.patch 3304 BLAKE2B 5350248ae6511136ed09f66faca62021175b4c98030e271f98f08ad948b8b7795eeba84d44b4e808217da76e163a1f1cbcd1dde052de6a8f2351d53947728328 SHA512 aa43a9cd5382eb43cce2dd64325a36fd88bdae7969c3c191ddbbc7ed726145d7cd1cca17196093c7b4af63a95d3a118d6f2e93ff5d021105091056a325042123
 DIST ta-lib-0.4.0-src.tar.gz 1330299 BLAKE2B 2acc09c2a01c02912dd4ea9a72296376dcb4b434723508829d3b97fcb77baaf8d4eaa44a84fbdb094119890fc1949fc52f759345101d8848032c3814576623c7 SHA512 d7ae2acd830cd23b58bded8a90759edfabc73923fbed3cc09501c121cc937caf728c29678f456c2dc7e72fabb52166bccc19ab51ab1131c7d8d35c201c94ed4c
-EBUILD ta-lib-0.4.0.ebuild 679 BLAKE2B e7f8cb0f03219836d0fffaa0d5dc90d3fb2911485ad7b46a75b68fe3a6ef3f5ddb5610275c0449cfb7f92cb17b261cdbe2d525fbfef101b471d8cd8ac070747f SHA512 e178ea0cdab132427d2eb5fbb11e76150c8b8a6382d6ce9d01e5f02f515c8c119989405ea5a7624fa0c3580e70cd7d35976bee5b9d0d23bce5de86490d162457
+EBUILD ta-lib-0.4.0.ebuild 680 BLAKE2B 39f49bcc48aa0555ce6dcce4ab9b65198b48b052e93901bca53b61c68455327ca339cb65dec102de69ca5b3c1bd16b3d485c678bba6ec9e5690d2d8eb50fb864 SHA512 570ad457f5a9c1367179e2aaddae6760308d012747bc9f0c16976a84586ad5ba82000f96256d41c4b755ef4d7f3f4d6fb888b83160f81f0b162d65def8546403
 MISC metadata.xml 243 BLAKE2B 400c5a1dd01546d5bf24cbf3a8944fa5f83d60ebe181ae799e2d3ce7c862458369524793540d78cd0c8e15b77df23cb90db634b7b7c8ede5373a53a03fe49b33 SHA512 7ce6628e1ef9623673a4981aaaca3a1a3e9f030b6826929de1307bc1ea6d18b31bb5f14e8aefa60a6ecf34c874b4cb18ba8d64e869e151cf750b79e76e394bcf
diff --git a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild b/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
index 7a7a581a503c..508a8a64f8d4 100644
--- a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
+++ b/sci-libs/ta-lib/ta-lib-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 autotools
 
 DESCRIPTION="Technical Analysis Library for analyzing financial markets trends"
-HOMEPAGE="http://www.ta-lib.org/"
+HOMEPAGE="https://www.ta-lib.org/"
 SRC_URI="mirror://sourceforge/ta-lib/${P}-src.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
new file mode 100644
index 000000000000..c10bb7b7834a
--- /dev/null
+++ b/sci-libs/volk/Manifest
@@ -0,0 +1,3 @@
+DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
+EBUILD volk-2.3.0.ebuild 667 BLAKE2B 1c1b34a85ed9d4e83931b92d170bd6205c616264aa1f41b4981d7d66f8840bfcef3da2b00ae290e0cbd84f28504362e26be37f0bef54b833ac70f2a9bde0ea37 SHA512 3ec580b75f0c7d7021dccad6dbc26b8f367e2c5d2424b79dbf02972049fc62acc636eed7b1438a3e2369ab1d6b16aa5424cfcb0947a7bb863258a43f2468c91c
+MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/metadata.xml b/sci-libs/volk/metadata.xml
new file mode 100644
index 000000000000..2b9b4266ca5b
--- /dev/null
+++ b/sci-libs/volk/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>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-libs/volk/volk-2.3.0.ebuild b/sci-libs/volk/volk-2.3.0.ebuild
new file mode 100644
index 000000000000..f7a14102aec1
--- /dev/null
+++ b/sci-libs/volk/volk-2.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="vector optimized library of kernels"
+HOMEPAGE="http://libvolk.org"
+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"
+
+RDEPEND="!<net-wireless/gnuradio-3.8
+	dev-libs/boost
+	dev-lang/orc"
+DEPEND="${RDEPEND}
+	dev-python/mako
+	dev-python/six"
+
+#https://github.com/gnuradio/volk/issues/382
+RESTRICT=test
+
+CMAKE_BUILD_TYPE=Release
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ORC=$(usex orc)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 8eb4ecabb24c..2b4272749df1 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -9,7 +9,7 @@ EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b
 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.ebuild 821 BLAKE2B 8ba8afa6b5b386d501b2025443d9a237d6949fc8762fed0572ecd61850b57960cf498120bb3e653bb746e53f17b4216bb6372d415e30bd0634f47e5f567f1ec1 SHA512 d67a3a3021a7d9acf8c485c0cafa5c04d1165905ccc3c84d74586ead84dcfe922000fb5666ac15372b3d0529cb9bf94026233b8f821a189099339be7b4a8e8b7
+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
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
index c6ae6196c3d7..3370b1dc94bd 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -9,12 +9,12 @@ 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"
+	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"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 2c9f78ca9162..2620c4ee32ee 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 0c203194367b..eaa029baea7e 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -20,5 +20,5 @@ EBUILD octave-4.2.2.ebuild 5103 BLAKE2B 690f0a397a887a26d0ad7dc31af6893af0ccafed
 EBUILD octave-4.4.0.ebuild 5082 BLAKE2B 8736fa239d93b6847d413e50cf75427bf16407814d5d32f55f2d8688b57fbeacb471afd2a86ec8c1f6a1c1da11882a40dd221e5eea9fdd0ad59e224c0f1e5d65 SHA512 b71030ab908c404a3672d1df9f85e2cf3aa99f4e6e968ae90a95af228912e4615e869d58efaa018a7cb1300d4630111af82bc306b3d1e56340df5dbd1065bd32
 EBUILD octave-4.4.1.ebuild 5180 BLAKE2B 495f7aa6fc5508fbe2285e5fbc8eb7a4055d84e538384487c3f535f9d5cb90bb3c0d896455d05a02878d786a0a338373380f8e955415673a625db17cc80a14fe SHA512 b26dd91d325a55a94da6eb4bba15f279f3d8c80dcecc19c53ff3d8c43c664aea45769b0f3310a38addab326bf6bc59aa6b88b2b07981d731803d82865989250d
 EBUILD octave-5.1.0.ebuild 5076 BLAKE2B 6f843fc6ff0157c6e4f80aaa2f2cc056c4215483e0b62b809821e8f81234caf8be57bb9232fd305fb2bf8d4266de452b7efa20c208a23f4aa7ca4e038785adb3 SHA512 41f83b3a3431a103b10a654573a8d7cb5eb1f45b79125e15818d8f2850faccd5266ee24ee102e4bed0452ba17a3d8999ca755830fea353ada4dd973282a5b0d1
-EBUILD octave-5.2.0.ebuild 5461 BLAKE2B 6e31e77cd0ed5e8c6dd53fc8959cbfd4f89695df7545e40c3038ff7172108c2d9669d79f3af0c6e638b4f4a68703dc7faa8a77ca8f6671870c1cb3b755088450 SHA512 4b9628bdf4d55a37ed29f7b1dbde04b302f3ddccba10f3df424a1419d59d01ca16c39ef421b341a3e0434c19bba8ec5cafb8e5e191b2c9dd8c213aecffe39ac0
+EBUILD octave-5.2.0.ebuild 5460 BLAKE2B 42e812d4d982eaf4cfd9a08b041ef5bc46450e0c481caaa82590e93798e2b5d3df4db7ac6e06ed4e881e6dd1dc8c582d39499243894e4c837025a7af5613ac90 SHA512 1a58e2e58814ebf34e6fd698c8fffe46a73c55df4a345ba02bacca4120b23b4ac6ce18b729c1b4b949d1fabfff61ff0813393e50b25a451d9492b9ab4f504163
 MISC metadata.xml 1137 BLAKE2B 69a3d32e58fcf2f855b54664e1fb4e0f2eec69bd8522218957320a0d0f8bf67fb8d5e28f7f108d3baf7992454adef3a416d4bdae9d7b4fd2bfe77225de17a69e SHA512 7351fa4b9a696406543cda7246378e4b4df4dad3033f9a87e4c5036663fc32965c7db45d8ff32959904a9bf71cff88484b542bc3e20ea0ee946a0025c091a345
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
index 08552a338be7..1fe5608b0c30 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse
 	ssl static-libs X zlib"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 584fbeeba4ae..085416a0154f 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index e2b679409550..790d07e53ce9 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -18,7 +18,7 @@ DIST G4RealSurface.2.1.1.tar.gz 133386050 BLAKE2B 68fb3ebadabe0c04a34279c9ff3a15
 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c
 DIST G4TENDL.1.3.2.tar.gz 585100935 BLAKE2B f58bc9e4f6741d7df84559bb41542ecd4de3891b3f79d8194d3f8174de6aed6e87f8d2d648315dac988b6daf6106780b6f88398da2040e67608da8614fb2cf42 SHA512 635707dc421354d8cd596398d69745b6038a80c44b7284951a3e0966829c08ac731bd42f7321adfab75d06d868f99e466c6f1425685770568f44ec6c1035903f
 EBUILD geant-data-4.10.05.ebuild 1147 BLAKE2B c0e238f637366de8523e5b2b525d7bdacf8a0227bae36525b24b01bd92afe6158ea55be4be24b2cc518427befac15b24c379ebc4e90982bc7313de8b0cae55e4 SHA512 3ca51ece5a9b7389c362001e5036ad598e63bc80267b5e41298ee1ee0a202dd67361f2eabf097bac1da365b0ea3218008456866ed6d89166c1d1ba67e7ee573c
-EBUILD geant-data-4.10.6-r1.ebuild 1526 BLAKE2B b63822e290da8efeb2db5fecd4ed606d6f1573b0b79656b6e57e9e8c55412a225b5d1bfc33ab67be030ae4fa864038280b3163f895e80d0372b4c53512932209 SHA512 660df1a4f9e2084f535cb64815e6ff454f4a1212f4bbabd10a9545d2fd5197fa68bf04bf6c50fceb55923d140de851eb7162b4b3be2e81093d076281c2de4a4a
-EBUILD geant-data-4.10.6_beta1-r1.ebuild 1526 BLAKE2B 3a1b648b4df6d26ddd5dc9b96ae3a831359f587a1378782da8f383104a5b45cf733917c928f1e36ff6e9842823f26ae2c2db5859fe832a2f7bb1a27ee756db8a SHA512 7352e8e80b0f02e1cb1cfbe61892103cef2ee3ebb3b5bcbd46dc75381e344412f7e7eaee22231edaec986967e506da5f044b04479ead11ab19b4b2be5dd83f67
-EBUILD geant-data-4.10.6_p1-r1.ebuild 1528 BLAKE2B 77441cdf8e7e93bc5e396cc41fbf826e811e487d14dd2b0e86a5df22caf0b6427eaaed4858cd95bc77f706dc76f348393c36c921eb1ab7c0853ead282bd877cb SHA512 21da826279791ddae7ac651aa73a317ff3765a64fb63e72ee47231f7320fc67e46c281312d36094f1b8fad893aeabe5fa0d6155d5fdf8a0d2f6ad316d7d8b4ba
+EBUILD geant-data-4.10.6-r1.ebuild 1524 BLAKE2B b881fe0ee0717a49debe85fac7ed04513817875cfcd967f2eceb28079480cd188496891704cbfff2952e141102b2ab8e10dafb5c5da4d5feef5301a07352ddc9 SHA512 dca660fe493429143c1daecde3d1478a1179e7059d4809eae21b85fbdb29e3a8790fd689736cbe613e2573ddfaf002f9d1ccc52ec6a6b53301c66f393c60ea8a
+EBUILD geant-data-4.10.6_beta1-r1.ebuild 1524 BLAKE2B 4963cba3d80c82727bcd98f1465865a8155153c67d3bdd1406c4ad084bc8977cbb5bca4f1c290132f15441dbb4e5dad5abd71d99e136ee8f3d6bd64f35b3f2d8 SHA512 e2c20e0ac7a4cc4be97785a0a7274acf815a4a32a91327a89c57644cff6092faf6968c9f0df5f89b2fd628522192d24ba6fd2756d9e608308803e3da59136e28
+EBUILD geant-data-4.10.6_p1-r1.ebuild 1526 BLAKE2B 16f555622770b9df68360cafc9bb4272744cf9a36fd9695eb5f0e6b294d34dc69a598db5e26da78f95476fb8ab44607a41b1e9a2639626e6de6ce8c83f630d37 SHA512 cbc4a91ae6f9ca918692c2cb714ed971affc74e07c7a2987bd77ca397cc0fa5fb64dabc593afbfe59a83230e840497f0d6bce0ad828b1c4cdd8aa1e87ab233ab
 MISC metadata.xml 534 BLAKE2B 84abce35bec7069db8e962a0f053de5f317d01df153a07bf93cf519b390336514da9e9c5bee2ae17637f5d93c5e7d04f748d0d04c0b0f3d566907cba7cc0426f SHA512 734a46e3c0bcb4ce52498a85d45a7fd3d8ee3507296aa36ec578e8f346a29aa93f56e4b0a3f68311531b383a6aa499a890e0483328013d9a7d208686d2cd47ff
diff --git a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild
index a0ca85d96b1c..7ad85c9daf0b 100644
--- a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild
+++ b/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild
@@ -49,6 +49,6 @@ src_install() {
 	done >| 99geant-data
 	doenvd 99geant-data
 	dodir /usr/share/geant4/data
-	cd "${ED%/}/usr/share/geant4/data" || die
+	cd "${ED}/usr/share/geant4/data" || die
 	unpack ${A}
 }
diff --git a/sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild
index 3170b228d6ca..ae4afb781774 100644
--- a/sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild
+++ b/sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild
@@ -49,6 +49,6 @@ src_install() {
 	done >| 99geant-data
 	doenvd 99geant-data
 	dodir /usr/share/geant4/data
-	cd "${ED%/}/usr/share/geant4/data" || die
+	cd "${ED}/usr/share/geant4/data" || die
 	unpack ${A}
 }
diff --git a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild
index 90910f4c9e59..23e22d50b309 100644
--- a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild
+++ b/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild
@@ -49,6 +49,6 @@ src_install() {
 	done >| 99geant-data
 	doenvd 99geant-data
 	dodir /usr/share/geant4/data
-	cd "${ED%/}/usr/share/geant4/data" || die
+	cd "${ED}/usr/share/geant4/data" || die
 	unpack ${A}
 }
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 06653701ea25..0f81060cb15a 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -2,9 +2,11 @@ AUX geant-4.10.6-datadir.patch 6571 BLAKE2B 2047655af7cdbf4c63a077c22ccda9eb8f00
 DIST geant4.10.05.p01.tar.gz 34413415 BLAKE2B d98a9308e37f166dccf8f9640a54ee74ab2b1d07275609666aec6d929b0193269a18075762cebaa154abcad5c8359a128b6629ff973cb6cdc8f54535151997a3 SHA512 ace2097251ee4cdda3511c3dd8191c97e1001f73d421797e3cd517ed41fa5adc73efcddfb2c8b6fb75231e5af8ddb4bd63a402ccb99b40ce2c140588d328b582
 DIST geant4.10.06.b01.tar.gz 34511064 BLAKE2B d20bd338ea0ac47b11464b581aa0dec3725da56902dbaab233fcaad28ba6b3ce302a8d7e2c27f4532bed2db991467b4bde837675f3837f066c9e7e3d78c7acd6 SHA512 3916a0ad13891fc5a189c0be6c2e57abe29281696c9d16c0c54fd11940146586feb550a61403ab6451e6575d2ad1f4349590d9c564d7b5d7fc5ab9e9b2356ccb
 DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0
+DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80 SHA512 bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20
 DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
-EBUILD geant-4.10.05_p01.ebuild 2642 BLAKE2B 324ac7143b851d13a13de09a6cc578454439b2783686cf9458ab9ca478950f04789e0e5cff59f2ce6627be117102d9e88e8b5eb20c0cf746748bea1bc432feb5 SHA512 63ba64e7e920163df7fe9343e75b6c3a6cd70337f965e26931e3f521f5ace78deb79f4fdac3dfb1e8e1dd214587e9457de62b4aa4eacea522ad95a6580a2b90f
-EBUILD geant-4.10.6-r1.ebuild 3070 BLAKE2B e99c08bacededd8892a727c6213672fd80be189ed41b8b95df6d42a10fdeed2304e98296b97792e84f89806512d64ab1c2efd000f3088ff88d8896f42590bd63 SHA512 9559d5b33eb857712a2a15b84e557d911349f93d7931502ab993f9906389127ee368211180e8aea9deb386365025e10f086cfa7e0a6b79ac89aebf17509f5c2e
-EBUILD geant-4.10.6_beta1-r1.ebuild 3070 BLAKE2B e99c08bacededd8892a727c6213672fd80be189ed41b8b95df6d42a10fdeed2304e98296b97792e84f89806512d64ab1c2efd000f3088ff88d8896f42590bd63 SHA512 9559d5b33eb857712a2a15b84e557d911349f93d7931502ab993f9906389127ee368211180e8aea9deb386365025e10f086cfa7e0a6b79ac89aebf17509f5c2e
-EBUILD geant-4.10.6_p1-r1.ebuild 3070 BLAKE2B e99c08bacededd8892a727c6213672fd80be189ed41b8b95df6d42a10fdeed2304e98296b97792e84f89806512d64ab1c2efd000f3088ff88d8896f42590bd63 SHA512 9559d5b33eb857712a2a15b84e557d911349f93d7931502ab993f9906389127ee368211180e8aea9deb386365025e10f086cfa7e0a6b79ac89aebf17509f5c2e
+EBUILD geant-4.10.05_p01.ebuild 2646 BLAKE2B 571209a14d118cb9c0b53df20daf4daad8fadef791b8b5dc74ba977e5299b5dacae581f0cb50cc3a20147ae499b250468f019b05c0fe56ac6c3880f228d69003 SHA512 00c02e6368875ef758e8e7278b1f7efcf32e887304e95a4b9617478cab40bc3aa37076bf85bd9527cca0f2103a4d34f7d1f4429a110dd6e83e6c3ddce6f6a443
+EBUILD geant-4.10.6-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
+EBUILD geant-4.10.6_beta1-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
+EBUILD geant-4.10.6_p1-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
+EBUILD geant-4.10.6_p2.ebuild 3024 BLAKE2B 1716d3eeb1092286b0d166488c38bd44206790e5a9b5937b542019960001f5d954de57c7bff709f8359b7cedbdfb4af76121cff22c8bbf8bb331105ad035809e SHA512 713ac726c201f589d1c4b42b1bafe2c8144e3eba46d12dd53b413f48bcecba9c5789ce10a0bd0384d40c1f7854bdd057253a47d2df0f66b0e90f15e66cef5785
 MISC metadata.xml 1683 BLAKE2B a0eb481dd6e784064dce6265b9361b51c24fa845f7af7ec238a1ffef215ef16dba7c02b795d8ea50dddb255c513c1a3941761bb99f813664d3ef012377aca174 SHA512 7631f3f6fbc0a5a730fb260476c9d514b05c71c4967c5f0059523cbae99415e5e48a416a8a4b481de5c2c484484489b4260f8ceacdeca4b0ee0e670dc7293985
diff --git a/sci-physics/geant/geant-4.10.05_p01.ebuild b/sci-physics/geant/geant-4.10.05_p01.ebuild
index 80ee3ae7420c..b8111ecf55c6 100644
--- a/sci-physics/geant/geant-4.10.05_p01.ebuild
+++ b/sci-physics/geant/geant-4.10.05_p01.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 @@ MY_P=${PN}${PV/_/.}
 SPV="$(ver_cut 1-2).$(printf %1d $(ver_cut 3))"
 
 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="http://geant4.cern.ch/"
+HOMEPAGE="http://geant4.web.cern.ch/"
 SRC_URI="http://geant4.cern.ch/support/source/${MY_P}.tar.gz"
 
 LICENSE="geant4"
diff --git a/sci-physics/geant/geant-4.10.6-r1.ebuild b/sci-physics/geant/geant-4.10.6-r1.ebuild
index 96a48a6d3ea1..59fedc8d7cc8 100644
--- a/sci-physics/geant/geant-4.10.6-r1.ebuild
+++ b/sci-physics/geant/geant-4.10.6-r1.ebuild
@@ -23,7 +23,7 @@ case ${PV} in
 esac
 
 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.cern.ch/"
+HOMEPAGE="https://geant4.web.cern.ch/"
 SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
diff --git a/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild b/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
index 96a48a6d3ea1..59fedc8d7cc8 100644
--- a/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
+++ b/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
@@ -23,7 +23,7 @@ case ${PV} in
 esac
 
 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.cern.ch/"
+HOMEPAGE="https://geant4.web.cern.ch/"
 SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
diff --git a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
index 96a48a6d3ea1..59fedc8d7cc8 100644
--- a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
+++ b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
@@ -23,7 +23,7 @@ case ${PV} in
 esac
 
 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="https://geant4.cern.ch/"
+HOMEPAGE="https://geant4.web.cern.ch/"
 SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
diff --git a/sci-physics/geant/geant-4.10.6_p2.ebuild b/sci-physics/geant/geant-4.10.6_p2.ebuild
new file mode 100644
index 000000000000..b266de392cd4
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.6_p2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*_p*)
+	MY_P+=.p$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+*)
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.web.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.1.3:2=[threads?]
+	data? ( ~sci-physics/geant-data-4.10.6_p1 )
+	dawn? ( media-gfx/dawn )
+	doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_WT=OFF
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	if use inventor; then
+		mycmakeargs+=(
+			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
+			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake-utils_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3908721d4da3..6c2e74c9d6ac 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/apply-default-acl/Manifest b/sys-apps/apply-default-acl/Manifest
index 52edab64baff..19137e28a615 100644
--- a/sys-apps/apply-default-acl/Manifest
+++ b/sys-apps/apply-default-acl/Manifest
@@ -1,5 +1,5 @@
 DIST apply-default-acl-0.4.2.tar.xz 246660 BLAKE2B dfb698d6a220b426ea607a70e1c51295629e6ac4637de72cf64a8fe577ed83ceaf6beb7f8b1507ed0d059e6f16e88e1b58a24e641dd6280765c55a70fa30712c SHA512 afe3a0182b76689e41d3a6922a8459587f6013112767ab0d9b60e5197d677ee0cdabd9ebd18f9cb59d4e373b4df2f5845cabddbd382c2743a80c3a20205aa861
-DIST apply-default-acl-0.4.3.tar.xz 251744 BLAKE2B 81803993ba20a7098de2767650b452df11b065e9d130199c1b12fed52f48d4676cbc8d826735d6a62d16211f51d67131e8b379feb1f0464b8ee3999cfce77e74 SHA512 d0b14bc685129e62f244a21921f271bc7baf7f2bea1c7a3689768e4205b10092154cc84cc8136b7afd37abf0259aaa23e5049b67476a8afddcc3a2be894bc423
+DIST apply-default-acl-0.4.4.tar.xz 252164 BLAKE2B 7e584a1cc479b82a82a06214da06619e3e0d0228681277144785346c9829f2411bcdc0a0248bd5688813e9c8d2dcd4591653568e536e167d95b2c0ccc1fcc0bb SHA512 23c637845fcd7ab61a04c3d459b1468c36cd2a27f63b3ab5252a4e39615675431b3d781a7ddf87029ad1c03c4bda43f1689c24b1ad76d2f548bfe3484350df1a
 EBUILD apply-default-acl-0.4.2.ebuild 520 BLAKE2B 73d380faa9de3094a406e5860439e3d61eccb5cd9fc30dbc08d73e9e09f71b38f58d1c90131e6e8ac10effc56f11f58ba5acb77f43c55a6236747306fdd0ef08 SHA512 7a766757a43671e4e8b6dceb048b1fe36f10b79fc3b836d0174c0d2b9a5555ff822914f08869aaa722e650f0115f6267266a7a9a0038b39ae032759f82b42ded
-EBUILD apply-default-acl-0.4.3.ebuild 593 BLAKE2B b3dd0bee16e0c01fc961c06ed2f1e3066a47a11261790435db557174e8ba067fa5f5d53fd557fbb4c40d31117e2d646d7b96f0936903fda388c20fc5e8159053 SHA512 3069b26550cee43999ecff6f3c9629e95c585702ce46c4cffa857bc071728247357e968384a50379e321a7919f50cdfd7491661e1dc16197ba03816cc3e8c043
+EBUILD apply-default-acl-0.4.4.ebuild 593 BLAKE2B b3dd0bee16e0c01fc961c06ed2f1e3066a47a11261790435db557174e8ba067fa5f5d53fd557fbb4c40d31117e2d646d7b96f0936903fda388c20fc5e8159053 SHA512 3069b26550cee43999ecff6f3c9629e95c585702ce46c4cffa857bc071728247357e968384a50379e321a7919f50cdfd7491661e1dc16197ba03816cc3e8c043
 MISC metadata.xml 409 BLAKE2B d120f8236355cd9c5534402178c29eb8879f341053686f3d44c7c08f44d8e15abe905e8567b9154f6abb324aa1dbe5a3095e4a8d5377ea14c4906e932d5ee6b1 SHA512 ccf6bafbdfc01736cd151ee30fe4d2e7124ee633463052aa41e0a8ef687793d358825b53b01d21aa9cc9a64633ec37b2bd2b7a27aac20a6d56b12f79eff56b18
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.4.3.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
similarity index 100%
rename from sys-apps/apply-default-acl/apply-default-acl-0.4.3.ebuild
rename to sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index d71afea131b3..51d21590dba5 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-3.0.tar.bz2 562646 BLAKE2B 4acdd5469ac1b36ff149231ad0b1b2e4e85a54a81c24c7751ceeed569526b905c1cc6be5201c4fb6929eb48e0553f0b27016de2584ee2f702492cc3fe659c2f9 SHA512 0d61f0b183c0d453275913741020c54c2915be9df45be706203e2278b125f4a02c75865117a7a2d587a034caa9bf109b2f498a4d522cc103c3879cc4a5d4854d
 DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91ae84c5bdc6f8f69063a54bd192332f5dd1d22ee5a737243eb5fb74cf0362eace1b50a73f7c1d0557a8cba146dea01 SHA512 ce120239b411c6e177af0e22a16b583ac3ae8903ba13579878942492e4e221355da28f737d6c78811312bfcc888af7c8dba6c153673f4e1542cc2aceedf2d2c9
-EBUILD bleachbit-3.0.ebuild 1188 BLAKE2B 80de495f6744ef7fe7f4003e095b5bc42909dc4e415702f95d49ebdec3296e8d3fe3238ae521938875e49f1bc2e3fcef0a39c1226a95ecffff0664c7c57ceb1c SHA512 d3dc01d9679e378cc4c4e4b4b782be0a367b67a19a6dc130944bdadcb6995a9244cf7eed9d180b7a9e9f32ab32996bc6f3a8326c22e5886431e9a22824aed846
 EBUILD bleachbit-4.0.0.ebuild 1482 BLAKE2B 070e66a4c002c3a47f4987e9b000a5d78e05dc41ba3b597cf91e4100da9c6811ee39fccf1ada4bc703b70e9e156690a58181ddad754f1427be681bcbd2213733 SHA512 b860352fbe80dbe550646de268cfc73fcc96cde4fc90153314fcaf53b03eef2f213342612de6f76fc58b24f69406fc2af3b1e1577b6055c8de5eeff8af47d310
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-3.0.ebuild b/sys-apps/bleachbit/bleachbit-3.0.ebuild
deleted file mode 100644
index 6129e74e6df4..000000000000
--- a/sys-apps/bleachbit/bleachbit-3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit desktop distutils-r1
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/chardet[$PYTHON_USEDEP]
-	dev-python/pygobject:3[$PYTHON_USEDEP]
-	dev-python/scandir[$PYTHON_USEDEP]
-"
-BDEPEND="
-	dev-python/setuptools[$PYTHON_USEDEP]
-	sys-devel/gettext
-"
-
-python_prepare_all() {
-	# choose correct Python implementation, bug #465254
-	sed -i 's/python/${EPYTHON}/g' po/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	# https://bugs.gentoo.org/388999
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	insinto /usr/share/bleachbit
-	doins data/app-menu.ui
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index bbdec7af452c..34799b8558be 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,5 +1,5 @@
 DIST colorized-logs-2.4.tar.gz 10918 BLAKE2B 767d635155ebb66e212888c8e61e2ab65be665497a84c8820aa8183a5d94d30c9f2b653c16131916a907cb369d3b88a004573ae9eeaa1fda954cee239fa6da05 SHA512 5ac5734409f06262ad470a87e215c305f805a5701a604f1fc744632a25e4a1b8dd9c878897f72ad434b71ebe300c6d676cd53760a34f48b8202a62c765dcbe3f
 DIST colorized-logs-2.5.tar.gz 12331 BLAKE2B 79ee9d5a7d2e683ebba044a8b75666fe5824a087be3b41e9e1c4bb3b52d1d2a57b6dd5f3cc64a48fa6705b9074daa6cfaec61a730223bc3deb21835033fc3adb SHA512 a4849db1124bbf65a54285a121aa723a44b7270498858d0ac5f50892d3d8eb38c8109c3bb457cdf6ffe336e77703ba454217047ed819a0d61f415c5b8882cc28
 EBUILD colorized-logs-2.4.ebuild 658 BLAKE2B e815db4c00a458000eb7a9ecd3e02c67965d543a6bf0085d822fc1ad28427c10f090fa86a74e54ad747a636bd790d960fa3866f3f535102f354f86a0982590a9 SHA512 4d53be42d675a20bde974f630c342b47c718132cbfba6bebff8123c0d1faaeb0a25566c4e83c670daf6ce6a4c784fae4fba9f1e2b72ffe861f7bf5a51736936e
-EBUILD colorized-logs-2.5.ebuild 667 BLAKE2B 8a65993d8e54867fba755ffb65274ab9674be074ff916434767fc9edb259eae392174cff05f6ed40140bd92fb23d7bce8b2989ea50f04f3a97326f499e14485d SHA512 acc3d28f7bb7ddf48f78d7f71846ee034a740abbf8c4117399d014295076b7a5fd780ca43bdebbb68ed908348665b7023365c9d50ae0baf30e7beb4a97fa8972
+EBUILD colorized-logs-2.5.ebuild 665 BLAKE2B 73f383328f1922d117670ad9c28acb604697d9267bcc4a43e8e4cf00eb8d44536c623ff58b3f57d1a26b99431f2928376f61dc73ae51f9f3b96b5f24be27fb1c SHA512 d1e80c867abd49622d660f055043ea083150eac03c95e152cce57cb1d814149bbdd837d841c1633330a6e74d14a167eae3e4f994b4f36937af3a18c5cdb8720e
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
index 51d92d248bec..bef488c2d92c 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/crazydiskinfo/Manifest b/sys-apps/crazydiskinfo/Manifest
index 322400148838..a3c7ca0e0526 100644
--- a/sys-apps/crazydiskinfo/Manifest
+++ b/sys-apps/crazydiskinfo/Manifest
@@ -1,5 +1,3 @@
-DIST crazydiskinfo-1.0.2.tar.gz 4675 BLAKE2B ea36ec1c50c9253e222ef842bb771db5f7a9653c3ea81e61dc25cfec6e1d119940e78cc909b2dc3450a7c539a6b84a06598b869180226bda5729731a574d8923 SHA512 7ba835aa970a9247ea8dc4339d3d28ffaf24e4e5150d3c6b4e5b9236d905807d3a3970a3951bdb3c6736285259cbe35360821488a6997ff800115767065d3864
 DIST crazydiskinfo-1.1.0.tar.gz 5372 BLAKE2B f00c989b33cff303066b76d8da0bdb8ca12d94598a26f6990706637c0f430d18c3ae9344fcd7ad3e5ff301dac9651c29002548190d06dd16ea99132dbd94c50c SHA512 57e9ea4f8abec18355806da35225132f06a5562b1717e6dca1515043b2a0f2a51b47a2bcda31f1e64d6b2e9c8c6de5445d835f59eed79fd0911e06fd32296803
-EBUILD crazydiskinfo-1.0.2.ebuild 446 BLAKE2B f4ae163f4ba9f49ea9e06adec9558d359dfe8bef90cec76ffde7921558cce43abb6706921ff807d290bda7628722d1c01f07bb264b165b54dee2aa36ae689ca1 SHA512 fe540a2d70746747db85dee95af6eaf2f76492dfbf6ce450d2467a53119c2b9bea1fe4041f193b0229f5284fb7f5a83f2d82a94fa3f4308e2dada4648e040b31
-EBUILD crazydiskinfo-1.1.0.ebuild 443 BLAKE2B 88916c7dc95fe1ecd15e09dc9fe95c0a3c47f20243315e097205de34feeaaa24e57ab8f69204e2b1ab744e4781ec2f56c67332a2432681e776b48a59efb4da6f SHA512 590e91f26d1165dd609328d76c1fc7008b03c1059f96a0f68fd5fb9f35aa32c6aa1fd268a60dcdce18713a44a47f6935cad438711962b0c80f128a351cb212cc
+EBUILD crazydiskinfo-1.1.0.ebuild 686 BLAKE2B 421eb26810c0e9baa2d8cf0c0e94bafe39b96ff8cbb0b7cc103a527ccb118be9a8d92b9e9f66087b8b7cbac7bcf93acdc310a66ccd82e423ea3b1174ea561948 SHA512 e9dfe1ff7a0d69acf6c600eaa46a28950959954ce51983ffd7893a30cc22554899216ed6be06d42239921f45a6eb85109e2af617a498fcc6cea7afb2d54962ff
 MISC metadata.xml 337 BLAKE2B f419cc18fce7059f2d34451cda69ba7679511de53c756544a4180a66882503f7b2b7686e4ef14c533fcb5481bb774e0b7f4ac50849b11bf8bd5bfaa121caa3fd SHA512 ab01ee7de306762e116bc7ca43f4b229b0b1ab28e608a4cb7a1b866f167025aebb9455e90ebce01120bbd6254eb372d3e0df2a783c4378da488a769ed1a64650
diff --git a/sys-apps/crazydiskinfo/crazydiskinfo-1.0.2.ebuild b/sys-apps/crazydiskinfo/crazydiskinfo-1.0.2.ebuild
deleted file mode 100644
index 98417cbaf3ac..000000000000
--- a/sys-apps/crazydiskinfo/crazydiskinfo-1.0.2.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 cmake-utils
-
-DESCRIPTION="Interactive TUI S.M.A.R.T viewer"
-HOMEPAGE="https://github.com/otakuto/crazydiskinfo"
-SRC_URI="https://github.com/otakuto/crazydiskinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libatasmart:0=
-	sys-libs/ncurses:0="
-
-RDEPEND="$DEPEND"
diff --git a/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild b/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
index a1866e19f637..ed033278ff51 100644
--- a/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
+++ b/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
@@ -18,3 +18,11 @@ DEPEND="
 	sys-libs/ncurses:0="
 
 RDEPEND="$DEPEND"
+
+src_prepare() {
+	sed -e "s#^set(CMAKE_CXX_FLAGS.*#set(CMAKE_CXX_FLAGS \"${CXXFLAGS} -Wall -std=c++11\")#" \
+		-e "5s#^#set(CMAKE_C_FLAGS \"${CFLAGS}\")\n#" \
+		-i CMakeLists.txt || die "can't patch CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index d8501ce08b12..e6f4dfdbc8e0 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -8,5 +8,5 @@ EBUILD hwloc-1.11.10.ebuild 2197 BLAKE2B 2cc8b6519ea866167cbdd58145472354c8859da
 EBUILD hwloc-1.11.13.ebuild 2178 BLAKE2B 293f6b2a4235d0d52fd05b0a301b0aba23bd544871cbab2b74cc2298ab4154efe509a0789e7533a66a8a82b335ffa3bf642082b8d3cf0f07eff40751f20a9153 SHA512 985d07ca0b35a9510273d490b1a81a0f874aa45182b9acd62767e245e1a0d8f68063c8d1279f12349c98f05665d62a6d4578aeea4e6a558e6068891267122a36
 EBUILD hwloc-1.11.2-r1.ebuild 2142 BLAKE2B c0276f7d2e8500896e855958f173e08cfb87242570a60d46de7c2e575d7b94349505b5a5377bd2c805fee60c4a9be29cc6d8aff4f034afe8b06e0e3c9b7bde85 SHA512 78faaccd2f66eccca1e4c72603786c9161e43b6a76f11cf6dd01b292e67a116ff1649076494065713d0b52b123495982efef9110d35d7aff32e34d83ca81c0b3
 EBUILD hwloc-2.0.4.ebuild 2049 BLAKE2B c243ba4020853c7c0be9d7a8e2cd5b8fa9889b5e8d7c15bdf2fe24fb72124704be6c8d0484fd33d600e2cb43bfb5e2f3116aa312e8e8f98743b537c0ab63d80b SHA512 95b962abb0200bc1f51867734e80cb0d8caf959655fcc757dfcf1865721f69797adfe53c1e06d3fedfd840f903c97b6a0537b1be438b8422cb6ecfa5625bf672
-EBUILD hwloc-2.1.0.ebuild 2424 BLAKE2B 3127b3a5a50a992e5a8cba110c03c187dfd760b2dc36dcbbc9227b34ae7ec3d362fc7bcee73aa1d1beba49f56533b0c27698e70f01317444824a9914b5a2fba7 SHA512 156f66124f657714a26cec0aad2673e51722e9978c0fa427e2b06143c3d5fe9475b6ff52f3f58e783b5aeae3a8600bbb736741293b889f2a715ae8c96b3089b2
+EBUILD hwloc-2.1.0.ebuild 2426 BLAKE2B 00d97b65e0a78e2087e72ceddd24fb0f79f8ad1e816cbcfd96f9cdf35193ffea0a76d9eea2b4ee3dbbd632312fd649cc7da2dc3d5c7d6d7b4054124c238814e4 SHA512 e0c01f8c62232fe7f7e2f7d3d1f93c9b01a6315f7d5071808182406eeab17cd620547e727019bc733adef7bbdf3f4285b9fa27ea453b8202b80877662d79e8d2
 MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild b/sys-apps/hwloc/hwloc-2.1.0.ebuild
index 7c50207b2780..9a3839b7e14d 100644
--- a/sys-apps/hwloc/hwloc-2.1.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic systemd toolchain-funcs multilib-minimal
 MY_PV="v$(ver_cut 1-2)"
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 7027705fa1a9..722946c3c0c0 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,7 +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
 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-9999.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074
+EBUILD man-db-2.9.2.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.2.ebuild b/sys-apps/man-db/man-db-2.9.2.ebuild
new file mode 100644
index 000000000000..8ad0f47c8564
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.9.2.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/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 92546556c66b..8ad0f47c8564 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -110,7 +110,7 @@ src_configure() {
 src_install() {
 	default
 	dodoc docs/{HACKING,TODO}
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
diff --git a/sys-apps/newrelic-sysmond/Manifest b/sys-apps/newrelic-sysmond/Manifest
index 24be8feaedf4..1eef0374eb3a 100644
--- a/sys-apps/newrelic-sysmond/Manifest
+++ b/sys-apps/newrelic-sysmond/Manifest
@@ -1,4 +1,4 @@
 AUX newrelic-sysmond.rc 501 BLAKE2B 5b7cec04e02b2fbccc0bb9252f84b94785835d6fe5a0c67c629eec40cab124346904208d7799d048f13912f976fa49b9a6a1ac8403f6252507a34d147c6d4c04 SHA512 89096078085eb637b868c67618d5d07e3eb03c4eb2bcd9a48d07f23c72181e7988e3e28d817de30235392c07c0e46383e6695e4b696b3e3c8520b384d57457de
 DIST newrelic-sysmond-1.1.2.124-linux.tar.gz 2177939 BLAKE2B 9b66375e47ab651d68dc28d2a77424c05f97945513c95c1399f308f1b82b9759a0ba2d78bb47879d51fdd32c431afb45e6cdd89a280bef436eefcf9e89d74910 SHA512 beda4b9c3fc089a9cd836790a074f886a65980ee7b471d9e5fb54f56f369ef69172f00661962ae57482f2bffbc84bb27f9484dc01ca7b6a3b5d9a4ad7cf8c4b6
-EBUILD newrelic-sysmond-1.1.2.124-r1.ebuild 1275 BLAKE2B 9207e6e0ed9c12fe90bb61f50d3c03b45d1b95d68f84edbe4942f1d49c7326b6f7dbc65f9a5a6dd26d3f8b1b67cb856370bb782300f08338e24488b06b493b44 SHA512 5bbc7c7b6dff6723d2c4fab1c89281d7ba174d187c938349658ffa8d540760f219da7eaf8af735167138565e23a5637c0cac6c04e549d8e0584166c6c9627d35
+EBUILD newrelic-sysmond-1.1.2.124-r1.ebuild 1276 BLAKE2B 6236fa49d10370fdda8a65bea6b856610f2e611853fd3ba48be84dd04b82c076fe311a61ee4effd03b0ee3f00a1a64f345308b8201a31d92847ba292656774a4 SHA512 ee13cfcf629f44d6ec6a8384b824f3969c1035f0d72f8df45b1ded1a9a14dfaa883d3e4daa54b0638abd5e3cd18586e3bf874304f4af26e3154c39cdb0d3b1fe
 MISC metadata.xml 229 BLAKE2B 16d4e14e343a46adc16e4d4c5ddd81116311b9ac1147b808d34e09faacadb23c58f0b3feab3fa87c11229a100f2ee8d605595ebd8995d86a2925c2a66dfbf18e SHA512 77ab994b01460b752cc315a7125c188bc44870f142ce6d1e07b8c598b8feb8747c3c7d83a55dbbc547d454436211e9b7db2dde7792438cb5c2b508c4856eb1b4
diff --git a/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild b/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild
index 0737906b2fac..6f423204612f 100644
--- a/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild
+++ b/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-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
@@ -6,7 +6,7 @@ EAPI=6
 inherit user
 
 DESCRIPTION="NewRelic System Monitor"
-HOMEPAGE="http://www.newrelic.com/"
+HOMEPAGE="https://www.newrelic.com/"
 SRC_URI="http://download.newrelic.com/server_monitor/archive/${PV}/${P}-linux.tar.gz"
 
 LICENSE="newrelic Apache-2.0 MIT ISC openssl GPL-2"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 92db9b05407d..0a884c78c11e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,10 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
+DIST portage-2.3.100-bug-719810-escape-percent-signs.patch 1486 BLAKE2B 809e3897ffbcba32bdb209bad56e32f10c550bf00e74aa48e518c35d697447d88cb110652cb621a67b3fc9d3b97afeb0c593afd1212854623445899254a851de SHA512 37d5d67194ff2dbeb637da59e20d6fe2f75a69334189e751db3329b76b3e0ac42c6d87a0f1fdeeecf9e17288948e5d5b8415c53035f0f60d81f00c4e76e26b7d
 DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
 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.ebuild 8284 BLAKE2B 4b5f6610208d82ed8848e7825412bd147006ea49f91f2c9b4e0f09bc17089318eea1ed9e1f06cd5205577aaf6918ccfc06faa1f7bf330f5679d1608df7f7ecf2 SHA512 5be14340a32f932eb81c97d7487ee29e81ece0022ae1a78e56ad35e594ec84ecafc6f7dff350ab5bd42f4707f44a2c4c39711f23e55cbb1f887bf71f5d8df662
+EBUILD portage-2.3.100-r1.ebuild 8506 BLAKE2B c28cf46a4b962d3cc63c8b2761830ec23102b2fd2bb62812e93323307449bb2e40e5ff89e28addfa19f99da7e29fb8c11ff262d0b2a129e1d7d14b55ebcd5a10 SHA512 d3b5ae4297c201177d831c50df9e5d78475025fcac3fab8a07970363f60da72ad6850fe74996791040eb24518617b915bf01b74ef3ebfb172ec72f6fc79d91a2
 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.100.ebuild b/sys-apps/portage/portage-2.3.100-r1.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.100.ebuild
rename to sys-apps/portage/portage-2.3.100-r1.ebuild
index 9f6aecbb7dcc..60c322495ccc 100644
--- a/sys-apps/portage/portage-2.3.100.ebuild
+++ b/sys-apps/portage/portage-2.3.100-r1.ebuild
@@ -78,7 +78,8 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/commit/c238d5f7ed264179c263f5a2da983c4ee50b4f00.patch -> portage-2.3.100-bug-719810-escape-percent-signs.patch"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -89,6 +90,8 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	epatch "${DISTDIR}/portage-2.3.100-bug-719810-escape-percent-signs.patch"
+
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index d9d05c1a9498..56f08cd794ea 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,5 @@
 DIST qdirstat-1.6.1.tar.gz 7708491 BLAKE2B e6a92f93c76de0f602a66409a2701cd06f1744ab67c3c829938695f1d59b7244998d3a6ddd9d6cfc6408db3ac98d355f4496348ebd198c93ea345b33414c3048 SHA512 fd4c6a3582184785d935e96e884cc3e2033e3ee174ea893816b14524c5c5c62923c5a8c5869969fb8b1d0e84bbffd9dc707a68bdb53898c55dfd14fe16946110
 DIST qdirstat-1.6.tar.gz 6398935 BLAKE2B dba15df3f9dd34276ee38ccdd97d1b8158596198b22a807b4d0a68c7d33d146a25ef5b987c4a6e3dc16df421422ddc0cad2e9f60a80493ac668bcb023c15c31c SHA512 8d1350bc8995dac2de90a32ca5ddaac47a317c7e7044f39ed87a7b2e208cda0b84f04c147f7a2414d7a0c5c731479847a879aedcf5781ca772fbfa8fa360cc77
-EBUILD qdirstat-1.6.1.ebuild 889 BLAKE2B 8faa6969eec2981808d95d70970bf564c9f1410b8bb52a42492da38a2ddb778ee706881eb0bac136121fa810c62b6897bf568e412971fd841ab57c573848d370 SHA512 6309e5202ec80bf204bb562abc061b07c081f3e3460b56fdd6f5ee489031ec91ff3eebca3eaa5a0fc78109f9dc9503d708ddf70675d5e19d8273b9f2241911de
+EBUILD qdirstat-1.6.1.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
 EBUILD qdirstat-1.6.ebuild 921 BLAKE2B 49357e923dd3fb8d9b022ea42c3aa6cb55e583caa6bd8800e1f45985e197aa144a436004974070b03757dff548dfdf6803261ecc33bea706cb4b3650ae3107d8 SHA512 a83e63e5b5102ccc790bf7098c43366aa3e6daf0d80fc435969c0157f56ad8e916885a581053d1c64d920673e1e0f06ba728be18de8744285a6efc424eb0a2ce
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild b/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
index 5adc75a04f39..1417eaf6d6f7 100644
--- a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 927e0eed586e..6025f7c46ce0 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -18,7 +18,7 @@ DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a
 DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
 DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
 EBUILD rng-tools-5-r2.ebuild 1146 BLAKE2B 0fb06c8208399d1f4fee01b53ab112af78c6b4214b2c9caebd5f22c94d3de062cbc869ea207bc47bee48a11a4892ce94543972274042e5ce1f2b1cb153b33ef1 SHA512 7eb055a3cee18b56c845eb05f0a66666a8d108fc059fb0c4e2139251f9fa5f3625f25bf133cf13bcc07cb666b07d29d1b83809825c8fa664df3ea90b571c3fb5
-EBUILD rng-tools-6.10.ebuild 1807 BLAKE2B 144ef36a4555391f7f25ca032f81524a45fd476a5700549895dc45f9792c4d90d60dbf7f57b98f5d8227aae9e39826294062f56dbd4d8a528afa644329d06dfc SHA512 7059794659683afcbee82eb1ed3a0c45568cc975bff1c465b07d5d9a794dd0fb4559e4879cdeea6400818cc350aec0e31d3d48cb03ae6308c02c97ed14925428
+EBUILD rng-tools-6.10.ebuild 1805 BLAKE2B 9e457384db4a31a3f976edd63ae59096779d5bcf8b251c09163702b9a1f84f9a3fa0ab723a89fdd7be5c08877bc9e8daed07b3a51283f793e3246c81c2787e95 SHA512 a21883792e33821272f94f28f0954a3e6d29242654bc90a2706fb96c6fc038ee8532cac25cd7804fa8eb7c10251f8f6d9f1168cb55249d6ce5dcbb7ecff2acaa
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
 EBUILD rng-tools-6.7-r2.ebuild 2173 BLAKE2B 01fb210ba3b0ed8b5f40ceb061b7e31c4f14de6ffef6af18d4c25519646776bdc66cab8c376b91cd057588a64e5b1377a0fca52d033174bbc6f77f59edac7e49 SHA512 cf9e07fc1ee37c37cd5de5b08e62aab692f83593ceeca0131edafa621a4acf61f9661851c230c5a7ded13796b99266fedeca97827c4e35ba26c301602e8d4a1d
diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild
index fa2eda1a941f..730669867d71 100644
--- a/sys-apps/rng-tools/rng-tools-6.10.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.10.ebuild
@@ -71,7 +71,7 @@ src_install() {
 		local DOC_CONTENTS="
 The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
 to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT%/}/etc/conf.d/rngd'
+	'${EROOT}/etc/conf.d/rngd'
 reflects the correct PKCS11 engine path to be used by rngd.
 "
 		readme.gentoo_create_doc
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 508f196b8488..f2037f13359b 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -11,6 +11,6 @@ EBUILD sandbox-2.13.ebuild 1919 BLAKE2B ff46af1821181445d07942d9a81455d688c35ba3
 EBUILD sandbox-2.14.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74
 EBUILD sandbox-2.15.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74
 EBUILD sandbox-2.17.ebuild 1834 BLAKE2B e486e836e8f9d90c55f4ab48d500d8f93d813cf7eb123ffaac678b112a16b13703d5ca92bf48f700942a26f7f983033d705fd42d996eab4d6cbb7e393ea6e112 SHA512 d9d772320c17221627e73c689a2f6acb6a064c7d8a5b69727755e7910753e22359284abc78d414a75539d4fd3d95b2d5db5b8ada642492d3abb3ab8a55528a4d
-EBUILD sandbox-2.18.ebuild 1916 BLAKE2B ea3f192b0dbe622d013eb59ed78410c1f5337c66d58c3174fd47c4b77483706599675e84dd8df997e6c51ac971aaba681a80fd9a04c0c23a71f0f162d4e1c47a SHA512 df146001f900e03b9dd3c6fe61ed0f21f1f1a806b79315be845c02a69ac946417b62e2abe92fc8ef009caf78a08401dad6e57cf9bfcab8c23a3c72f6a8f5da94
+EBUILD sandbox-2.18.ebuild 1910 BLAKE2B 1f3130361ef7539fb3ea31aaf6c87c7936ff046a05c58c0d32739c8401cb7db76a85dc186ab98654fd6622653d6740f5ce28cef66176c30a0c539734bf8c9414 SHA512 09266b7fa4ce288074ba9208a35e2b8898a0f12d98d15909b920fc0812523493807a9261fc30b33d23af1524ef72bd99b641a0e9054de8e55b64ba5582c09274
 EBUILD sandbox-2.20.ebuild 1895 BLAKE2B 2dfe78648105da59a1a5db165a4451b4f7c17c83b2bd94935c86abf85077f8284ed242d84c5055b1e98951022f89af0230aac7181c085a61ff6dfc4816ed2409 SHA512 7d3efcbfb9d14d4d7de162175de9eb9f99ab6519e0c471ab9dfdc39fcbe51070c74e6ed5138ac8c26b49fb1a5512743b9fed5ff2dd41332a6e3fb84c2772390e
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.18.ebuild b/sys-apps/sandbox/sandbox-2.18.ebuild
index 1d60e01ce008..baf3dc3de57b 100644
--- a/sys-apps/sandbox/sandbox-2.18.ebuild
+++ b/sys-apps/sandbox/sandbox-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 55dc7f99426c..c674cb554f88 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -10,7 +10,7 @@ DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
-EBUILD systemd-244.3.ebuild 14562 BLAKE2B 22cae956741b738ddf9c84c4a52e8e49a6529f966fdb73cfc73fa2b4aff559b743c4655209db4c7214b3985ce4f6c348c40fa9dcf9ad072de833bbf5f20e7739 SHA512 6c1a1aca6a2c6e2f1f1b9ac9c11d3090880183fb1d07ca741f84c4a5e9aaf85cc14fe782870fd25459ddd9cd0854a7c57c5be50937230360b9febd2df56dbc0a
+EBUILD systemd-244.3.ebuild 14561 BLAKE2B f7361cfed800988cd2d2ff70eadc3f75c15d7d1a3d12a9934574abd9c4b948207d69f25aa6326b3c90cc17274e80d70ba74c23361acc7a1b2749a25752f4db49 SHA512 4f08e146c380e8b14fa449ef11c8c33ddab8e358e7cb8efe7e39b6b2858828824405b70c223097a3dba3ceb06a2efc47cd957e2c0d5afdc2d620ad558f161c3c
 EBUILD systemd-244.ebuild 14570 BLAKE2B 918be50336353a5d5512653c61ed6c1e1cbb4f8e49ec7fd8b1eeb5436951ad82b3d7aa7fa0e313681a952dcbd64c7fd899bb5ac3a7a319a4508d099a358a8ab6 SHA512 1b9d610e10c5c1a21d80395a3a68f82f4201f6b1c23d7e57f98e09cb509a133e60484c5e72ae0c78819a189b930b2f77cca84e869af9f03fbc5a3a4ac9448ab2
 EBUILD systemd-245-r5.ebuild 15251 BLAKE2B 8eba167408d962a162117c4d666e0eb22bcff38ecf444e012452de9b98ee6971e552c9c908ceb151c5e979f99e4c9d5332d7107f9f4fc5d1f64dea0e66e29f0a SHA512 b20b15040dcd671ee7adbc629e800438c55b8c3ed4ade6d96ee3b72e4a46a98b10e26943e818f73ab9155613008b5bf654e8fbcd0c7f32db085e81926c9e4651
 EBUILD systemd-245.5.ebuild 15193 BLAKE2B 0a5548b066365acbcee84c9ba3396daff507ebd05865d0f179fb58037a3948132d2c719313854fc92dc457d22c4be796a3d17e1a1d8e6b7fb5fc3ac11589835d SHA512 a7d81528779a398196dc1ffe4795973df5f99cd5803349952ab0fb61b80bac1b4e7129070e98d663beffe0e3e6be292c8bfad12367de604f56b5623b8b7854ee
diff --git a/sys-apps/systemd/systemd-244.3.ebuild b/sys-apps/systemd/systemd-244.3.ebuild
index 117b08cd6840..7a177b4f0528 100644
--- a/sys-apps/systemd/systemd-244.3.ebuild
+++ b/sys-apps/systemd/systemd-244.3.ebuild
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index d1ac6ddb18ef..65bb84a76928 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
-EBUILD xdg-dbus-proxy-0.1.2.ebuild 550 BLAKE2B 4699fb025e39ff164cb19e9f78c96c7bb52a620fc80c43845f1caa33daa3643762c7b5105fec8c57269e6523235fb337b1448d675bbef4c7e58f7f3d0d176d35 SHA512 1a7487de197946ebed7b4e7c958ed51306bd341bfe778936f5d60e73943ea06e26a8c239d50913db506e5eb862fb015ebf3b7ddcf5b2d2460d7ad620ca164dd0
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 555 BLAKE2B 44ed6c07dd72ae4c63b880d82e7cbfba794e306da059a395c25856bac59586af801aa01818737f243799d12888985908e3f0b1806e0b00060121071b2f688e8e SHA512 258fb79e5b526a58508f5af912bd986eaa751f1f1484e9101098de86b2c6b4ba106c6600506618d7a8710bb37e012825b3f285d1c1897893de3fd0b5f988e6c7
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index 11ae583d9307..6b57ded1cb6a 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index e2594348f04a..733f5b4f96e2 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/realtime-base/Manifest b/sys-auth/realtime-base/Manifest
index 767e1486557c..1c52df1873d9 100644
--- a/sys-auth/realtime-base/Manifest
+++ b/sys-auth/realtime-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD realtime-base-0.1.ebuild 968 BLAKE2B 8c9336e598002714c269230a7ed39b081352bd53f5f2c95e6a34c652721f81d57fcac4afd5bc8ad6d2c4c2f01e2808adcba9a21e3ba8de5f171d69ab66b6d6fb SHA512 81caecb3213db5a1cde78c82245806d492dbf6291a10b44e1f905976150cea8b4ca8f259eac17695bf08726ba82a4a33d03f1a1bdaf4479d25026fda1bf8489a
+EBUILD realtime-base-0.1.ebuild 969 BLAKE2B d91398c5a7c38c379c11504b9cbdd211cbb394edc12556938fbe47dcfd8606891820ec2fadd53ca0d342c6c8fe154c738191d0f325afc30e9d5a44aee741026f SHA512 23fb05ae5d1e5b10873120dcf03855bdecb7691db2594ac91238f0acad8a4470e8c493df2f7f98faa01078c65f628d926cae5208329bb02a18e8e9cd279116f5
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index 03d683127516..170da001fd52 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit user
 
 DESCRIPTION="Sets up realtime scheduling"
-HOMEPAGE="http://jackaudio.org/faq/linux_rt_config.html"
+HOMEPAGE="https://jackaudio.org/faq/linux_rt_config.html"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 96bbbe445d63..7775ae73b896 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index ede79d011e32..3a15e5346a5f 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -4,7 +4,7 @@ AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70b
 AUX blktrace-1.2.0-parallel-build.patch 2300 BLAKE2B 87ff4b31b845aee1fe8f14a8a6d35d08d386969eee05c07b2e1b3de2fa2f039d49d699228ef01793cee935ecea5517c9603956866ac3f677eafbb153f9b5382f SHA512 fbb2b217b73072e408e1bad7e3b663935cb005c4ee5cf3dbb1d02cc17b55b511f5982e108545159d0968e8b6ec759441953fd127ad0beeb8661d51fcf9ba6ca1
 DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
-EBUILD blktrace-1.1.0-r1.ebuild 1233 BLAKE2B 983a6e3fff9ae246733c85866fc8362104433ae809cf1b681ef4e2ec1aae1fbdc4bd07ddb40be1c74ad9678e44438e8ef17717ddd176f2604539168be2e0263c SHA512 bb7797dfc05a1feab0478887f561d8312d17f390f155b7871456b6aaca9fbc92fe71b2d17da55cef48b42cab95de94093c864ad2c6af75d3c5b658eb7a95a66c
-EBUILD blktrace-1.1.0.ebuild 1241 BLAKE2B f5eddec256e923e7985a9e6a6d53ea48adf1de10118fa6a055487a83ef7903fca0a062d0499c6918bff53147768df041ccf676ed5961cf88c5824ddc0d84363c SHA512 8c0c29ae82c9273d7098f6d0b01a7342d4fab4920abcbc4d734d4bdd257e2d919094f61c382fd814b11929100ebd292c3da6e7880ed3d6acfd3dfd866e9cd1c1
-EBUILD blktrace-1.2.0.ebuild 1368 BLAKE2B 72973adae402b659515fcd84246e32d072165ae0af3a8925d17e7c49a1e05485814d71feeb52150580c0a7a17aa23a724330895ddaf0aafe056d3c6677a4991d SHA512 ca0c2e1450172e66f071484970bc259f7590a1fcd60e3292f38b7659eaff3720be7f30e4d82dd3faf0e4d6a21f4af844d9987e2ded8049a001acec2dcdc28a8a
+EBUILD blktrace-1.1.0-r1.ebuild 1232 BLAKE2B e2425bc0dcb05ed4612a05c4a8968de4541dac4d0e4960ef4284e4124fa98103f51162d8caad02c343b9236d0f799f94b9672f1fd95b4c7667d51e9d7a69a2c5 SHA512 06cba40ef087126494b8c85d7dbd1dbe67de7463c4242b13ffa5c10a878d98e4fa9af791d3f2e5abc0a4993042c2c3a046d08a5d5e921baf54e3ed840dbae9ec
+EBUILD blktrace-1.1.0.ebuild 1240 BLAKE2B 38497ee86bcd4094ca9cfa1ffb90fb6b0644e18bde330cb2478ae114c5ebe4188d0328510d1e74dc0c7921db15f917e088d337541e6552b2f718f81195b3d807 SHA512 b1c904b9fd7b82259b3e81ca38b57c381e3f052c5af7685fda8c04040448789e4262f12707cc2f6e3c4ecfa27dcc3d6f3dd8d40316da0d773e17cd08b37ec46b
+EBUILD blktrace-1.2.0.ebuild 1370 BLAKE2B 9f79673ec496b7e8a5373af3ee2d53e44c306de91a45d74c11d6c5a92def87ac22cb50294aa1971f914e7c6923cfe5e619b18e3565639e8fb8de8ab777d9055a SHA512 3b48df771890b653872add3533114dead2ba9eac4d1f46aa935ecf6b691a4771da036f57aad4f5b9a5803e5584676d9cf5c889360e340b1e5eed966a47c70acf
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
index 3da2cc38732c..c9b984686c7b 100644
--- a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
+++ b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ MY_PN="blktrace"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
-HOMEPAGE="http://git.kernel.dk/cgit/blktrace/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-block/blktrace/blktrace-1.1.0.ebuild b/sys-block/blktrace/blktrace-1.1.0.ebuild
index 58af31eaa2c1..ec5213126820 100644
--- a/sys-block/blktrace/blktrace-1.1.0.ebuild
+++ b/sys-block/blktrace/blktrace-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=5
@@ -6,10 +6,10 @@ EAPI=5
 inherit eutils toolchain-funcs flag-o-matic linux-info
 
 DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
-HOMEPAGE="http://git.kernel.dk/cgit/blktrace/"
+HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
 MY_PN="blktrace"
 MY_P="${MY_PN}-${PV}"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild b/sys-block/blktrace/blktrace-1.2.0.ebuild
index 099c1255badb..ee5ebdfdceb7 100644
--- a/sys-block/blktrace/blktrace-1.2.0.ebuild
+++ b/sys-block/blktrace/blktrace-1.2.0.ebuild
@@ -9,8 +9,8 @@ MY_PN="blktrace"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="show detailed info about what is happening on a block device io queue"
-HOMEPAGE="http://git.kernel.dk/cgit/blktrace/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 427601a9a87f..b4363317bc56 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index 8a3ebc92736d..013d6c6ae95c 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -3,5 +3,5 @@ AUX default.colo 840 BLAKE2B a97a6a0d121edccf49842c0b14f3b4d48e0e12d92c7a40e3a78
 AUX menu.colo 1517 BLAKE2B 04d4ea5118ebe89229607a9beb8f6713a40f945df1d3ae0de867eed4cbf1df7be9ad30ddcc0a24a2489de1719424ea77d24a0c66ed42f6ce9da97b9bf175bd60 SHA512 a7357e176f45d5d352ea450349986ae5493900d60b363f688371348b727859d7be9b2a732e5210beba5216bfa8b8e6c861f2433573a009aabb71569eefcc5eaa
 AUX simple.colo 539 BLAKE2B fa8a255ffeac0ad14c0fc392fe65e89c9e627c022d0adbd9e1b1add70cc0535b9837f45d59ea1b43ae6919637a36c5364d38e75d4b5be7102e5dbf2c1727565d SHA512 38b3481adbad50c344f87cfd9a5346a78158cfd298194f715b40ad582d5fad9ad6e16f773004a8732e673bc8b3791dde39da10ac85c72a8e236837ca82a91d1a
 DIST colo-1.22.tar.gz 257968 BLAKE2B f7c8f97b3fed2d2071b89f84e3e78e814914999a3038c854d92e651e4c3a1aa1889e3486f2de94c561475befe4e4a4606e4873c4174ff0b24dcc290f494f5acb SHA512 c983f36991a6275d4864cbd12e00f4e73d3b722746b3d3c8442afc8fe00d5432772c93007999858afb0993e1a4917f94bc9803f017ace3e65535cad7e8fb9b1e
-EBUILD colo-1.22.ebuild 3732 BLAKE2B 85ba505a299c539e4f2f60d9e408b8e9fd7146ac1b6dbea53093ec0980ec0beb08f5893ef497c4eef3031ae64509bb1e54a10908af3949cd90b0c0b49123e12c SHA512 97f659697aa18344fd66a8a03b5fa0d26efa9c03d15f60db44fec2d81e4cdf0d7621d554b7f1ff24c0e3b404f5766a5e31c00d7327467ba20d175b57436aeaa8
+EBUILD colo-1.22.ebuild 3734 BLAKE2B af4472c3d855589f4b348debc8f6801a13b0af5fbe1333d689031c69099e8c5c9f7276645cc26712dd943e6bc61c5efc6cfc32f8557aeb334210ed95021fef40 SHA512 567d61e473f121f6329d3837279cb9fbf155885ecfbbcb9cbe7b4dc76d830730fe6c7f7887437fe9c9ac91d074ecd06680f0dcf829041f2e67d4b1f3d1832c7d
 MISC metadata.xml 359 BLAKE2B df83dfc360f7f6ee89e81f5af531ecd3fb650ff69ef92e7829ed23b7ff3c304d263acea308d96d179a5274409a35801a082ceec3ad11e8dec06481e36a8f646f SHA512 5471afe51705e3499f4820e3a9e6af18166075fec78eee0f60866ce844b06f73148663630f9aedbb4f300f26608d8135385135a142533553939ed2924e97826f
diff --git a/sys-boot/colo/colo-1.22.ebuild b/sys-boot/colo/colo-1.22.ebuild
index d18a3506ac89..36e97640d16e 100644
--- a/sys-boot/colo/colo-1.22.ebuild
+++ b/sys-boot/colo/colo-1.22.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="CObalt LOader - Modern bootloader for Cobalt MIPS machines"
-HOMEPAGE="http://www.colonel-panic.org/cobalt-mips/"
-SRC_URI="http://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
+HOMEPAGE="https://www.colonel-panic.org/cobalt-mips/"
+SRC_URI="https://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~mips"
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index b8ecc14b0771..b99608e0cf4b 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,7 +1,9 @@
 AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d60f542f47fa4009347546bdb812369fb3fb054818e6230af239244ee9628a315df5c1bbdf0085be92448c9f2fca3f1ec7323f51dd SHA512 a3ac9e1226de694063bce8edcd0160ab7340a2821ec243ea45a79885da81eaf3a8af2bbe19350edaa45654a2d13ef070682ea7eca80e12f982e8a05ef49abcd7
 DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
+DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1 SHA512 7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1
 DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b SHA512 60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
 DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852 SHA512 2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38
 EBUILD silo-1.4.14_p20120819-r1.ebuild 1706 BLAKE2B 6c4886239f6f55a88640e166b7eb84a3da383795c42e19bd70ec0bfef687b6624c2fb71ea11603d964f86b5dd97e2cb4b9d09b79df650f9552ecec8ddcd3b80d SHA512 88d310f1178eb846f99edebae4b3fddbe3aa2f8a0a0f9fdca568cd9342fe74e0613b8c73d5d751a23faef5c9914695d6d245e0938561de25f9d1fde217804134
 EBUILD silo-1.4.14_p20170829.ebuild 1750 BLAKE2B 64ec3de22ace15d3b5db8a188b5832143d99e620c71e9c166ed97db4b16d1f428a5f04b276a405d71109d9e8cfa4317a5aff072616a53f32267694ca91664075 SHA512 7e96c39c3d3297a4030493558a2993993b5df90a0184059b1f11a774e46595395dc28898b5fbe2ebadd1d2b0fda1a3177d5cfa61e7d53e6ff9b76324edc3a11e
-MISC metadata.xml 383 BLAKE2B 30e20990d4d208db4d45f19aaab45fad2afdb238415163399d2665d1327f6932dbf420ecc455ad03ba69492a1ec9c18397362164873016427a624e8fb3e41844 SHA512 4d4c999f52f1dfb269edc79e10df3fe667273d895eceaa4db695e9bcfe5ba781a0f9f7367411fb4be71ecedc679ce792c2359801e28b2c164fd7f44b971ced5a
+EBUILD silo-1.4.14_p20200602.ebuild 1638 BLAKE2B ed8464fa7529647f88dd3badc9ff38ed5a6333516e7611e685b1aacd5543a83426ab1d3b8f1ce48419d00c7275a816fa7f3ac8f9bd865b80fe6eaa9b94bf3d4f SHA512 379936279d64d850d23fadae1986b22499581172bcfcb39515357f8997f8b891ed0008034c54cd20556ee7840fe4e8878411f589402e128b7ff07e3e019131bb
+MISC metadata.xml 338 BLAKE2B 67b4c6cb9a586c688c374a0e3e4019ce5714cd67f303ce719a8aad5ec274ab91ce93040d6b81fe46fba0beaf0e535cc6d283c1c9e3957de4d0e80e09de8a4756 SHA512 67785ade40e4a1266b6597c9404ce6e7c6fb749b89988223ebf94aab3870e23f9c93da65ec69550e49451e7f2bf271d4e0a6a64add3520accbdfeab094f5f25d
diff --git a/sys-boot/silo/metadata.xml b/sys-boot/silo/metadata.xml
index fd1c35f8fbe2..a77bae3ef851 100644
--- a/sys-boot/silo/metadata.xml
+++ b/sys-boot/silo/metadata.xml
@@ -5,7 +5,7 @@
 	<email>sparc@gentoo.org</email>
 	<name>Gentoo Linux SPARC Development</name>
 </maintainer>
-<longdescription>
-SILO is the SPARC/UltraSPARC Improved Loader, a boot loader for sparc similar to LILO.
-</longdescription>
+<use>
+	<flag name="tilo-only">Install only the tilo netboot tool</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
new file mode 100644
index 000000000000..deeed7b293d6
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
+
+MY_SNAPSHOT="${PN}-9277bfd433e398d0a6eabec79edead52d4cb8125"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE="tilo-only"
+
+DEPEND="sys-fs/e2fsprogs
+	sys-apps/sparc-utils"
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	# Set the correct version
+	sed -i -e "s/1.4.14/1.4.14_git20200602/g" Rules.make || die
+
+	# Fix build failure
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -mcpu=v9/g" Rules.make || die
+
+	# Don't strip ieee32.b during compile
+	sed -i -e '/^	$(STRIP) ieee32.b/d' first/Makefile || die
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	CC="$(tc-getCC)" \
+	STRIP="$(tc-getSTRIP)" \
+	NM="$(tc-getNM)" \
+	LD="$(tc-getLD)" \
+		emake $(usex tilo-only '-C tilo' '')
+}
+
+src_install() {
+	default
+
+	dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+	# Fix maketilo manpage
+	rm "${D}"/usr/share/man/man1/maketilo.1
+	dosym tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+	use tilo-only && return
+
+	mount-boot_pkg_postinst
+	ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+	ewarn "      you will need to re-run silo as the /boot/second.b"
+	ewarn "      file has changed, else the system will fail to load"
+	ewarn "      SILO at the next boot."
+	ewarn
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 818ea94ea01b..a6ef257b0674 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e3eb7fb8a47f..f0ab475e317b 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -29,6 +29,7 @@ AUX ceph-14.2.5-no-virtualenvs.patch 2144 BLAKE2B 1ade0666aa6dcaee8bf9da5d6e0d4f
 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
 AUX ceph-15.2.2-systemd-unit.patch 682 BLAKE2B 1ec8c0a23fc7d572c79ca24aaf82100e108e2bb4f99ca2c695efcbefdc9543f853fff16c3f7b4636a38260e5ab9251228e9da1bf1a5cbc7a237c78e52bc8bf3a SHA512 8be953b7873f7e45f7f859ac9074b0f446a2ae6954997f93bcb2bdb2c1d85d36bb3fee571b3e57590131bbca3ff202911e0b31340cec8e39d447163c36bfdc1b
+AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb13df14574e48300d1331dc2b31353f1ccac40f723de501c6e33bc6f065f4b4500048de9d9b0bae646c76ba715eab580a SHA512 c2890202820d022bf610d6317b0a6e3521da2060bb12e39ba1a5c347096d5688adcd98b1cbf25ad33ddfa78d3cae42669c21f4e1dbe6eceb150e4ee17bece582
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -49,5 +50,5 @@ DIST ceph-15.2.3.tar.gz 147807898 BLAKE2B ff5e9707cf05e22af718ee177cce87ea9913b1
 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.9-r1.ebuild 9631 BLAKE2B 2f486712c825e24b7708e581fe2c9c9d7c1e6321ee32174f8b5b5c14e643ec2369639340452a79608061f573069fc5e7940e43b555d51a1ddd8e155d208d6cc9 SHA512 8847c34ad72f931d464aafdbe62c37e80f5f16fa8be419a736c8f25109e03e73540bc83fec6a4a690cc6ad61342113b136a16faae7bc3666aef041f4cca23fbb
-EBUILD ceph-15.2.3.ebuild 10421 BLAKE2B 385c2d251fde5ae7a75718d40dd20d3aa2f5b7db4c08560e2f3e5ed45da9babe7da6b9beda875302c9516d95ed68489732d481c196ab212d526d59344f5c1710 SHA512 7a0da569509d6e951e344a26946717d7230d130ad4520e97c88f05a145d5fe40c6c76b9f32e914b2fdeaa96cba15e3dc9006c10ab98489fe00369ffcc7095298
+EBUILD ceph-15.2.3.ebuild 10467 BLAKE2B 7550176aafae98144ee8f23096007fd796d86ee901d3b7378f9b35e29074e9b140eb68d1e016ad1cacb219637a41764a3923062ed877839b6a4173e057c2b345 SHA512 787160f343d557826739c99b484906c5eb043a5f5aa23e74665b7e8d3ad1ce64191e1db48018ac55452d426f16249ce918631f79c9e9ad18d679977f2329e90b
 MISC metadata.xml 2117 BLAKE2B 5aacfd24e535c6941c3b53ac2ecea9a8837511f2656ac1447b004fc6949818826321c455c0d401e79dcc21d6f5686162f69da9b6994dd4427157db47eab7894e SHA512 126776f9836132f200496c1a5eccd2bf069b8e962b47defd1b01e65d4b58204565ab8a1736d40f49e0c7b733c43bf4507fe2fc19b62c5d3935061da7980f203c
diff --git a/sys-cluster/ceph/ceph-15.2.3.ebuild b/sys-cluster/ceph/ceph-15.2.3.ebuild
index 6b0fa3f4c3b2..dc22c44fea61 100644
--- a/sys-cluster/ceph/ceph-15.2.3.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.3.ebuild
@@ -194,6 +194,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
 	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
new file mode 100644
index 000000000000..3ea6eadbb86f
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
@@ -0,0 +1,9 @@
+--- ceph-15.2.3.orig/cmake/modules/BuildSPDK.cmake	2020-05-29 09:24:50.000000000 -0700
++++ ceph-15.2.3/cmake/modules/BuildSPDK.cmake	2020-06-01 10:36:14.629306433 -0700
+@@ -1,5 +1,5 @@
+ macro(build_spdk)
+-  set(DPDK_DIR ${CMAKE_BINARY_DIR}/src/dpdk)
++  set(DPDK_DIR ${CMAKE_SOURCE_DIR}/src/dpdk)
+   if(NOT TARGET dpdk-ext)
+     include(BuildDPDK)
+     build_dpdk(${DPDK_DIR})
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 13c028100b57..274fbb70f59d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -10,11 +10,11 @@ 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
-EBUILD galera-25.3.25.ebuild 1911 BLAKE2B 044f49f0ddca4082656e49b16ae7205cf9764283f4e125f65d8dcd1ee6625a24c2d4de952900305827588a90ea395abc07b2a00ce0eac29d8b14991fc3ae1f19 SHA512 5ed799b7485d49ca76e0d3b1d0dfc18bb3bf23d94cc5b729cb7311b5353b691b8c9e1445fa86dbf548453681619322cb380b0c9cafc5ca0f51f2bf37281395ee
-EBUILD galera-25.3.26.ebuild 1932 BLAKE2B 7b8ba8da617cb4c0ef8d74d72f15769eaaa674fbc0da07f81268b8c67155fea1cabd8d8666bd55e2b5c5a7e70b63e06480011f9164977ede0d2cc26409abf8cf SHA512 9c595718ba6e8813cb16e3cc758c8d8f64d4f088ebf36c2ff78b5815a1be5555198f5225cbae2a11b3c4a8d21d95d6a4b24da0705635ca5a9119148a9f16090f
-EBUILD galera-25.3.28-r1.ebuild 1786 BLAKE2B a064ec5c6e173f43e54535ee88c7732b1459b68a3e3dcf47dc3034e1988b3bbbe3d568dfb1dfd01026ba98e42341bb0ff9bf785a2adad8428840669ca2bd9353 SHA512 132d907d22de6a25cfcd84a12371cb8c79748dba5ee17335b18c89aeb6a481029209eab6ecf00d8a7952d6b4a64d602a5f8bdb7911fadddea0c7684b5716b568
-EBUILD galera-25.3.28.ebuild 1932 BLAKE2B 429c0365de384c20d4004f555f3b18230c9272631cbd77e964cd07666362806b5faed1a5e26cabcc4627893f1a6daa2910a8f150fa2fcd9fe8987325a2dae11d SHA512 7509ef4e83f1e2f5c39366d66583082c83bcccc2f0218f94e4f6745e9080193850d82ca60882727f694196eade5370ef827db0c20e387a3890c0c649748a3fe4
-EBUILD galera-26.4.2.ebuild 1886 BLAKE2B 0a118cbbc699ae1023eb65283ac6c7c76c954c465c67fe49d0069e1362571639ef2c6c5de524627fa6a17d0d2bbc8967abd27cec5a4d6bc62c323ee0dfe2b73e SHA512 9b3ef59bce28519e85c505c65899064eeba3cc0f7ef8bb00f5c4062487fe907278c32805169ef53088d0b777f3c287d2cd2fa5a5c540272f784483fe2768eb61
-EBUILD galera-26.4.3.ebuild 1788 BLAKE2B 846b568654272c04c1d21a0db6780cc366bca385eb92e87e855bcb156e3f28f6b081f9c22562998312e7aabff854906b56fe017fe322bcbd8e572d970c00e8ee SHA512 54a50f5c3acbdc1471c5fdef5c1284f487b3da71089c9280b0a178aae20c3ed2eb674683813ae9fbb1084b22c4e3b1df7f52ade4c368fc7c4ccbb829c188e74c
+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
+EBUILD galera-25.3.28.ebuild 1933 BLAKE2B 30d6355db4bc5eecec418c814cb6de00d4013ec31ca72a0dbaf981d19eb348639b3777917b0df81df0ccb0c166c40364c7417699aaf2434204b4c153f67cea2f SHA512 d589683edac16b58618cf4ba48c994e8a7deecf9051610ab544f57a95023e8038afab083f526c3e474eb5d8b08d5e648e676453b326005297e47e2b0e99cd806
+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 1839 BLAKE2B be81a4d487171611c60cf0b165890b84d61a5b1f674e4b14507ea803e00d6f5dce0f5f0878d580bac2692c12a153245296e2f7fcbad12c21507e50baaa4e5752 SHA512 048db88b36730e6c5785ceb9f98b40a4451243c8166d0b9782bcd51ff156ca0b5e242524c5472a3bc300b2071ce3b456f97c349d4c4b5725ae77f4abf47343b4
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
index 09aa81a6ffac..1e78ab355449 100644
--- a/sys-cluster/galera/galera-25.3.25.ebuild
+++ b/sys-cluster/galera/galera-25.3.25.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}-3-${PV}"
 
 inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
+HOMEPAGE="https://galeracluster.com"
 SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
 LICENSE="GPL-2 BSD"
 
diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
index e8c4120483bf..46e3368fde15 100644
--- a/sys-cluster/galera/galera-25.3.26.ebuild
+++ b/sys-cluster/galera/galera-25.3.26.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}-3-${PV}"
 
 inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
+HOMEPAGE="https://galeracluster.com"
 SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
diff --git a/sys-cluster/galera/galera-25.3.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild
index f3c043e52404..a9043c5dcdd0 100644
--- a/sys-cluster/galera/galera-25.3.28-r1.ebuild
+++ b/sys-cluster/galera/galera-25.3.28-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
+HOMEPAGE="https://galeracluster.com"
 SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
diff --git a/sys-cluster/galera/galera-25.3.28.ebuild b/sys-cluster/galera/galera-25.3.28.ebuild
index ef4d202bc320..958e59104d28 100644
--- a/sys-cluster/galera/galera-25.3.28.ebuild
+++ b/sys-cluster/galera/galera-25.3.28.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}-3-${PV}"
 
 inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
+HOMEPAGE="https://galeracluster.com"
 SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
index 459781b25ea6..73b0f881a815 100644
--- a/sys-cluster/galera/galera-26.4.2.ebuild
+++ b/sys-cluster/galera/galera-26.4.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
+HOMEPAGE="https://galeracluster.com"
 SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild
index 3cc3dc65d350..f90a6be153bb 100644
--- a/sys-cluster/galera/galera-26.4.3.ebuild
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
+HOMEPAGE="https://galeracluster.com"
 SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 98cc011ccc8b..29a1fbdbc5a9 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -8,5 +8,5 @@ DIST keepalived-2.0.19.tar.gz 1025062 BLAKE2B 3a4164ea7468d5709dfc68da9008d83a15
 DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
 EBUILD keepalived-2.0.17.ebuild 2250 BLAKE2B b5b1a2593bf5e5637ac013c2f2dc8d220e1b9137fb02e342107cba898fc6d3888a567e5fa4b79240082bccd2e17b6bce7e564a1e1c9044e89001097830d5fe86 SHA512 cdfc2b4835e958ec1e1ad8e287ef47cc096b239b0f74849a491e7115fd15a3a1aba005c2ef6094d240884ef20e56656281f88d611bafed6b2200e208f6d4584a
 EBUILD keepalived-2.0.19.ebuild 2005 BLAKE2B 506a63c5683120982778e6696f476af785538cdcc81cbe1846918e652e2a53ce61cfd4cb782473134e6ca62b4788beae65d31b391a2c3681e2d119f4dc7bba3c SHA512 7e9bf4df9bb9a0123360f9e31f536c9ad83785c0737b1e22c64a0b2f801da099babf1272365ff7c8f959f465075b0c84223c2cfd9c0e6ccdf5d15ab5c6c34311
-EBUILD keepalived-2.0.20.ebuild 2005 BLAKE2B 9e8a0a9237d32facfbe26d8303e393c8e61abd521dd332346e5916b9fed328244905019eb9cdccfd8e04a079951c393bcad0d22008d89ae83e9d788b70745e2d SHA512 5d6fe1ff61c8b260df8e703ab075a33807f0d0bc6124cd75f7b9b54196e58177c5a1567cc10514cc924f4a80e54dc3fd5062a2405d65de06d08df18469e8864b
+EBUILD keepalived-2.0.20.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
 MISC metadata.xml 640 BLAKE2B 5644b98bf487637c431299fe61e1185731d9fc22e9a19b9a3218855318a9c40500339c628671eb958c2bcee99d867a8e9c93903fdcdad25ad566659422dd2119 SHA512 6fd4981067e0a2e74511db7be79d656c62b39c1f43f860e0d981b6c9770cb2da6b4fd3e40af1ed23adc8bbbd01202e6c45e58b6f86480a807d193aae1a3f7ad3
diff --git a/sys-cluster/keepalived/keepalived-2.0.20.ebuild b/sys-cluster/keepalived/keepalived-2.0.20.ebuild
index 12763f521185..89feaa62df58 100644
--- a/sys-cluster/keepalived/keepalived-2.0.20.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="+bfd dbus -json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9529aa39d3df..38bed664b9fe 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index aca5fe85a74d..2f248ec19bfa 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -50,8 +50,8 @@ EBUILD gcc-10.1.1_pre9999.ebuild 405 BLAKE2B acdd045129f65fba03a33cc6ea25c429dbc
 EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B 4dd45cc0f1599d2c94904cbc930285e75bb10de7611de5d0182128459a805cf6fd77e22f2d36e716572894a8d0bdb8264f6016266d7e6055acc157a7b8f0311a SHA512 0e7e924eb559d58f3742f3645c49bc73cc6a50079209de6ea4b9a7f3d6ee8d31b835d297d578aeea8c7f0731bb66e50546026b46fc6de6885ea123280f0afbaf
 EBUILD gcc-4.9.4-r1.ebuild 1442 BLAKE2B 89d982040aeeb513b50baaae4863edf3d8419536f09e4a44d327d0bbd342c528897209ff036a99ba3fda2c75cd36931ee8f413e273e86045cafd22c5cbd8957c SHA512 156e51cc3fee5404c97e04cb8eb96ef86b885bd4c82d3cf225075fe1f94cbed11840d394bdedfadd3e1ba4396e72a312892faf5e90b5f1d94e780801f590dfdb
 EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 061928d67216aac304cfb6bb02f65b2ff04ee8139a005f0989ebfe75460af572b9bf997bdcdd3604267190db8b31b5d9512e4dd96c3fe92c7aa923d0dfa8ee37 SHA512 e9b20d919ea32363f5d0314ab59708403256d3a7178f41562f39cf15d223ce8fc96bab060fb10390720a244b87bced2dd0570f5e31059245d4c452050bc057c8
-EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B f340e099406e6325e3ace5d179b01f1972acab4482be0af46017d1e55f5fd2a7bf1b8f7e7c7b493084bfbe4fd9c889d51f85d2ddd379f481181e9f645b4eebe7 SHA512 d5c9af31f338affd52e90651d2119bcc9f142d3699f83c5b14b095c8e05b9a1ffcb9d60f464567dee581ca26cf692bd0a611046e93ace8d85676ede02d9166c2
-EBUILD gcc-6.5.0-r2.ebuild 445 BLAKE2B 020c4fb4471fb540ece00f81800187b529c2ded64b249b4a82f81fab0e05d4b68ce165357dc82c71eae870ab4e244a4a56856b1fbfe890bd9c3628d345a56ea5 SHA512 998e30c8bfc69c734ed782081fe01533ee6106a77997d72f3500d9464afb586b7649e8ebaba2ac24a862592729780595a03beef99cfcf9ee6c52921f494746ff
+EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B bdd1de3a0facba6f1ee9b0e7c8717920d0df66beb44b1b24a85f65476326e8a812d9dace2ca65e5df89fc2a94caf9c03b35fe83d6c18054e82ee751455a84906 SHA512 4990258b95bd948b1891b7265bac5bbfd5feaf1bb534596ad4c779a871dc5156db0c3286ec8396eeb0991ba5462a78a02d6bee9024967e375b23bc499bcaa3aa
+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
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index d720fd6569b9..ceffa35a49ab 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="4"
+PATCH_VER="3"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-6.5.0-r2.ebuild b/sys-devel/gcc/gcc-6.5.0-r2.ebuild
index ff44f51814e7..79955645ce2b 100644
--- a/sys-devel/gcc/gcc-6.5.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="3"
+PATCH_VER="4"
 
 inherit toolchain
 
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 44952da442a6..bf25310adabd 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,5 +1,5 @@
-EBUILD llvmgold-10.ebuild 562 BLAKE2B 4dffabd911edce10c69037a8e12cf6fddd1588804993815982217913b30214d2654fbf8d597e4d0269ef7d9d3a89b27e1f5d9a1fb253847f2d1a63e17b590fd9 SHA512 eed54596a896f7796a5948a5897eed8e76be8d30c1a374e0cc9667b4cea56d455ab84a7b39d7388a12a352a4f03173544e804c3f86d48319dafbcd079feb0e9f
+EBUILD llvmgold-10.ebuild 569 BLAKE2B 152b42daecfd4a3f125f6703df26b7c06c00d7c227221fadd3a14b4533b330c118585da6e4155b6cf585607f54045462039d619a85aef64bb60dd27b53810e63 SHA512 d677ecfd5eeed4af73a679ad6d61207d33e913633f7063d4d780191d19dbc6d832f743452b788b1b86b0e7dcd0a7945f1759892e6e281137febd3a63fc2410f3
 EBUILD llvmgold-11.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542
-EBUILD llvmgold-8.ebuild 558 BLAKE2B 29cf97eda879cd6819e35471dceca3fd5778f21a0d7d81706087ddd93c689978be667cd05b14c33c65222822b56a417e463e654cbd5f4cb7e1db03d1d3038cad SHA512 95a7672fa35f6b2a47ef25765a700c658086f8f83adb33e611308e8e3799ab51c7d0776419ba2065a3cd46a0f43297d61a6ab2b2de81e97ae09b388f266c35eb
-EBUILD llvmgold-9.ebuild 558 BLAKE2B 3a5b92cb4e5896d0c6b9630641551c11f2bc02989b672260b62b4012b3378f8a019a967c47b1ea1646386722465f40daa1b3ae32a1b550417de33644a5ee21df SHA512 44dcb55061ce5f9cda007743d1d762761d431be90e78ea49db4da5412326d1766770ae5de5545c88785dcfb09966307d8437b0045b21d7cf25d447c7fe9b1c9f
+EBUILD llvmgold-8.ebuild 564 BLAKE2B abd86d1d1663390b778a27ef3298b0510256aaae792e63934a2d56da8ddf635d89212a2ebf719d92c686b533efe8b92dfcb6bc8c9dc20adc1319ba84ed5ea2df SHA512 6c083bdfdfd34321df21f070620c4ccc8325f133b458ae3382a40865082031b22f7782b4825c0af2c1f779355f32f19009f1fc1ff5c5a6dc5d9df76e58c7f293
+EBUILD llvmgold-9.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvmgold/llvmgold-10.ebuild b/sys-devel/llvmgold/llvmgold-10.ebuild
index 270c2c5f0728..21a246428c6f 100644
--- a/sys-devel/llvmgold/llvmgold-10.ebuild
+++ b/sys-devel/llvmgold/llvmgold-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-devel/llvmgold/llvmgold-8.ebuild b/sys-devel/llvmgold/llvmgold-8.ebuild
index 1bc0a0fee026..16c3fd328659 100644
--- a/sys-devel/llvmgold/llvmgold-8.ebuild
+++ b/sys-devel/llvmgold/llvmgold-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-devel/llvmgold/llvmgold-9.ebuild b/sys-devel/llvmgold/llvmgold-9.ebuild
index 5ee96cc29e07..065dea585bc2 100644
--- a/sys-devel/llvmgold/llvmgold-9.ebuild
+++ b/sys-devel/llvmgold/llvmgold-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index e60fa3ca198b..11dcfa4fb2d8 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -5,5 +5,5 @@ AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2af
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
 EBUILD prelink-20151030.ebuild 1651 BLAKE2B c4ffd87d6c0d8647a49b7f1dc2920b7c9ed261251b4f51c426b413af6720d8d824b2f1aca958e96b0cf68644c135d4004551639ac14b57d99fc701601dc1f50f SHA512 649e734c2133dc736af08ff60fc580fffd52ea0b5a9b9d6dabdb5a2d68acbdd3e73cacbccfcfff5d84e2eb9a4c531293b3ebfe4921d5e4de71cf0ce6bfd5ab36
-EBUILD prelink-99999999.ebuild 1505 BLAKE2B 818c487e68c6a6b8d4419e802f101a02a99bbd666005ec94745fff3242892d7e742aa5e781b89cbf95f9a35b6f043e876f0fceeaad383a3fe69a2b9a910c555a SHA512 c027960bfe1ca7efb0479024fbae2c5fe231d14c48763b11332a1f0b4c3dabc4c9c75ba616723fab6d0ef6419f95fd2b146684fcd8f4ca713304747f2dcf297d
+EBUILD prelink-99999999.ebuild 1661 BLAKE2B fafe628493254e0133fa0247bfaab9caa4972ae6dadbe8a063051f0568a9ae4ca5ed04836a26a99a19737791aa6a4a070d2107ece8e7e88fc180a428e3a218b5 SHA512 544e3d8e8df1b2aec47353d3576a7946e3c7e1b76eb35fb17719dca49e145d19d6034f27ac675c38610a5ec459a91d67fdff6825d378fcdeda7ae37b76a96b57
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild
index 4088e323d9bc..705ff6199636 100644
--- a/sys-devel/prelink/prelink-99999999.ebuild
+++ b/sys-devel/prelink/prelink-99999999.ebuild
@@ -41,6 +41,12 @@ src_configure() {
 	econf $(use_enable selinux)
 }
 
+src_test() {
+	# prelink tests check exact library lists.
+	# LD_PRELOADed libraries break the assumption.
+	SANDBOX_ON=0 LD_PRELOAD= emake check VERBOSE=1
+}
+
 src_install() {
 	default
 
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index ffe2c8db85c8..cc4037acf2ba 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -1,7 +1,3 @@
-DIST qconf-2.3.tar.xz 51848 BLAKE2B 836f22e50cd4c9bb2beefd85d0e5f85f7aee40078dd4a696492c344ae9dffeae20840025a3262b5abcc2c74b22ed9e0bd4b44d077b83ab1e904c0a93bde394ff SHA512 27a532cb52067707a3e04a40260bb0f42e40adff4a643d2f048832356de58271e4051c9cb810e6fffd4b4e45dba483ed65aec062506053caa262ac03b3ec6253
-DIST qconf-2.4.tar.xz 51880 BLAKE2B c87a2a6dbca56fa52bccd0cdbbdba64013adcbf03c6cca6744d3e1c3166f74a09e945022854b1143e0c08a70a6124c0b890be8d7f9d4a91be7c6c0e2c89bf800 SHA512 982ace9e1d30f6c92078d661e103418fc7e3352a56eb78dae64a004e563f5e7bbf8f71972ca482e2f5229a6f88bb51372e543833f99c4b596d0ae4be5f443317
 DIST qconf-2.5.tar.gz 100704 BLAKE2B 01dcca053e020cfc76e8595927dd3cedb6c82ade24381c95935c87994037ca5129f5e9e0ec58dd0e0fc6815b1500249b767367fbf7a16549459f814bb1591368 SHA512 4ce032eb5b9ba2d584807b3283b0dd5cf973c2fdd6792dfec13c54bb7c639d23eeaab03eb52f1a395113d973d2b01d87bf713d717e691641203865b934c7da5e
-EBUILD qconf-2.3.ebuild 816 BLAKE2B d9b6098f799e41e2626e8dd4c30b63d615700f5b27a1c16e3aaf5c3f0f37082b96dcb311c0aaf73649ae06f72c695325dfc8352dfce08fb4c7945656bdbadd14 SHA512 965c0f48f3de3c2947736248e48988365c4b48e76f519c4d5de7f8a51baa62e5ca421a9fe012a51732e29f8552414e891ece6ec939393a2e8127ee4f476e142b
-EBUILD qconf-2.4.ebuild 839 BLAKE2B 93d7b63e9fab27f6bdb5f30822c779056d156451042d88b0094970444880cac770c34f5dd621e0a482b813cd8f27e16ef45869ff91eb1537c19e7b9a7dfd6f44 SHA512 121992c1f91042092767f00c2e695918015d792e071ca135ae5d5675411ccbd70a56d35cea703b0439b4067517adbe4dbf5103684d2fe090fd4a8166b830915c
-EBUILD qconf-2.5.ebuild 830 BLAKE2B ceeb9c66789444e96ec669d93ad4f1de3f4d8f74fc743e331b25e2c9d35d4131dcf1111f68358c4a67b4c664f0372ac12faf54f1f75d08f76b88d0b0697b7d5e SHA512 5783cd51a030b0ca7446c9a2d39ba4d453a6eb41c5a52a48ed96173c8d827d4fe7ece09d28e85f6a099b4c7b2611da7b9fecd41616fcdaf01cd189f2cc1a6d36
+EBUILD qconf-2.5.ebuild 829 BLAKE2B fba833f1097a88c8d14d6d748a84d9184473626691f0644e3186c70b4ca0d6aef222e67f55044b67140846f6c2fdc197b3f562a4ac8d44eb51f501e47c0485ac SHA512 a70520107118082412ead38ae295e8e80535c91264ca992bef3f80dc2caea1e1eb543860e25f03ad85deef898337d0da30dd042731b38b270a100d89fa649682
 MISC metadata.xml 520 BLAKE2B f9a6c120d33a273ac1bd1d2be0b6af7eeddba959966af10812136a282acf423c17e14f5727dbd8a6cfad84f977e32695df43ae5bc9b13bffdd398b0ca27cd596 SHA512 d707a3c441702da2b0c4a6313acc4441fbd75e0b02990c9556a4d13906a8383683c261dc92a5c6f6a3593fd6d24761ea246110dd4514b4a7249bd6eda19b19cb
diff --git a/sys-devel/qconf/qconf-2.3.ebuild b/sys-devel/qconf/qconf-2.3.ebuild
deleted file mode 100644
index 4292f0c9508a..000000000000
--- a/sys-devel/qconf/qconf-2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="./configure like generator for qmake-based projects"
-HOMEPAGE="https://github.com/psi-plus/qconf"
-SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-# There is no one to one match to autotools-based configure
-QA_CONFIGURE_OPTIONS=".*"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--qtdir="$(qt5_get_libdir)/qt5" \
-		--extraconf=QMAKE_STRIP= \
-		--verbose
-
-	# just to set all the Gentoo toolchain flags
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/sys-devel/qconf/qconf-2.4.ebuild b/sys-devel/qconf/qconf-2.4.ebuild
deleted file mode 100644
index ba6e9b593c20..000000000000
--- a/sys-devel/qconf/qconf-2.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="./configure like generator for qmake-based projects"
-HOMEPAGE="https://github.com/psi-plus/qconf"
-SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# not autotools configure. generates warnings for some autotools params.
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--qtdir="$(qt5_get_libdir)/qt5" \
-		--extraconf=QMAKE_STRIP= \
-		--verbose || die "configure failed"
-
-	# just to set all the Gentoo toolchain flags
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	dodoc -r examples
-}
diff --git a/sys-devel/qconf/qconf-2.5.ebuild b/sys-devel/qconf/qconf-2.5.ebuild
index 3866c4c05ee0..ca303a7e0854 100644
--- a/sys-devel/qconf/qconf-2.5.ebuild
+++ b/sys-devel/qconf/qconf-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/psi-im/qconf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index a7608d6cde10..822d0bfa689f 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index fc64ba25bf61..85556db09382 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20200508.tar.xz 6010560 BLAKE2B ebbbac3b474644d983f8f6f1a3b305b60a65732883658d18efe8c918f6d1ec55f8439313ccc2fe5d90a5ca5e207bcc2db9b9299148157f233007046fa3090e19 SHA512 48dde26041afb3a82afd3f4f8a2539ccf0da4a42c802b45aa776e16ceebf72cb39ce828278a423d4f2b2c0d7c29c5701978b4a223d135b453bc63cb1db3e5373
-DIST microcode-20200508.tar.gz 3002932 BLAKE2B 01964ca9cf6f3d0255d85d6bff9c8fedb127884a034d34eeec97e24d6689aa81eba758306316346cd686d2aee6c0cbc4afc0a2ccb49c3a4b2c5f0d6b1e543063 SHA512 00fa15464c7637c080c49d63b73c197418f4709eaaf55d515504f3bb8aab06dc97206c4fbef57250dc6ca8abf226e0f1fc39bad76ca8b0d705c820e3d1d8ffc9
-EBUILD intel-microcode-20200508_p20200508.ebuild 8552 BLAKE2B 4fb7154e9de1cf7b5b92d1c089ba02efa959dfa2a0d23cd4e26ecb59e4945562fb27042b6ba4f23468113238e286ecea5810c15ad14f5ecaa02fc2ae18fd35d6 SHA512 dfda3995837d46dd2e71bf0bea6529b4f691e405a036de0548e75caf557797e974519d6a2d747210757f4a7dcb082572c091ff2d88a3e12f7d9c351a986e181e
+DIST intel-microcode-collection-20200601.tar.xz 6163976 BLAKE2B eb17605a09f771562189924b916b0d2426d6c2b6f9d76447d05d614679f097acf71fc70dd96132c0ad9d3f1a954f5809456fa951ca42fa0db2373da2288417b7 SHA512 60e798dd357ce85d8bd1f78e0447d983d6916aec87bf8a3f375091e4c57ffa8fb654459a8ed7d2d83184a828060509e16aa37e3a23f70684ac1b170736a12d54
+DIST microcode-20200520.tar.gz 3002980 BLAKE2B 5f91536e558827e5c412e336596d21c9aa9365e83ee9c96a9bcda9abbc3921c623e489f6e42be689203a1caa99cb6334b3124bf26764e4e1a4afe83de00aab3d SHA512 39e434406a0e855da911a4259691b9f60f4d205d8f0fbf47564a811c6317919fb7458ddf38a3a7922a3d06373a31f55e72069561c5d57e213702e2005579cf12
+EBUILD intel-microcode-20200520_p20200601.ebuild 8552 BLAKE2B 4fb7154e9de1cf7b5b92d1c089ba02efa959dfa2a0d23cd4e26ecb59e4945562fb27042b6ba4f23468113238e286ecea5810c15ad14f5ecaa02fc2ae18fd35d6 SHA512 dfda3995837d46dd2e71bf0bea6529b4f691e405a036de0548e75caf557797e974519d6a2d747210757f4a7dcb082572c091ff2d88a3e12f7d9c351a986e181e
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20200508_p20200508.ebuild b/sys-firmware/intel-microcode/intel-microcode-20200520_p20200601.ebuild
similarity index 100%
rename from sys-firmware/intel-microcode/intel-microcode-20200508_p20200508.ebuild
rename to sys-firmware/intel-microcode/intel-microcode-20200520_p20200601.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a60595f24618..b97b55105750 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index e26ea032005d..757d2a462066 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
-DIST ncdu-1.14.1.tar.gz 146346 BLAKE2B 50152647389cb08c236a47c8f85b93c7a42ba9a94b84dee313b7887614e5612ad9c0158a878872e08ffc3e85f4a7b91d292dfa0ae0471e194e6cec2b25a9355e SHA512 7db9115f7ba20d43c47bc7187347658d7a4dc36da6ffdc54308d3966a431c24b87c3266854d69685c3ea5e29805b5a631805a783d6431e30bd83c411b398515d
 DIST ncdu-1.14.2.tar.gz 145376 BLAKE2B f13f1286ae4e9f16f53a50b8e2ff5caa9cc0bb184a38e6e6025c2a8d396efc0fd453391813b712e358cf1607df29097b0330731b3dcc5688a72690352cee38e4 SHA512 d7398448e0e13354a0be1606c3e3f6f29e2dbb742fd56f7cd9c598e974c359429966527ef8fce6a0e3afb0ea3cad9a95169b880600e44d62273b937309fa0e59
-EBUILD ncdu-1.14.1.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
-EBUILD ncdu-1.14.2.ebuild 438 BLAKE2B 35cdb26899ac23e441483cb622d33602f25e0859f3e482a052d9320eec115a1935f06f0aba4d7ae54708cc8ec9473a53f83e496cf52efd22f6172a1fd7251854 SHA512 18fe69788d5e83f01a227988742db112b56b6016d45c83fe2b1461399d364cc539a793c1ccd9526187004a97680dd7437eeab96c7a1d418b4c053ad3710a9422
+DIST ncdu-1.15.tar.gz 147989 BLAKE2B 7ea8f46c81e4a8ae5e99a14ef561b768097152c95fe8ca46afc1aa4b5d37186917655972a8092b4050f89885a246a9b839ea02337711c441b7d1a66fee9fb676 SHA512 02bea12e45c984db2a758ec97e60f510c365c51a417a340edced13a9ab9d237cd004ed37b940359ddc4bed81295e9748d3370ad209dacd7ff1f406e434d205f0
+EBUILD ncdu-1.14.2.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
+EBUILD ncdu-1.15.ebuild 438 BLAKE2B 35cdb26899ac23e441483cb622d33602f25e0859f3e482a052d9320eec115a1935f06f0aba4d7ae54708cc8ec9473a53f83e496cf52efd22f6172a1fd7251854 SHA512 18fe69788d5e83f01a227988742db112b56b6016d45c83fe2b1461399d364cc539a793c1ccd9526187004a97680dd7437eeab96c7a1d418b4c053ad3710a9422
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.14.2.ebuild b/sys-fs/ncdu/ncdu-1.14.2.ebuild
index a63123a3d82a..b0e05454504a 100644
--- a/sys-fs/ncdu/ncdu-1.14.2.ebuild
+++ b/sys-fs/ncdu/ncdu-1.14.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/ncdu/ncdu-1.14.1.ebuild b/sys-fs/ncdu/ncdu-1.15.ebuild
similarity index 79%
rename from sys-fs/ncdu/ncdu-1.14.1.ebuild
rename to sys-fs/ncdu/ncdu-1.15.ebuild
index b0e05454504a..a63123a3d82a 100644
--- a/sys-fs/ncdu/ncdu-1.14.1.ebuild
+++ b/sys-fs/ncdu/ncdu-1.15.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index 8ac6c9a4c644..63e7748b9996 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -9,5 +9,5 @@ AUX owhttpd.initd-r1 820 BLAKE2B 4122ce01036f63083286162f33d576e2a953e7bff7e2150
 AUX owserver.confd 108 BLAKE2B 3279ee61b42a9573472657e4297a7988668c081cd66d0f64d53cbd2eb27248abfebd6c368d77a5a3eb84ccd95b41ce65c2f03e3cb8ee1f095e4b776b60e3283a SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411
 AUX owserver.initd-r1 802 BLAKE2B 8273790945eb4df7b8aadf7d19ac3397152d225495dba7e5e8a472ad7420f2e9e97ba35ec5e7655e0e5b3c37ed97ac740dbda8d1ae030dc9b75ba2bbf1dbf391 SHA512 3c2d186df7c3d4549333f90a87c80a44dd8ed67b10bacdc08edce2b45db35bd0bc7f0956bdee8f03a388ae8a5bab039f7bb19e3bad007632608f945c7e54c649
 DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338
-EBUILD owfs-3.2_p2-r2.ebuild 4781 BLAKE2B ddbb63d06a3c6475f7b1febfe1b8e0f5bad216d2db2d5337ba0e94e4f96ceadd5872906f8962d905cb11b09e8b7d1f6a431f2c040db1a243477d4583013a5215 SHA512 f77002cd587881b99943c01268ce2ba218ec55e46e79e5c6384fc67b7dd89a94d35bee93a9a9dfde043f34ff85f4c456adfa27601726bfee99e805ff9e3207ef
+EBUILD owfs-3.2_p2-r2.ebuild 4782 BLAKE2B 05e42cf3d93fafcde9e875af9a91b16564846e9e7a487af8812a66c738bd66bf2600e9364864237c044379dec76eb48af9b9d9936695fb821a4ab86553fb1f08 SHA512 1aa74c96d39673636396e5ec76f5b829493a735542a86c4b7662f224e0d208ecf8bd4c579e9fa5740df0e6b59a5d439dcb53a151b9e5a25377c5427d9fd37d83
 MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe
diff --git a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
index 8bc833ad7ff9..49482396596b 100644
--- a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
+++ b/sys-fs/owfs/owfs-3.2_p2-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
@@ -12,7 +12,7 @@ MY_P="${P/_/}"
 
 DESCRIPTION="Access 1-Wire devices like a filesystem"
 SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
+HOMEPAGE="https://owfs.org/ https://sourceforge.net/projects/owfs/"
 KEYWORDS="amd64 arm x86"
 
 # Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d6941df41839..875b89b9728d 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 0d994c58f576..b51aeb4f5ee5 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -13,6 +13,9 @@ DIST genpatches-4.14-191.extras.tar.xz 17524 BLAKE2B 289e7734509ad80cea6f971fb88
 DIST genpatches-4.14-192.base.tar.xz 4258000 BLAKE2B ced3ec8dde16d2edd75820022b556d3d77f123a77d2bcf4ca67ba0fb170abdf87974ab7bd727191a990f9070047eaac09b63d386cc65cc7b86e283ee2f6d668c SHA512 891b1b1f3c63eacaa7299ae2c0ebd09a50404fc628c467f1dd0991f1218397f24a34c41bdda8ee709a3e0e3f1756f71a060daf90ace27b25b26ea34bd0bacc22
 DIST genpatches-4.14-192.experimental.tar.xz 5936 BLAKE2B 520914b4bc1d4f22457098f0ee2436ad06d3690ae45ac55144ea23f2b6155b65e2da8009caa3597dedc87c5c0560ba375fce8d587605abb48bbe802f9c0f099b SHA512 f7e67871a1b4d9690132264f6e3160ac956e32cc0810fa758c96631e10475f59428ca92dfed8a21cb1d9f9013d0732121a0a24a9c1c872e97d540e731bdfd79c
 DIST genpatches-4.14-192.extras.tar.xz 17532 BLAKE2B e1f1f857d3cb3f7a1d8e741612547aaf4e6dc0e517e88b4e5f2b063bf8d7e0ce8c843341ba9a643beaa628c8a8d3c2de0929fb24cf6d3888a776676b7e146843 SHA512 f018d3c267689a0e8ecb6c1ca021552d4376ef3fecfc3fcddfeb5713af8595dc3cca3add42d6ea420af07e3cbdf02939ae0c8522ab4e2cdd43d8be344112721c
+DIST genpatches-4.14-193.base.tar.xz 4272784 BLAKE2B 777e0fa13effc434d7e4d4b063baca33ffc4c3b0a508394e50493f840a0fded27a34f77984a2b76aa00450cfc9c76e7ef56723e6f8395c36857c15d8a94e6470 SHA512 47a4d27ec4de5fa659b39f67ca42916db58b070c6ceaac6be9e641184f8a9cf588037f7df88548ad7355afa371cb37c47540dabed19821cef03c3709d8fa6fe7
+DIST genpatches-4.14-193.experimental.tar.xz 5928 BLAKE2B 4207411053e5cbbab0fd402bee3dc4197791e9e11195259bf6c2ef8415b3b4fbc40565f248b6a58ff60d170da6fb90297467fe5cb5aae8d6063e78f66145356e SHA512 90143c9e38259161f89889e027d2ce20bc2a6d4bf8ab86a0962513af0f4e0b7491055f60645a0bb29eadb5dbbfbc07c1ae5a2b37caf8f4e663017400a55c0e26
+DIST genpatches-4.14-193.extras.tar.xz 17528 BLAKE2B 4c73309b4d54a62dc3effc3ac1e1852f7a66dee2a52def3dd053e1e48fb20d1b4ef1eaa5a0078efcb881deeff6a4ddc9b2ea9b6fd31c79e52b963009596349f6 SHA512 4e6d2739224faa585266e83f83fe909fa1895ac5e28cf0ba094e42836375a0d4b6d18d97108f052bf01381cdf6842694df869e7bc270f50f5879cdcadf6f2220
 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
@@ -31,6 +34,9 @@ DIST genpatches-4.19-123.extras.tar.xz 17520 BLAKE2B d841b3929bc795403cb15d1dc6e
 DIST genpatches-4.19-124.base.tar.xz 3482680 BLAKE2B e8716be023f6512fb4613fab11a6ecf6472dd738cdb63669cfc6573e70030bfc5d3374c18672661867dd584d621cffdced21403a337af40b2428ff6703b6aa53 SHA512 dde38efe4b8e413b0aa1380c3fc4284b153b048a38cb8e05fdec34c14588d3e60092a20d247195389ceace0dc9e353caacaf9573c75a2327b4667dcad90c15fa
 DIST genpatches-4.19-124.experimental.tar.xz 6436 BLAKE2B 43c3499798a68f16faa1002006be9c6ddeff9fe80dce2a58daa058aca1a4100ba40fd129f7113e4f66915c1fe01cad2510d458313a6242c705e535773cd93d41 SHA512 154f37527fcbb7214c802466ffe11b720e792edd445177c87c7dd2393abc56ec4ce03ca1091abe406b829761dbbe23229fa31ec55c08db4c8f90ee5a8b6cf057
 DIST genpatches-4.19-124.extras.tar.xz 17516 BLAKE2B 1c7db2f9f888a9becf0dd891a3f9980431419af50552a4cda06c51f1a7b5d923698d6ce625c619b73386a300438f858a551ca53adc2a5bc110d6eda2a575a22d SHA512 4f29e993be982e272205c6d57e1828e7cc837abbde4a1e7b59e6b20eac648315bec135338b8f6e33df2b49d81e855a9f5c7eeebf6238fa8bc3bbd2215c324eff
+DIST genpatches-4.19-125.base.tar.xz 3502748 BLAKE2B 784bedecaf70628f48f3c54a399e1ba92654ffd304aa790902b16e8a5e6bc4935fe3f2409df48aa19e24f633daf153c52e836eb50c15fc05a32290b1c5b1811f SHA512 96f300d8bf6522ab2cbca8614e0727c2ed6204c7bb84760017e424647cc6105f4b902ee39ae63d7b0a63bd6bf85a8ebe7f92fbf406fbfdce861d07ff45856a58
+DIST genpatches-4.19-125.experimental.tar.xz 6436 BLAKE2B ec155a585d8a7d2ecb98ef7f469f62f0bf0755ee69f8898834e073f5d6dd91b0fc7309f6a445cfa6c6c7de2b025b9390e13248945563b24a9e2bd87b6f98a307 SHA512 7a0c01118ff46afe315e4ff48c004b58c0d5b41be4cb29b8e5b66c387f5943c3f1614df4268e7b2cbc386bb6a69ee9deb5abf5112959b302534cf580c61656ba
+DIST genpatches-4.19-125.extras.tar.xz 17524 BLAKE2B 15f2bbb8549fd96cabcd21a881215c9765474fc7c6f0d50556950c47d8170b89381c154615187cae5184a4962a1d181981bd35d9efc561f4e7099e347f7c7d70 SHA512 ec73a24c2a8eae8c1bdb2531e6893618d470c164e86e927b0753fec8d03fbc0fb200cf656c04d17936c9ba1cd2600f40677828ee41dfe07a102935efc9340ac9
 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
@@ -46,6 +52,9 @@ DIST genpatches-4.4-225.extras.tar.xz 16496 BLAKE2B 02f5fc09bf3b85470a6fce30e929
 DIST genpatches-4.4-226.base.tar.xz 3677604 BLAKE2B de17c4e7f66f776ff0882e8cbc8ce1d204064b86862f170cbf3fa8fe85c02191e33b9ef1bb13570b8ae7b00071174d3b7d0302c65550a4c78193e50f94fac9fe SHA512 42d54b2e383c38deddf99db5afe976559bc3eef3fc71b8d89e47334dbaa1078eebb7262978053ce2ad91de4913e4878128a54c22d62a740500e56ff941aef8fd
 DIST genpatches-4.4-226.experimental.tar.xz 83276 BLAKE2B 73df97c3b108a831d254cced159a77e05e8b9078ad5f59f8796f2fccfdb911ecfa430f006c9e40c94126658651e82ef29099d900aaa344f7254ff3571325ccc8 SHA512 1a9b386398109d111809469ed1676a99c375780153d9d709a92d4ffa58e1d26e0b2b2e465b5692c5e096cafd5580e87058fb2e12334f940096aeb588b203b1e9
 DIST genpatches-4.4-226.extras.tar.xz 16500 BLAKE2B dca1b0cb0dbb1c3de3a820bf65330e82811caec1c4edd5aba4e5bc0a56e61125ac45abe01d17a2d1e9a860614957274381eb51dd5887a51dcc5c448824c73256 SHA512 bdc58ae56028f90f35d644adc79a32cf9814d94fda29fe398dae0b727433bdd4f7b51bb0e4d0a656c74dcdac3e333cc98a234220ed19347663660a8892de7f77
+DIST genpatches-4.4-227.base.tar.xz 3685164 BLAKE2B f0ad8e02a6c853dff56edb3fea7d3645dd4a469546c528dec73ca355930cfb81b52063c3bae0b905f6b733b180af085b6b2bcb44f9353a54a47d65657d4fbc5d SHA512 cf8bb528edfaf4817d95b3a94226b495c095301f5eb5449b625632947307c5688a9ed4cc448d8efff5119257356b62f3e1b1ba71a5e1a0d17e52387dc4108f30
+DIST genpatches-4.4-227.experimental.tar.xz 83300 BLAKE2B 2dc38c592236992347f980122e8b3887d4cd942c550d4488e70296147a78ab7022f33a4046694c25892c696e319971dfae55e13e38cf57b3add81978e8a77d59 SHA512 403c476e666da9c7359a4e30b7474ea13975c14a88086bdd833ec8a85e24b3ada68cb706cdc4ab4150e6772b79f02aa3129be6f860a9a72cc134827928ae3f08
+DIST genpatches-4.4-227.extras.tar.xz 16500 BLAKE2B 79702c286573cf70c9f6a7464a0a0302c42a44e66f46225c40ebcf971bf34e381b3be46024553da7694d05f5199dd3c4ed29e2ab917841fe903cd0579888f4bd SHA512 ba717cbc86b08e916e9fe5dd042e9bc91bfce13df704fa5c8c5c040acad9e52f0c7ec271c287f614746c2083c02bb3811a2e822410955478d164f1790e144839
 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
@@ -61,6 +70,9 @@ DIST genpatches-4.9-228.extras.tar.xz 17404 BLAKE2B 22978cb8f5e5a6fa5df7e285571c
 DIST genpatches-4.9-229.base.tar.xz 4047952 BLAKE2B cf2dcfa38783491093b73a9d63676ad9a1235bc76677b1b7ad2cbe1aaa6e77f54d5f1ebdab4466561b13a495b7845f6de33299c9d0ab142d6cf33db36b1fec1d SHA512 7ced9ae1190d8db8db278585442a279837390fb4069f8297c7743fe2c3fd541202ba600299a75fb73a855f07bada47ccc9f173a96a7bb43f869e663de6bf498a
 DIST genpatches-4.9-229.experimental.tar.xz 106408 BLAKE2B 6b5989547847fc0cc8fb06928c7c60a2e43a1e07893f880395633a77e7da3f0b57a46629a4b3ce09b3b7f4ab62d7b86300abe9aefc23ffc250172885b9e29eed SHA512 33d3b915903b258523b6663beaae1e9a7f0d6872610bad192f2b04fe2b0114531e7e936c445c3d7238f699f48441a6ce247b28b4b670edc31cd3b6baa7c8f16f
 DIST genpatches-4.9-229.extras.tar.xz 17404 BLAKE2B 84f99e4cdd42b87fbb418c81786b52068e3480ba5f3ca69682655ce1cff39e15c4647150f7a97668854e09860ac9d300b43248343a0e74edb469f6be9058ea39 SHA512 8d87b766ca2fc0cc04c70ccfae2368a9c1c4d7605e34c5613d27dfce45a3262b2ba2db1c6616ac6fd08cf4084b96f3eda3d4a69695f1bf281a9c06f0e8b15db2
+DIST genpatches-4.9-230.base.tar.xz 4057224 BLAKE2B 3abbff5478b2cdf0a0bdf9adc6417f10a2f86b37e84fb1ba3977d66b6b07628a043142c9f22a6bb61c47bc1e31a217a957ffa4b5d73303772b593672450ee305 SHA512 8c74549fb1fa9bc7cc590e226ce76f5739a71a3513ea99091e02480d000a745b9cdcb21818379386b56abfff34774f31d8f660e557e452ac09ca64eb87a27bf2
+DIST genpatches-4.9-230.experimental.tar.xz 106392 BLAKE2B c08ef3e3ea2a9728aadf12ed2676e6d05617b998cc25094c1747d365c09c4de1ba62fa97a9d7e7b354ec45edd7835bdc259ff179209f311338291b8ea3d92841 SHA512 36dc0e6fae7da517bb1e7328e7dfdfb9871785dfb3ef47cced88f7822c62efe151f44c9423bfbeda77135f1acc92fd8a26f93b00ae5152fa23c58e3553969651
+DIST genpatches-4.9-230.extras.tar.xz 17408 BLAKE2B 324a0c470ef1ee70b89e5a7dfc672509fe8fa3d2fd0fa7b871c3c305b74bbe89f1666718554d5ff639b9462210302a0d59971c161efb73853ebe6a0872ce6d5c SHA512 82183d146ae27fee6d93bc7d2b3e81901f21aaede578e024f7513f38616ce7191fd347995077fd6ce3fc8eb08df28856e0b975f3d2b5799c5cf47cd0e07fe6b9
 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
@@ -79,6 +91,9 @@ DIST genpatches-5.4-42.extras.tar.xz 1764 BLAKE2B 4f9f10869eb9b41e49b89defb9bd50
 DIST genpatches-5.4-43.base.tar.xz 1471384 BLAKE2B 5d95108953fa888770bc863ec3819bfb652e3cde4a8a9db3929e4dfe3cd87e100e993c83fe0d87d064e68878c4f548b327f33e89058d16d66dfe43cd0880c359 SHA512 3f387d99a5a3f458b366b8fb0d6ddc0891171b532741089fd3ccaa5900083102fc63ea54e811042dac9d6b0ac87781109944bd8ff3ac9b63e541e7c8c180d32b
 DIST genpatches-5.4-43.experimental.tar.xz 6144 BLAKE2B 6c5ef31c30f4d58d28448390edaa5015f54927f4617734090362d8ca5de231ccec1172f888b073fc31811e09ac024f2570e6328a9f0cb48d6246e7f029009f77 SHA512 b7e483c85cdb4ad3b4f8ce185b4779d1e322cf3175ed1818e6e4bffc9ef5e858915a9b296091909b003fc83739027fad12638c31273f52b5f0b96601c1299fba
 DIST genpatches-5.4-43.extras.tar.xz 1764 BLAKE2B 92a0a6bc5406ad2b27e6de9daa95b005a2ac80d0373d15cf8b080e6bda504285cc63137113230d7213a47722f3cbef61138034b6e844d8a1875c5098acc18b85 SHA512 15b38aef60c03de9ece8c48e27ac8398c2a21188223fa5fd830729a946738f1ab1f1b811f07a1909a172e394fd8e0b7ada5561cd58ef83112000436a741f0476
+DIST genpatches-5.4-44.base.tar.xz 1501024 BLAKE2B c65367159612a8ab26cfb78baaf286071d7eb5782f6877ba0b59c5e3d3843510d1b81821353739c7f3aaf38dd7a8fff67a98d63fbc2b1c1afeeefd2826cbdc02 SHA512 056bd68c900a21eb0ae5fb3e603f94461df2bd26144135c7995cb335e466df94e4d9f38927a239886c6f9c4fbc1cf81b9dd345dd04d4513c9fe6315ac5f3d098
+DIST genpatches-5.4-44.experimental.tar.xz 6148 BLAKE2B cea5aa9505c278623895f98bbac1277f9e94b946ce1359396fc91cbf84902fb60360d10c822514984b8049cfaeb0ca2c159a5a101e2eacf8d4a0fad2cfb0e531 SHA512 5e9f30ce321fac97654978d1d7768cdfea7f34d770b6763d236829589fae6c7178257edebb2f21f28912a9be51aa12fed4ff468c94d528a8dc13abc49fb037f9
+DIST genpatches-5.4-44.extras.tar.xz 1768 BLAKE2B 85b10762ef888a3afd455c9a42fd6343f6f491d46c0e55d786e1aa3c203dc0a5aa6a296b9770705b31cfa27aa7e4a28a492b8cf95bd413b5dff4c631bdbc7ed1 SHA512 21b034036069f919ed73641dbe3fbaa92dfefd16489383d45c6973c367f4ca3261655ae6a0ce11684e8c5eb45c943981251328ddcd001af9507584f00426092a
 DIST genpatches-5.6-12.base.tar.xz 273584 BLAKE2B dbbf0bca70ce76b98665cbec6b755395f3a538f84bb980baf0c5b37a625b8bd858fe6f0a1342b5c9762111e6f3a72c3de3e73af7a4a0ea4be9d0a4636d241814 SHA512 8938c716826296a070a7043389a63404d70fda7124b38f77504c9db9f2bb4cac431bdeb6eeeae5afce98df5e3b2aed8564e2e339641af8249bea74247d0fd4be
 DIST genpatches-5.6-12.experimental.tar.xz 13692 BLAKE2B 08cf6b55e5d376d9b01c576658d31e73b26c844d2a27fd0d06bb53344b1822fa42f882503eac5d8cf2fd936cad5e904851e966f3afa8f477a895af9d445bb604 SHA512 35b596de51b38ffa9d0b52d02f013e6d847aa2d327a466ea91e72ffbd8986814b872496e86f6b8a7c942df57f0282dd6457340b8c11c346b1abef72c222bbf14
 DIST genpatches-5.6-12.extras.tar.xz 1756 BLAKE2B 71803881b4d4257730913d7ebe04008dc34787974f1180f10577ff7572b2280c9d26cb8d9e7e8f41828613c75c8e72f7957afc31cf789376e8db829ee5a189ca SHA512 aacd0a24a8c15343ab41496108c27263c87580a1ba9a5f237994f55d78187b1cdb77e7b3d2245178fae237c17a4c3cbd116cd0090be7aa34bb21085b094125c5
@@ -100,6 +115,9 @@ DIST genpatches-5.6-18.extras.tar.xz 1764 BLAKE2B 4be4af62876189a64efc04c95a553b
 DIST genpatches-5.6-19.base.tar.xz 425204 BLAKE2B ab43e2e1787923f3fbd25d21d811d09855f93c0cbfee46c95540029d417f6e45c8a816dd01e251f346db9c85c1bc508add8590d9fd4083255bf45d228b8612cc SHA512 54f16f0cb5bd325b780453a09426f474cedb274844e296a8b9925ae5040719ceaab60f4a75684e916f5b4daf365547b06317f6e0d7ea98928d3df629ff86da13
 DIST genpatches-5.6-19.experimental.tar.xz 13708 BLAKE2B f58e8afd54b2de5c2caaefa58ff6a6f5ea66cdff5cbaf6a02246812017568bd6130d3c91f108136184cb472390c46335b50e803dc3977872e99aa34ee7d9417c SHA512 1cb25d0b8574032f3cf9bece33cf072d406ad27cd85af2fdf8a2995328108c1b03968bedb8285186f93de1cd8641d063b2bf7b457b0184c7bbbccc27d6b7c6d9
 DIST genpatches-5.6-19.extras.tar.xz 1764 BLAKE2B 80e76bea74e9b4f1f78de798a78f19de2759a98f304fc223976762bf2a6370a480abf44a9af14c3bc30dc4ecfed0ceab38a480e2d252cc6033524216efd13e19 SHA512 24efa3f67c89027ba62fcbe4723ce7c461b6608b251b144bc09c4e51eddc2ba9ee7418b25c269833e086b6f21186babe41f53f7656ca28488431d5d19c92e091
+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
 DIST genpatches-5.7-1.base.tar.xz 5168 BLAKE2B 506ed0fe3ecf7891c0fa89467437ec665b91a5d476832f567702d42aa0216b5c738cfed235e990f66244d8dbcd3c71ece1d4b280638be2b62412cb9fc2ae05c0 SHA512 bf14433a31b131bb74c1abb1151d021074015a6ed28c88bcb56430e9502d54b450bed1c066c9cd4870da2f1642cc065f2a5d027cbf389b705cea72ad3ea8e2ab
 DIST genpatches-5.7-1.experimental.tar.xz 13700 BLAKE2B 9495afe7c18a779388495a25c3f03a32ab589385d7dadb66026ade8093d6ac3149abccc0331b01de9b1d078bcbd7be957d66bca8f42ea9ed0693b5dd84e49afc SHA512 021cc871b49f73521e394f4e2085b81b8fb02a35ad6e5a7de2c7581ea294fcbfbad9bdcffb9e34be04946a2254995b24e53657d963b89becfe898f250826b43e
 DIST genpatches-5.7-1.extras.tar.xz 1764 BLAKE2B d455a21ce5f37b37861747a71d55f16e9983d82ddbfc51e65f6401384b7415dff3afe5491f9ff5344e9b6ab33b760e647e3e4075549211c1a9d7d2249baa4f98 SHA512 0215ce69c03a12e5bdddfcb61ad1ef9cdeb7b2016971d439766bb2420142b9c960fefedb4f85edef73172203961be9fa01c70cb76f72e9b1f4edb299a6a14067
@@ -115,34 +133,40 @@ EBUILD gentoo-sources-4.14.179.ebuild 736 BLAKE2B 94154816160d25b364f57e6f3bdc02
 EBUILD gentoo-sources-4.14.180.ebuild 736 BLAKE2B cdec7e00ae10e09bb0e5bf3e3cd260d064e01bf7c4c10cabae9cc48bdc667b5e6693a46f384bbbda6ada2fd60ff9a520f05a0b0f3243642863460f63dfbc0f38 SHA512 2da1fbc6430db0788e63630bc27c6865d4f263e00699bdc710f3f05ea58f26541ee5611f041e2d693900a3f78c99fd679d48a64bfab4627962fa534c3f7ad844
 EBUILD gentoo-sources-4.14.181.ebuild 736 BLAKE2B 7b40c9ae57d3305d2976e02ec933aef23708f25c1537479e7ec99b90fe75e106398ceffa14b187b4ddb8241bf20065ea9bcb461ce6f85133f12a75a72c9dba45 SHA512 4b0361c82e156d852ba977dd34ca851c00dc56e4240dd2f5b87dedd73839803463691b66eb5e238c81ac016801b4335f4a8b5e68f4f3a34a5aac8ecf0dd88c0e
 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.19.120.ebuild 729 BLAKE2B 293fd5c4504c7514cafa76da359835ed16ef486a3260b8530d2017636d9ccea4b25e498a5934c757d11cec3f04232c66daaff57fa53724dfbaae42f4de3dd7a2 SHA512 2f78ee6237d86516b4e27c0927e96e5b99c82fd8b9548b16f7b93e9e4e6d6998e2d6cf410b2457e5211d5767dec4b925c4e552c0740d260656c6f62b65b08627
 EBUILD gentoo-sources-4.19.121.ebuild 736 BLAKE2B 744a14832267f069375c82df209867b368517909f5375b4e69ec14b0e6543d871987b6f950dd899673d70e1270d3558c939c0d3dcd3ff7d4cb4df4af50e6f5f1 SHA512 3b86c8c298a18d3cfb1d3146e4161f97fc5dd7d55d9dd67580a3f6f7fde270fcd8fd66091e70f6f8eb7d0f1b7b181e9d55bcad78b70991830c60e510789ee6f8
 EBUILD gentoo-sources-4.19.122.ebuild 736 BLAKE2B 5a90e88eaae5d19a5bd1fa1fcff74f3be89a4a31bfcc2bdf06fea666e947466da4811155251ff8a20f2d550e3b40a1a0f883e1963a63d80999042dd457b12d4d SHA512 82d4930d296cc219b6e90d24ea78e247386584540432365f8d303965a1d938152cf6ddb61c8c8369201269a5f5e978082c8055cdf074c3b1b6533bd50cc679f5
 EBUILD gentoo-sources-4.19.123.ebuild 736 BLAKE2B 21394edea637554faab57f2ec118666f1223c261dd1e7b57941597305f72b9c14c5332c4dd91f5a50a67331b1be6ee3d6490a5a533d51be0ad8dbcd24bbd2079 SHA512 66eaeb14d7c55497f7e5f56b93ce7921a1cc693e35fdb993aa92540bd900a01d56c1a6ec1ae7c4d69b210fa01809efa9e7c59664a244dbecff42d45980ee6c05
 EBUILD gentoo-sources-4.19.124.ebuild 736 BLAKE2B 85e5bebc9264986c538f39686155d5729c6c9fc3afcf75f2117e739c0a72000ff33a25a76c423eacf4d7f76556b56a1ee60dba65a826eea1e5021c55057f3a43 SHA512 5c63bbbbf25da1dea4bbacfd44cabfde3a0e8fc1e5a4bd5e731afb9cc7c9b5fa9075246c06f03905139aafaa4c4f46753570b448b2badb47a1123136a88aa788
 EBUILD gentoo-sources-4.19.125.ebuild 736 BLAKE2B bf964688fa990f306e2a1f46e2f992c745a3c3ccc62c677fd0adf34a8179c5342e320b48c12a2d301c2823c1d465538a96f55db1b54bb1044793e9c738338485 SHA512 fbe36b3b0d35f35e30e6dc92fd5c863a289c32488f6fabec87bb87ee56544d9dadaf2a7440a5e50f8f7efc2d2040b18fe9c657c17a58b3c5bc99f554b2ebea71
+EBUILD gentoo-sources-4.19.126.ebuild 736 BLAKE2B 3cba0f708866bf0e9a505f12589d5ec4bcb20eab00ce65351657ef3d5059662bf4f87f6be2983ff0bf8cafd0c59b5fcfed008ab3bf8cc18e06ecd03bde71aff4 SHA512 b5e2e88401d23f0f73be9884d7a0ade55c1a14c0f49fa74b9a62576664407ef103f42dd5380d08015ba55d4db09396e01aa611fd74322931079c061b3acc6560
 EBUILD gentoo-sources-4.4.221.ebuild 729 BLAKE2B 6ca7a8f5c029ab35fe94e9cd49bca37f553cae98300ffd0a1ba2d2cd8aa34297c0de7508ff2d32ae0eb60b65257c0ca7e7897e9af34be4d37ee245a4daea8830 SHA512 01e9c43a850a92c9c5b5f5c0a74f838ee86d49fcfbe462c55ff42beb553788f15b962c7d6f64562c94a1a496e2df9666ff6b558e64722da8987b15855885325e
 EBUILD gentoo-sources-4.4.222.ebuild 736 BLAKE2B 411205b642b4e0c1590a7367b10d6108a32d059fa8fbe3dedeae1b02031209079eef86d4e02130a667714748c76fea0a8eabe9d2071278de2229ea97938dc56e SHA512 62e973e3351ebbaf079e55671d2a43622d2b087d33d4b3dea21f4257d1a286b1be66b09d493cb54e3b49ae8458942029cddca59b48cfa5644e7710c5a73ce1cc
 EBUILD gentoo-sources-4.4.223.ebuild 736 BLAKE2B 437f6465ea8c36f81570c7ef10067160fab75e60a4a3f8797cd64a53a53c8d66e021e83e9eb8510c808749126ff0609750bcd26c6a87a9946a05785b3fe4e47d SHA512 00085cd2daaec79614975dd0dfbadde09f113f1000029e873388ae6f9005136a1a6b7b23ac13339424e304273adb3023a54ce11a90f8acb2aae5191aa5613edf
 EBUILD gentoo-sources-4.4.224.ebuild 736 BLAKE2B 7d53e8e33d7750b8d847801f9c39ae6890da2a3d2f85ba4cdd3fe283b421d5aa96bda1710163da4ea7aa7de649662a6cea38b8b4127e4a3ade1ec7aac48799d1 SHA512 c46b377137ea1cbd0bf65e2e53c82dbee923bff8bc1b4033aa4aa2c6e72a7e1f4d48149007f61bcba90c71a5fdc5d40d4b1adccd966662d8d782deef5a5daee5
 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.9.221.ebuild 729 BLAKE2B 2f47985d51bd1f16d0fbc8d52c4edf02713ad7b8f47d230a324faddc958767f9fad93accf89c6089ffa268dbec27f61934055446b62603d900fc40814cb9ca29 SHA512 5ddd789e363975fb29927d5567373fdbaf852d324ee55ee2734970cdbb9c8d61c3f23417ab7dfe6b466afd7b12a528712f34b36b4a12e317c3a22bbd1d416f5f
 EBUILD gentoo-sources-4.9.222.ebuild 736 BLAKE2B 7841c89982fece1f7613901cf85488fc2444a69124fc309fe9724ac26bfb18c82321a7144ee2399ce27a2028876e46a40870c5fda5c6f1cb6c71265520ec7814 SHA512 d49759f47d66d9a50c128f5b38bfdbbe23c48b857d5c788a95a47bb4db6c4e203c467937725bea8f197602920527c6fcf9562e19ced9477fd93b36cd37e85dfd
 EBUILD gentoo-sources-4.9.223.ebuild 736 BLAKE2B 16209683a051838d74efd9dd54b84d2072aac36efa2477674993a16e2c70648e6d41e816c36f23ca81560582f53097d8a17f1b2311b63f781af5e626a7dc4505 SHA512 0abb4d52986657da89bf80e36891985a3957828b654f54ac87361b957c1bee63826c6f88472f9992c4d07a0f248773744893666a4f3b3a8f1950303b0b6f9e08
 EBUILD gentoo-sources-4.9.224.ebuild 736 BLAKE2B 73ebbcd363f716f2962638dd013d137ab9c1c04e2f5b82f5437ccf7fcb213fd1e1da4c5b0d79eb00fe1b593ca24d6e8c2df3d640bd3ccaa05003070680779e98 SHA512 868d63619b397ab88db0f7885f2c6d9b4c12530b72e06aac6fb6eca6891d472c214f2b6bbaf442b6e869948c3b2ce2551a2b3550b6c99310099b92ed2a3d7bf5
 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-5.4.38.ebuild 728 BLAKE2B 6546a7a7b36a8947452844ff1b1fe0accaa15f75b298a3067c8d01ca88da2dcb376806918ad69d15b000b8d42078f2d49d5601d1e3a866f8fe540cb233c3f46a SHA512 a2e7a90ed18991b3e9bd610b6427a801a7df65b03d165d6addb51a3400c97fa392f6e4c07e7ac86bcee01825db3b120bd112d36a056c3d26a551dc3278a83bf4
 EBUILD gentoo-sources-5.4.39.ebuild 735 BLAKE2B 51e3b8e7c9226e82a79daf76c34f0fd35907f1fc57e4d79a20a423fd3ea6c079ccb59ba9ff7517691884e63dce73a7f5dca3b8921cc08a58f706ee9ee754993e SHA512 a314530b12bc2b16fa5d6447fc396a759274709ba4ffade973ae26da293c9ad5255baedfcf881112e11b3f281b9acab5f00f50fa5937012d6c22828d668a5e1f
 EBUILD gentoo-sources-5.4.40.ebuild 735 BLAKE2B d2e9e8d2ac227e71c63fa426ec7e41837b4e902ceec7b8aeffb0821e602de7729ba188f9b99c714a5054300df8cc71b5d13f6a328b17d99e23d1329e3db16f7a SHA512 4f35a1e804b3e18aecdc18c02b953223871205c2896d7dfe7683d62370fc30e290f428ecb67904e93c5179d5571ece88caf1237ecfff6b8f90438035e88beee4
 EBUILD gentoo-sources-5.4.41.ebuild 735 BLAKE2B 4fc3376edda1e7a908bce1b898ce1270874d0f1468c775895956dbcc3acdd4c97da4682447dd831422a545c68197418e60f5a149e4eda26dc91b9847aa04ca15 SHA512 2b5864b76492d5aae0a8b7fc938013d8fcaf455554d50e8633c4aaae121602b189130f4356012ffe5572513a34dab8da351056bb4c3e77d782c3f353d3b6fbbd
 EBUILD gentoo-sources-5.4.42.ebuild 735 BLAKE2B 0762d22a655a3dad3ab83cfd7c1c66c1d84458bcdaeb9ef59cbf8bc30972120b786eafd9306be8fff168f0cbc77fb4426a57b3cf1a15f484d6bd0c8c26bb1413 SHA512 7ba52b809b0d117cf4a6ad192e26b8801d8382cfd854245583f9b42566aeb49d2d5574d320215d12ba7ee0d4ff257064c8a0b6e719fdd50e0a014c4ef0156620
 EBUILD gentoo-sources-5.4.43.ebuild 735 BLAKE2B c06ce27427ede791687998bdb4ffc5b0e302b3290a4740da3a3cd6ec804158c92fcf092baf2cc2333f9a5976f4acfd79c073a59a942fd46725c4218befa1fef8 SHA512 5e6f0a88f7d829eb902e2152a3576856fb109f92b46b014a8a4e888b6750e43b51298a97f5e7e8db1caf9e18c1de9c09428056b8e02747fa9cc604fa15c736e6
+EBUILD gentoo-sources-5.4.44.ebuild 735 BLAKE2B 60398dffa874f1a23d644e6b1793b86d451eccd44342895c6e30490b1fa8ae39ac2d0a01a5b190cb2f680d615ce612d14923477a5a1511898007f0c9f4f35d69 SHA512 8c6746f9f05d76a4cc8cd6436602161d1f69dafa98cd07040fa845f03050c9b0a2805b9c66fd2afafb1171b70e6608f004a79c5a7eed379ac55dffb67e0f56b3
 EBUILD gentoo-sources-5.6.10.ebuild 735 BLAKE2B ca4969bd3812fa181b282d913834d910d0f194ae5964c641f1a7657fd15c97dd1e749f5a0712c7ba20e3f16127b864ddc949ee860009a31776dd86d7e383a492 SHA512 1f2cf508c1e5662dc3f432b6ae17abef9e312beaec92660c1cb0e54da3dc625c2934099649632e835f84350cbf5c848c67b291fa4cd342b65f636902dcf6b4e1
 EBUILD gentoo-sources-5.6.11.ebuild 735 BLAKE2B fb6f0d803f17314707fdf42aec41d3eaba2270cfb69b5b3b2c79d4186f110859981417d7db58ac884487c1f8006f00397b69e200978458a4a603a8888de0a1b1 SHA512 cbf9fba0bd24919a39bc8f8c0f441dbf50d510750eab21dafb5ae86f67dd94e94f623e7253c076b6cb9fd3c0e99e4c6efee9e701dda4fafca8cf6f993d751f24
 EBUILD gentoo-sources-5.6.12.ebuild 735 BLAKE2B e5fa4cb89810de803f1d5a54910c7c9b50c0b979fc20bb793c471b40e684bd4d4b8e2cab6d03fd9a47e6d8611d120ae2d749f8880d6cfd9db566b11d864daeb4 SHA512 f2776faf16c53a4c2ba085c92069e516b21f675dc71f802f8b613f89108e5ac7c889b3831560a2b3e81391d51b508c0bf59e8745dba015e036e6d72573131932
 EBUILD gentoo-sources-5.6.13.ebuild 735 BLAKE2B 96544844bb1e7af0746cce832af9054b47635c78095233a020dabf78a1bf3a50e1eb3a5908604f390897510cd359622d008e0746de1d4ed5e94f874dea5b2253 SHA512 8f3cce5ec257435f702c1c109518490f16a2109d7ed40a41e7ce65951ff04b46f51a6568fe35d5bb6c181127a6534cd197ff4a36a49c7d3de92f87a2751fb2f8
 EBUILD gentoo-sources-5.6.14.ebuild 735 BLAKE2B b80c0051115bd2f496cb0957f5cfd1e948a50c0eaa955aaf29b8d1f6d33524e50e97f12baca5d08e6dcdf1e14e32fec72c560adbc68648ee6d3317671fb85848 SHA512 495cf9b3c1281547c786a36b17d2e2074e56f154e1edea9023f8f0319f1674ccc81082e354a108a86cfd58e5b93d75cb084193884210ee97106b94254fba30e8
 EBUILD gentoo-sources-5.6.15.ebuild 735 BLAKE2B c8f141b1d14f9b5ce7d75093e07b5315219a6f88ab9a7f81c4309b6f509a2c110bce45e029e60d2befe382881e88be610c12cc930e9085a5644cf8aacdc41f52 SHA512 72a8c579e0a6bc597b4443a25723e7e06e16322ad99ca4266161cb9e265ffbf28aa7e97e4eb7e98d5b1e52b8276096f0346111db1824135fedf3730a8d77daae
+EBUILD gentoo-sources-5.6.16.ebuild 735 BLAKE2B 6ce13ac4487ed3c096b132b395c66d4a8750eb56b66a2a99361d6114668ffd79e488b1c9be4b775799416d63074828e22d864d31c630471edc430cf782696f46 SHA512 7af998f0f7c9a7f43cbc2058946a1c9d4326d2965755390979bd29c6c32cf0e0793e487cde0a26f6599d3b04673ac07a02c2e47e9f666590198fd6b3ec2ce687
 EBUILD gentoo-sources-5.6.9.ebuild 735 BLAKE2B 07f85b3f10c5672309f71378fe3e8f63009000aaf5fed2ee7920ae09884f03fb69fe5ce70ef193b2e97563c5e69cdf81c9459b86e1a0f53005b02e1b6045af61 SHA512 b6ab9ad0a6813678aaa7cba37783d06885a0a1e221bd66a4f5a514486b4d23100941d07e5fe06ec93c3ca2c98c55e670028675430597f6899c086e4457ea056e
 EBUILD gentoo-sources-5.7.0.ebuild 734 BLAKE2B 8739ab4b019d313717677644a5a83462ee1e3f224c2ffe5e5ae6f9f4c9a75f36bb140b1ed74cee3ffac99dfddcafdda3f281f92720d63b8139a5ad92143ca2d5 SHA512 ab8682807bc4e9aacd12e88b94b50a05a60fb56d2ec74fab15aa173d3ce6feef847173bbb14db25becb7ae1b99c89e6e8ed1a12abd0e812abd32615c67430cac
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.183.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.183.ebuild
new file mode 100644
index 000000000000..10345d537a03
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.183.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="193"
+
+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.126.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.126.ebuild
new file mode 100644
index 000000000000..6da2743d6cba
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.126.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="125"
+
+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.226.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.226.ebuild
new file mode 100644
index 000000000000..7cbd8c60385d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.226.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="227"
+
+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.226.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.226.ebuild
new file mode 100644
index 000000000000..d259c7da652d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.226.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="230"
+
+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.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.44.ebuild
new file mode 100644
index 000000000000..d650c8567146
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.44.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="44"
+
+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.6.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.6.16.ebuild
new file mode 100644
index 000000000000..178d79c9f0fd
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.6.16.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="20"
+
+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/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index b0c40d2d379a..1bec7f5f0db2 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -22,7 +22,7 @@ EBUILD linux-headers-4.14-r1.ebuild 1495 BLAKE2B b868a7aead670b2eaee111407708412
 EBUILD linux-headers-4.19.ebuild 1666 BLAKE2B d26fdf6198c744a14cbcf4f0e80cabb00bb8147b4264d3c29933ef13c74822ba5014cd6f72459bc05ee9a41bdbbec26f0926aa47538f94ed70657723c8efea14 SHA512 fd03381a44dfa74c9022ffdd8b9e096226ab21dab496ae620f3e68ed9b60fa99116122b227c6b97bf241bcf68388f5dd46c41748f23ba0a37e1863fb3bc379c1
 EBUILD linux-headers-4.4.ebuild 1501 BLAKE2B ab94418bf4dfaac7dab7546165aca7da6b653bb0f41cb4721d6098b12e5c9f4749fc3cea4187e98f6890f786453abf18aeef28e51d2a19a128017e2d0c383d7e SHA512 72ea135dec8d604637ec8f43f2ac26d9bea0086842d2fdc473bc2ae1e7aa1b7c71a8370fed2ebd247b9a91746fd0987238ff5ffd82611e1d89c5b84f9d9550a3
 EBUILD linux-headers-4.9.ebuild 1510 BLAKE2B 3860800a2ea67b4e7db8b0895cb4d96664fee7610223f6909d11874b86c4bf09d215ea0a4afc7d48b47a27032f61ce09e791bfd34eba99d4f1ded1fd42d1deb8 SHA512 982bc29928edb19cb5b260111b0ad72bb82f568f63d9025e597372d70db51f53a65140885bca714153065a412a2d91c47926d4e9820f63618afba506c6e0ec9e
-EBUILD linux-headers-5.4-r1.ebuild 1220 BLAKE2B 57472950aa69d6a0130afe7f705921d0fafa1ea36fde833fa28218c2db1e2cf22d0e105955750dfeed759e3ae8c1743410f39bda7d769b5e25b9ff35b53f882b SHA512 be063b396a92954f10e4a71c33f1f958e4bf140c59cbfa577664507469461b7e1c9c9fb412fe708701e7f9119ada6304d71ccc5984c4e6ca5be4b7268c790c5c
+EBUILD linux-headers-5.4-r1.ebuild 1217 BLAKE2B f3bba4469d74e72c27e86a8e0186f6e43f5e1cf1abb5fbda113ab276a3b32247f89684521032fe8729bcbd98f69b6c953033f204f6d185ac822b1c82eeb95128 SHA512 fc58490936c5c8e94ae757d70a538753c80337e9a5b4e4cf72a2c6dd3a37664399eb348cd85f1143c0d19592029c8f26dd054de6d3c557ecb9e3295c64502f06
 EBUILD linux-headers-5.4.ebuild 1216 BLAKE2B 0c09051211aeb91c76abbc981b402647e82b64de8ed715a08dc332d1888a112cfc67774da0471c368436557c5660ea6ebf0fa5f20b34d1c97daceb8edd915cee SHA512 afb4fca97f225a5ca46cdc62f9921bc9f3c7c31ef4df153f96ae36c146f0a026b2589be3bb243ecabfb4de1c0b9186daae03dd8d0fb35a48367f4fb289f0ea0c
 EBUILD linux-headers-5.5.ebuild 1225 BLAKE2B 9f27496ff3bc1cad7eb6b4c2bbf9262c069a0c79d8ecb06984e5b47d17c1b4d23fe7b8def3f6c087feaaf791ce08a30274d2f1aa86a4b298b222bbcc3efd3b10 SHA512 7002bfcb2a1186b53587880292da9d2b6dd1ff2020e69595feca159399477ea6700f1124532df3af504c9bcd3135138701a846c74b3c83bed0dbe81a17c2829e
 EBUILD linux-headers-5.6.ebuild 1215 BLAKE2B c8067a971c440b0a8578806e6242ee35374c1bb1280b68c1fd59acd848d49037963bbd3b60393e03f236eccab7fc7f0dd9b681fa0a556b68cc197f39681523e3 SHA512 449b5aac3e08e96ff928f3ee072e557aee686b2508721abe32c5967c97eabf60a25eca078b718882431b01d2e111988ba23d3442e2b1ab9378c02036298467fa
diff --git a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
index 4bfd5bf786a4..c1810ac029ff 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 0160cf328913..7add3efe4cb2 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -4,9 +4,12 @@ DIST genpatches-5.5-1.base.tar.xz 3984 BLAKE2B aed3662231f2863f234ebdc3c615c8c7f
 DIST genpatches-5.5-1.extras.tar.xz 1744 BLAKE2B 78353a253969918f5c054768df01bf7d0a0887f5686f6b84a78f28a0c1ef49101f278c5140367a4547cce9932ec9e7dcff4b4fd8519bb9e9dd9b7d4764461877 SHA512 84815483c7c30e2258c1d246080c460177b8e3b6c49592a78c2a5d83798b703da845ee3f1f939da1e947dddced42fc83434ca162f8e5135c838877304e3a80cf
 DIST genpatches-5.6-2.base.tar.xz 4452 BLAKE2B f21fa14e4a15f23495eae455d0fa38e22c8b8d6f435674f0a6dc70c9005ed314f9ec986277cc04f206d4c8f9c3ed2ba99b5d98b0fd2c15b74299d0bc2fabcaea SHA512 b4ec4930a81e2e50c5d960276cf5d273ae44d33d10de0d4a316ca03b5b7104c36b6b8ac9b464102e23c57391c7101d8d9189d6b45519c0c2528446d4e9ecaf91
 DIST genpatches-5.6-2.extras.tar.xz 1744 BLAKE2B 1a7b68366c1b4ea01c670bf88f95624baaed6e4366dc311fdaab76f483b944df62da5485760ef546641a598543d6f0d8686c77a1caf4b0ddf2e67ee63a36879e SHA512 6d388ed21866c0ab3d590723644ba0826c8c6212f6a10a7df2f5579e1c5a59bf95c2b132265fc2cc99b90fb839ec2cdffa37d702452aa06fae9feff161ed2733
+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.5.tar.xz 110713660 BLAKE2B 36b990d3650c409652206c319c93c0cf68885334050bc286b479c8b844bc47354547e19eebb58caafb026b96d134f39f0c7ce38b4eebe9da7ea6d1610a1e2af2 SHA512 fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
+DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST pf-sources-5.4_p6.patch 2445594 BLAKE2B 766549139da27838aca8f849c6d71b13f3b1d1915468d5b617fef243f3947a45e7103d1b48dcf97f81675bf52ef2f15fbaf07ddaae739667ebb82f5b9b604e79 SHA512 9f259d5318fdf81285d2d22cbcdae65691abb8d214d031d74a3889750d027ef5439df1c92e6625ddee51f957c77648ceee7dd9478039a59e6c0b4e02eccede36
 DIST pf-sources-5.5_p8.patch 3180947 BLAKE2B 8170494363d949dce8b3de2a6121ec3c4bf2c0ecdba5e6a8e9d2c1e401a2ad9d67eb5ad35dea4749b176eee60398213962666637c9b344631b5c55d14ed6f879 SHA512 e21b810f52c2f31a6b1e21110a43be8d54695763780d04187b60ef2541bace779bbb978f7c6619b8433fd6fe6110cf69495a20bf142a64c9884518ca3265b2fd
 DIST pf-sources-5.6_p1.patch 278618 BLAKE2B 6ee7db469094b449c94ce70ebc5416b71be5f4f745e4d0a310efc8959982f2bcd2fb96d713bc5f696823f06eb1390a67e3b15dcc94abc4086d2a74ba762a1d93 SHA512 3c32c783714a1d295cb07ac341dfcfbedf8925018628afa1839e2c8d7ad297112fac7af28f21ce764f1555fdcf7095e97bcd8b57d99b86a30e3c1c956d5f2bde
@@ -17,6 +20,7 @@ DIST pf-sources-5.6_p5.patch 861886 BLAKE2B edf1ea471d36a0a2bd715fd8822dfbdad475
 DIST pf-sources-5.6_p6.patch 1218338 BLAKE2B 4317b9f195fed9e6ed0fee9532a6a878586e501c8e96b584449c18870b966f4e0a105eb3f54f904d1a4aadac3ca67a80d8613c675124ca09dc374d08138083dc SHA512 c760611142a35ddacc8b85520d7de3ed4c69e13abc6775ddd84bcbb58485b5ec5001b1444b858a48c68d4a9f417b4e1a7aab59913e34107987e7897be9bdf97a
 DIST pf-sources-5.6_p7.patch 1519043 BLAKE2B 73ad395b6437920d35a3a695e5adbfa311a4482632e8678daf55ca2e23ed00907be9af725dc1fe44039a66533a74bf98b0bfb15756f7d144ec08d2fc861e8846 SHA512 2d14c4f892433ab95bac2467ac805cb822888d792c005bc266e71a86bbc1131e59dcccee55514cae0d69c2935bbd6ee6bfdbd7bba32e306a8b568423b8d7bab5
 DIST pf-sources-5.6_p8.patch 1877703 BLAKE2B 07c39ade7484c84a2b9a496f989a0ff9241f5957cda64e9fc70c1f8a38d936531f648a12a5963288be5cc29a977f785cf97d74c1639b014083a486b3073b1052 SHA512 e9e18e120feceeb37d8405347a7df98174ecf28f0bb30be5882711459ac19ef0af81a2ba929634b907ee01fdfd4ae01bb73d832cac4a3e0ac15cec8dfd5c1e61
+DIST pf-sources-5.7_p1.patch 131429 BLAKE2B 4a3c457631c25aebb217fccb287153ae2a67554d1dbd4c073cc82e450a3380c18362321651422dc861df10ea5ca2ba057219b6d325bd7cc1e29d1912e25c0177 SHA512 7a17b758c700e3886aa07d026c39ce3e548662ee61e82d44baaf1ccbbb6bf670bbaca8ecdf7f3c76e7b1e851eeb8c244f6c0ccc25010d9061343ef8c53f304fc
 EBUILD pf-sources-5.4_p6.ebuild 2003 BLAKE2B 142c2a4a03bb26454d46ff3e15bd55e3ac41fa907e660fd648d4a3064a3b0b1b2f9465fb44b6259a080910dd9c233adffc8986c572a714cd2867fa912a5d39d2 SHA512 07022c9cfd032c9841537103eabfcc5fcd8aabc7b9cdc352b953101b254c5319d09c7bc17bc3e08df050494ca5634c44ac04a19dcb740126094d3bb7a7c7d507
 EBUILD pf-sources-5.5_p8.ebuild 1954 BLAKE2B 15c4bd2a69604a36546318261ce7a8de97ab6e78994e8614e72ea6c968aed2a22389557759ab7265a2c0f4cdd5c29e68a82143b6ca23594698c1e9f0a844f4b9 SHA512 0de23fd94dbcbf7e9050cf8399f09adf5b1e2fad6bf12b9c6ba05805e251f0c3d3051014379d6b79cc5f443d6726bd5dea87b1759674bb535b3cfb3dc22a6524
 EBUILD pf-sources-5.6_p1.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
@@ -27,4 +31,5 @@ EBUILD pf-sources-5.6_p5.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666
 EBUILD pf-sources-5.6_p6.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
 EBUILD pf-sources-5.6_p7.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
 EBUILD pf-sources-5.6_p8.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
+EBUILD pf-sources-5.7_p1.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_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.7_p1.ebuild
new file mode 100644
index 000000000000..2a683a5287d4
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.7_p1.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/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 37936b0a166b..93f98d398f8e 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,18 +7,18 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 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.84.xz 2698736 BLAKE2B 036578909feb041d075b2f3952b58c7b7ac6e9cea04a965452ab792f5abe397e450360a29a720f43ff9b634427e512699385d4eac36ba15d2bbe0aaf17aa8de9 SHA512 10a9570408901b66ea2f914dab0f2e05dff772d19cab07c476118a3393f95a67331765f461331bb77ed2083d8ee7f185f6ae012b693e4772d8803bde1cea8a61
-DIST patch-4.14.182.xz 3658388 BLAKE2B 6ab1034246ad5b12cb178cbffb71cea8ce8ed868a34b32ed141993562339937c42273f366f4f21d43be11d09611c2219d4b39feae9970929bb537c79418b76d0 SHA512 ab21ea97c55f00fe9da518f53637733e45490f9005dea2072427efac5712a522a0a365b77b1b89c09f8fb84783f54f11100675738cff81a55332f9851aa8a83b
-DIST patch-4.19.125.xz 3079240 BLAKE2B 2c6078da58aa2f97109ccdbe2c4068af42c06d59eb9f80589c7805b46adc2afc2bf097074664fbff882420b03e5c07673aebe17ff6ed144e1d17781ad44fb3df SHA512 d4df2b877f926703444b3eade08a033dc0d649289c3ef19a8277d95c47527c6fa91a935a2b6c759ab60a9b9180ce83cb899b8ca2a5d888cce7e758a632927246
-DIST patch-4.4.225.xz 3180784 BLAKE2B 10a5d1e65b267f9dfa10c97ee873b128647150f3092de3442f363b500f120d87e3318e4db7c74358ab2da5dcec4f1cf8ca084aa7b239b3c064b09c2515931bd5 SHA512 f94665e755f0a79b97a4d77fa712be97d0af040cf90805e372664f9393138b0f6cd3f5cd7180e4c095fb6cc498fbc7a9358e4f9d1490f99575ad82a6cbe043f1
-DIST patch-4.9.225.xz 3478860 BLAKE2B 63369af38dbfe7209d18b957b2897f6fdf7e5811966d03cfed2a6eff4f6d3ece3c962f262a63cc06de69ff1910b262f51f91711bf9588864b0778c152f3dbbed SHA512 c42ca995563f4d2291574f5f16578e6da831cfbd578a50d8575eab35f008126bbcbea0e8f7a4ea8865d7859c424e608cff43ed324a1f8fc875aa556c691cbce3
-DIST patch-5.4.43.xz 1385868 BLAKE2B 59e656f4bb97dba825cf11280188cf5fe7dd47dd2165d26894dd147f2c7c820ebe919770d8eb41141e2ec909ed28584d6f24ea7b72605f07987dcb88e6fdee3c SHA512 8c68bd5b4137c4d6d58bf9c9d3d7ef34bcdc8eff73961926d19a91faabe94f9eec5154cce2aba27d3d0bca352c490c9283f106f335e3f333137e7448515fea75
-DIST patch-5.6.15.xz 408168 BLAKE2B 0502b595523266d246f23d713853b1c09994ee06bb9d298e78a4a6f05f12735f410ab345f180e55088eff8c2b2fb6259915644bd564c59ce7e57d164f693e153 SHA512 e1c882595806f0bceaf2341ebb569a8b28706c7bd5224f2cd780d6fe31562286fa134cca8381ec3ce3ce481847684e29c580a1b24fef7985863683ff6544dc81
+DIST patch-4.14.183.xz 3668988 BLAKE2B 6233403e2fbf2ddb22849b072e9efc456ba8d0f1fa07f7190e062223ed60cce30f958f769786f011a6a3df712d960071c8e2119966b36ec3179303001de3a40d SHA512 5192df693a82f9da3fcc177570bf3b05debac1bacd59c33b31933c11bcb42e783cea648c4ac2c4a858f7c721ef2473eb239ea45c69ec3afc2bb2d2944fdbdfc1
+DIST patch-4.19.126.xz 3095136 BLAKE2B b813981095cbeb0fb6a6363097b304813af3cd29582cc01d54d6159873e6dfef26c38e16fb2679198c11024b518074cc922b588ebe7051155a0ebb4dc28a7429 SHA512 e702d808ec09921a8871598f8d39db535cd9738613b16ed1cb74e9d2e8dd83d0ae06394e4072f11abcc57e51b7f900542f7859643b818a7da113c70d6fef8738
+DIST patch-4.4.226.xz 3185716 BLAKE2B 13192a740b7f34fdc5d666550a4f78fa7af35a4ab4c4f5fbeac38e556451925430e359ce2c6a0912c5afb2f6b9a14b742454518e98917e4a52f0450110fe4a4b SHA512 da66d59d374a35bb43478043212886903661c0d59378caf01684e517f83e06dd051388a1416e19657c2fa472d6f288e6f07ea7a14646c16b6e76f84595b3686d
+DIST patch-4.9.226.xz 3485352 BLAKE2B d214088f930248f3327e992e2b1304a084ad8fe5e7a7f049384d70cfb0850fdd50f55290ecdd45ea44ef17fbf88dec54ebd59287941327bb22b5b164b7b6fade SHA512 504065b37aad2a12eff30311b0858f2f36a89b64cf0169597d5e8aa56311254a679d28ef90e25c73769c8ddaf71cf40631d6fc942e1deeee40f90a8c5812d5f0
+DIST patch-5.4.44.xz 1412464 BLAKE2B c7c0c189030402303992b130596f716c0afa7305a45996112971000d0de4d7945c9e988e0e7503d69cd4aff2ac3c003d330839ab1f3ed0a53fc7fa68c2e3da44 SHA512 1179f0c61d99ab136cc81bfed153e18a88cf4438f6be524b54d5f4ea76030e059c65e52d532cafe4eb7b1671c04583f6bf8f9114a3da969cd102a78a3530fd3f
+DIST patch-5.6.16.xz 456784 BLAKE2B 9df82160b097b38bb85e8492cd84c85258f82e7ef2d0b2d02422a5890709d0a01648570c82f5f2bb089c0c2e7ad9144fec151e3ab4a786ab9fc5dc643462596a SHA512 6a8b2defef415511386b4a792582cdf657d6fbdf6a0648cad99465d5b91fdc65729b2255a73a0af5db2577f452544f59b57cfce84a45e21aecf253648a40eabc
 EBUILD vanilla-sources-3.16.84.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.14.182.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.19.125.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.4.225.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.9.225.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.4.43.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.6.15.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.14.183.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.19.126.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.4.226.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.9.226.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.4.44.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.6.16.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-5.7.0.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.182.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.183.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.182.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.183.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.125.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.126.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.125.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.126.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.225.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.226.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.225.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.226.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.225.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.226.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.225.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.226.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.43.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.44.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.43.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.44.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.6.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.6.16.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.6.15.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.6.16.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9d84b8cb19f2..a9d4925cdcd6 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/memwatch/Manifest b/sys-process/memwatch/Manifest
index 85ecfa8e9e15..a856704146e3 100644
--- a/sys-process/memwatch/Manifest
+++ b/sys-process/memwatch/Manifest
@@ -1,16 +1,3 @@
-DIST memwatch-0.1.0.tar.gz 6733 BLAKE2B ef48a648599a650220b21d0e82bfbf0cdcae312d128cdf9f356418514eabe51d8a796e1e253b6592af780af57054045b2049f2cd709938f7fe6ae0165a61fa0c SHA512 9adcc65640fcbc252b15a48502ddd705e6f3b2bcf5e3cbd3ad61e640d6921af29f9fb5f086cb71e6badecda3d2f64e76b308d65b70a0d9b70dafb4f608f1f0f0
-DIST memwatch-0.2.0.tar.gz 10278 BLAKE2B 7db5ddc616ceb1afec8f761988db47c8e3050833378d63f8476d46ce44c3a6e35c777443513384a154382adfff534d5fa3b72098b6d4a9d5f861e89e0defd3b5 SHA512 f2b0f72258802877887d3c2367a04a42a9fcb1be72777a3744dc98fe78d4b1b7f5cf426b9355b1d3ccf5b2cd690c33885e557c8ceac4732d91c6fc3c61c2c1ca
-DIST memwatch-0.2.1.tar.gz 10599 BLAKE2B e02b968270dbfd95d4b529ca828693e75e69c1f7222ccf4d015c3a9dfaa6a56cef026067baaa2643d727c8b8e95d0abba52cb9c69ebddcd83e33385ce8a4ea57 SHA512 c30d802922b3241c2245c3762ce41ef6f495aa53feb74644f657898d5dcb2bd7464143a7f42c24865e0ac86e9450af1d66528a7519b2a1dba550c8175d3967c6
-DIST memwatch-0.3.0.tar.gz 16715 BLAKE2B af0dafd0e433ddbc17332d8ca1d5bf1ffa2f28a2c2dab1c2188f7fccba26b1f1ebe790cc17aa38d08c3b199b0c0b6347f27429ccfe21e9ea70d6a78a4c2ffc39 SHA512 5feb6ad67ffc85a6304875d9cb8f98c42017894d05b86180293f8facb811268bc5b7942a489432dfc45bfb62155a5935bd569241b463116a8bd3c51d50ec6237
-DIST memwatch-0.3.1.tar.gz 17655 BLAKE2B 0cd37678b101d5fafb76b8a420a00ac2283ece6997bea29ffef6da3f3acb776db37c3ec63169aa00d2556ce6f0f4ba5fc47570cbfdfbe57387e215a49c36cf28 SHA512 cbc55cd1a70c5d0077a43e223d360c980cccc959808ee511e8727341baa6d96bc2c66be9481f4e25989e28692cf044c2cf9f904eed5ca4695cf484711d3ce594
-DIST memwatch-0.3.2.tar.gz 16587 BLAKE2B 5e500fed616326a30ae17a1845db7b9c18fce1e206228747cbfae84da91cb90fefd6102191323ccec22ffd068b636bc9ca78dc258feaf5ca1fad1aede9db47c3 SHA512 94bfa9832d934f9d2271f3abb350df3f601e6dc9a84c5e18c783c924b774f007e91d4249492f4b98cff465e377474b20d077879d8b3e22945791ca94c81660fa
 DIST memwatch-0.3.3.tar.gz 16629 BLAKE2B 0756d2c7a854c4dd8c10a4bc3b5d5dd7de6f7a480722f6bc9cc8f3f9c4349804e27eb458f14362686c663572f0e0c03c13a87ce2ccfa697e61c2bd3fe712cb20 SHA512 a6e89c5929c07b9348798983c15c0ad308762ba061fef78a8d33597db2a02e7984ffb3949a19dda61945b2265f15454fa9eb29849de91fc00690d34c568df234
-EBUILD memwatch-0.1.0.ebuild 515 BLAKE2B a10dc57dbb492a01da90b5b67851fc0a15576a7ecfce0ac7e665ab7d9f40d928d43c87f4ecdc67d6a6e666bb92c485419f096ba18ecd6c1060a51a9406811b40 SHA512 42492ab6bd9d2681b3802193ae4fd7f3245b087c399fb47c12d02d2f35e7487f8479803374f351b40e43b08ce29f93b2a158e298d1407f250ce31f9cb9cb2f7b
-EBUILD memwatch-0.2.0.ebuild 519 BLAKE2B 288da1f286f9adbb487043689b1e46cb9497fcb104a6346d5f554d73336a4fa94789185b04029907040d6217874d735eac25a6145d6e4739a0d543f5fa2107db SHA512 10ed308b8b557bc3e00e0e8a9bdc00173c912cdf69ff9faf6c7719d2421890c81db621c4ae186aad8689ff54ce5c12b6d882f04ef27771701969f78965994d9a
-EBUILD memwatch-0.2.1.ebuild 519 BLAKE2B 288da1f286f9adbb487043689b1e46cb9497fcb104a6346d5f554d73336a4fa94789185b04029907040d6217874d735eac25a6145d6e4739a0d543f5fa2107db SHA512 10ed308b8b557bc3e00e0e8a9bdc00173c912cdf69ff9faf6c7719d2421890c81db621c4ae186aad8689ff54ce5c12b6d882f04ef27771701969f78965994d9a
-EBUILD memwatch-0.3.0-r1.ebuild 545 BLAKE2B c163ddf1ba335195db2f40ab39320557f3145ec2b854a1f094e3336fbab6876d86f9fd3c827da5b01494fb5019e071ea7342ba8c2c328803f5ca69f5c0a17cfa SHA512 198a62dbcc8a6da01182506785fc3d0db3f799433eb99478c2c377c24767d5cbaa3ccccd63fb0466c0bf13d520506b74a135deae6dce17284a951f46fe385b5a
-EBUILD memwatch-0.3.0.ebuild 505 BLAKE2B f7e4e58975d6a71b642d95316659c0358121d4083fe7f587c7808b358447ebfc6f606c1582ec26ede220b8d51a6119b2f0ca8b77c3e554ba76d4cd4e5a51af4a SHA512 b957ba4805c53dea8e91b295243a962d970f1e4925d30868b69194e84af7dc2b90ddf62123f325de8364bc8a0b0a5e6ec0c70639784b785f7d046b7ef521d56e
-EBUILD memwatch-0.3.1.ebuild 545 BLAKE2B c163ddf1ba335195db2f40ab39320557f3145ec2b854a1f094e3336fbab6876d86f9fd3c827da5b01494fb5019e071ea7342ba8c2c328803f5ca69f5c0a17cfa SHA512 198a62dbcc8a6da01182506785fc3d0db3f799433eb99478c2c377c24767d5cbaa3ccccd63fb0466c0bf13d520506b74a135deae6dce17284a951f46fe385b5a
-EBUILD memwatch-0.3.2.ebuild 545 BLAKE2B c163ddf1ba335195db2f40ab39320557f3145ec2b854a1f094e3336fbab6876d86f9fd3c827da5b01494fb5019e071ea7342ba8c2c328803f5ca69f5c0a17cfa SHA512 198a62dbcc8a6da01182506785fc3d0db3f799433eb99478c2c377c24767d5cbaa3ccccd63fb0466c0bf13d520506b74a135deae6dce17284a951f46fe385b5a
-EBUILD memwatch-0.3.3.ebuild 545 BLAKE2B c163ddf1ba335195db2f40ab39320557f3145ec2b854a1f094e3336fbab6876d86f9fd3c827da5b01494fb5019e071ea7342ba8c2c328803f5ca69f5c0a17cfa SHA512 198a62dbcc8a6da01182506785fc3d0db3f799433eb99478c2c377c24767d5cbaa3ccccd63fb0466c0bf13d520506b74a135deae6dce17284a951f46fe385b5a
+EBUILD memwatch-0.3.3.ebuild 606 BLAKE2B ee8e784bdf2ebcb93f4e3386bba1786b2ab2a10268b2fd26a513fe406bda30e4c67860bff756ad6551d2b91a147c5912a84cd76e8e54349a38e3ceee173723fb SHA512 a1f6a920ec54fdd3e79581f87a074c518597b82a03d4e15c49663e1e205c12e1a29fa181e6110e5c981e9ae00d16050d92020186a96b8a430a50f30c6e0c1f93
 MISC metadata.xml 313 BLAKE2B 3a2f04915656866612bb774b3956801ca0f1978605e9d1bdf0bf2135144fcffce75680286aae84725aff5576d0d961b7e4208eacbfe684257e88f5c35c032a6f SHA512 405264987a6dc63c05bca58fb9cdb73ced60db5d832ee8b1f410ed80760527800806f5dc7273f94d62a08008abdf6ba7502bdbd7a9f3c3e6d2268fe8e5632448
diff --git a/sys-process/memwatch/memwatch-0.1.0.ebuild b/sys-process/memwatch/memwatch-0.1.0.ebuild
deleted file mode 100644
index 7111f876e715..000000000000
--- a/sys-process/memwatch/memwatch-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://bitbucket.org/PascalRD/memwatch/"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.2.0.ebuild b/sys-process/memwatch/memwatch-0.2.0.ebuild
deleted file mode 100644
index 8c16cb95ac36..000000000000
--- a/sys-process/memwatch/memwatch-0.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://bitbucket.org/PascalRD/memwatch/"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.2.1.ebuild b/sys-process/memwatch/memwatch-0.2.1.ebuild
deleted file mode 100644
index 8c16cb95ac36..000000000000
--- a/sys-process/memwatch/memwatch-0.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://bitbucket.org/PascalRD/memwatch/"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.3.0-r1.ebuild b/sys-process/memwatch/memwatch-0.3.0-r1.ebuild
deleted file mode 100644
index 7d7b69239750..000000000000
--- a/sys-process/memwatch/memwatch-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://unixdev.ru/memwatch"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST="FindCurses"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.3.0.ebuild b/sys-process/memwatch/memwatch-0.3.0.ebuild
deleted file mode 100644
index d071cbf48cdb..000000000000
--- a/sys-process/memwatch/memwatch-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://unixdev.ru/memwatch"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.3.1.ebuild b/sys-process/memwatch/memwatch-0.3.1.ebuild
deleted file mode 100644
index 7d7b69239750..000000000000
--- a/sys-process/memwatch/memwatch-0.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://unixdev.ru/memwatch"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST="FindCurses"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.3.2.ebuild b/sys-process/memwatch/memwatch-0.3.2.ebuild
deleted file mode 100644
index 7d7b69239750..000000000000
--- a/sys-process/memwatch/memwatch-0.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Interactive memory viewer"
-HOMEPAGE="https://unixdev.ru/memwatch"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST="FindCurses"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/sys-process/memwatch/memwatch-0.3.3.ebuild b/sys-process/memwatch/memwatch-0.3.3.ebuild
index 7d7b69239750..c49989332f5a 100644
--- a/sys-process/memwatch/memwatch-0.3.3.ebuild
+++ b/sys-process/memwatch/memwatch-0.3.3.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
@@ -11,7 +11,7 @@ SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0="
@@ -19,14 +19,10 @@ RDEPEND="${DEPEND}"
 
 CMAKE_REMOVE_MODULES_LIST="FindCurses"
 
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
+src_prepare() {
+	sed -e "s/^set(CMAKE_C_FLAGS.*/set(CMAKE_C_FLAGS \"${CFLAGS}\")/" \
+		-e "1s/^/project(${PN})\n/" \
+		-i CMakeLists.txt || die "can't patch CMakeLists.txt"
 
-src_install() {
-	cmake-utils_src_install
+	cmake-utils_src_prepare
 }
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 784b5a52a52d..8c423bf5389e 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/blas/Manifest b/virtual/blas/Manifest
index eecb006ec7ea..079f43cdf777 100644
--- a/virtual/blas/Manifest
+++ b/virtual/blas/Manifest
@@ -1,5 +1,5 @@
 EBUILD blas-1.0.ebuild 418 BLAKE2B 06e6925626b426d8122cac589a641077f8a965a0702e407560667e2f0e4952f9884118e5609cffffcd23e475c2aeed80ab81129c8d401e7ea52570d8bf908c26 SHA512 124bb8aefb390c196c90b7fcd1d7bab79cd68fdaa3524900272bb38f0dcff50f47c96ff537bfdab0983c85e0d481cb199e4c1daed5b138c2b36a4b57fce21b43
 EBUILD blas-3.6.ebuild 415 BLAKE2B 79d32456f521e4b87414f847e0bdf3032634dcb1c0b010c57de9e427b775cd713dc6408d1d08c0beb6d96a90da398dcbd61c011e502fb4f15f35e040ef49eea1 SHA512 dceacfce30730e45460f4a66b02ecd14cd86829b375bc9d0db37f3fca869e86577f13f6654d955ca3333377b165ae7594217c5e1eb38cc9e4fa1b9460363a8cc
 EBUILD blas-3.7.ebuild 422 BLAKE2B ad004e317814cfa401671931a94bdda919dfc466bdfbcb5a250750784f5c8e488a1bddd9e277389699c8707c64d92c3c191952468b2a1306c7f2c7d21e9c9185 SHA512 86df4421344eb08cecc6d4d2deefc03467bec5f8fe64b9205eba04a8d536b1910795ccb45edf200d9d05866166eb5b0e956dff2c166319b5a87683ff18e6f882
-EBUILD blas-3.8.ebuild 550 BLAKE2B 04246d9ad902101616db63b872abd7e6f2a015a884fa4e126e81a1ead61bb6ea8779b05aa417a1d3f690b4a6a11d4c5a9795fdb3c8adfcd2893a60861a2f509a SHA512 c23000662af1881aabb9ef0c9e3dc6ddf80f51d129b60a09586c424dfd8dc1a54ad37653cad67953d1510e533c592fb9d8d5025fffb9b809d9717922f5fbff67
+EBUILD blas-3.8.ebuild 549 BLAKE2B 06dead5e021fa2f7bc9079165b03c6e198eef6c767e602a653e5e7b3ae4f9f90f4091715d515930f4eb8eefbab766a412757b186b66fbc4b2f46affbe94783b3 SHA512 09a6e0a6bc1831692971b3c15397341da7f74b803cbfaf5f6c520f8c0adfc33c0547bad7cec7ea2383049a87f469a21674873375f0aec889d8462ba4dd616563
 MISC metadata.xml 522 BLAKE2B fbaf0c9e2e5611db496efd183e8429dcf90a2b7926c9d4baf9be38736f15127b3e721dc0b9a6323ccde12e9fb55fd8438e6fdb75105cb5aea610687a9d11d8d0 SHA512 b9a3489350524b32015a1af2a1a955e407111ddd8d09384ccfa92d423ba7bcba3c45d1a43821715aa67fe177709295151f9046217a7c6010213d0e0ceef82074
diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild
index c0c2cb297a4e..781102d4e564 100644
--- a/virtual/blas/blas-3.8.ebuild
+++ b/virtual/blas/blas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
 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"
+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"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/lapack/Manifest b/virtual/lapack/Manifest
index 75348805a5f9..57b88b77dd9c 100644
--- a/virtual/lapack/Manifest
+++ b/virtual/lapack/Manifest
@@ -2,5 +2,5 @@ EBUILD lapack-3.0.ebuild 333 BLAKE2B 88a1d115019e2daa742e2aae6df01e353b9ddba011c
 EBUILD lapack-3.1.ebuild 406 BLAKE2B 59dd90ee1c90b2a9758e6a59f3e370f8d00ebbd83b016e1de80c266935f2d0f420dc91b2446e7636fbe7a390f43b7a92194a36c05ebeff4c3846bd59b59a2f56 SHA512 fb7ad055ea2228cc26ded7a1a28a593ee2230ce180db6a13ccf9be0fa2a1d6948ddd913ae078b2ad616ebaf1c21f96316121b2047e6d7627142a7e6fd5d69881
 EBUILD lapack-3.6.ebuild 411 BLAKE2B e645fb35c0c4d292fcedbbceae29fcdf4a448c8e343e6d412faa57b1deab5c7d46a31ef695c17e6063c6b75f6e060bf7be4c337a9347dafebddc77c3c0bc4a99 SHA512 c243ac0fd76b22dd73d4ca634441260fdfae2069da94c371f6a238e2272ff68cbe76e79025613a70a1d2f5c9f7cd4049cad1a2bdc8609569fa3deb660fad2f82
 EBUILD lapack-3.7.ebuild 418 BLAKE2B 82e25aaaa91c9f0715dc8333e74592e3638c87741b6c3fe88b822da2bfb669eb1cb351af6de6fe56f38a61bc140abd6351dea1a532ef435be2cd280e420eacab SHA512 6a94d1cb5fe4feb155f5dab2b022bbda9c212c7ca6961be393958f0fa03e557e03873fce025d5688d7b8fe3d934ba26b09e518625429f17394b834bcaff9ec6f
-EBUILD lapack-3.8.ebuild 528 BLAKE2B 3cd05252f0de3d23f309cddb538ca5b4179ef0e08561c25216591a85520412997f6e314616ce8c2386a2fd96e4b0f626fe1540c4794dff0455d4934f232f50db SHA512 812827a890368608643e044142cc67f75b869ec380d56a5e1fcbe0a157c88683b53e5fe989891edb901a1a81b1f98a85edbbbee0da4e79cc695562058b91cfa0
+EBUILD lapack-3.8.ebuild 527 BLAKE2B f61f7f9ab9482b47da06c92ea0b86d687b94f75f61b3ef6d7978a87ddd1662c7e98065ddd95bcaf5aef459914be12d020f043e1df3a1801708f2e8e37e1969ca SHA512 3e69ef564d8a918360d144a185ad78d1f50855804e36e7a3858d801dacdd57438a457035aaa77397ce616d9c88d7071e95762ae603a45778409d305fb39c31a8
 MISC metadata.xml 512 BLAKE2B 4fbd9b4b12e1bc72c6b031655b1b9cf39837e5afb995129dbcff75ce741b6d523d5ec81401b8992dbd501bd340da864416f960fa9fb4f0dee3e59096160ddc7e SHA512 3baf1a95b1ab22dae8d3ae0492c6116d1ca8e2b780d4b8f047e01eb3edd12753cff367f0022a7d6e1f926d4afba45892d0cd8be6ecef61a0e9bf4e7f2b023b3f
diff --git a/virtual/lapack/lapack-3.8.ebuild b/virtual/lapack/lapack-3.8.ebuild
index 1ebca7e02d4d..16d4bf09cd42 100644
--- a/virtual/lapack/lapack-3.8.ebuild
+++ b/virtual/lapack/lapack-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index db4707fa5227..3572d30dc666 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Compress-Raw-Bzip2-2.84.0-r1.ebuild 576 BLAKE2B f07295c1e4e07ac1258ccfbcdf8bbb007089e7a855591d8357e4fc61ee284aec4fe4541952027af2b1191faa63ab24ef899f3cd81db0ed4e83202dbe9e930c40 SHA512 80c0cd7092b687d12f88b0df2755d6e4a2eb717f947d758f406d1671a281e764232f0c13b3255f79a039e88fb03960c42165610ce66386ff0ce3b7efc53d71b6
-EBUILD perl-Compress-Raw-Bzip2-2.89.0.ebuild 562 BLAKE2B 0cbb99662e1ee58cbda2d44bdb48c781ca11e1a977e2210329eec520f1815367d8665d200705fb982724e45cede0913a6af4e6331a22872761a1a97c301d9936 SHA512 ff71d5158ed4cf059882d67706eb137ca67aac35ec145580e82fe42b3faff6031ae7e6908381efd1a7266e1d528d8278e97ff5e8e5169e23e27b7a4ab651a174
+EBUILD perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild 585 BLAKE2B 53959481e0d2307a3312a8fb16b884f45d488a4ebe3ed8c7b96c46818fa2b94acf1a5825f578a15b6663742ebd4e92c5d010763cb58ee98999c5b59f59a165a6 SHA512 fe67bb26d44ea0e8ed23152927cfe331e5142378718206e89dd20a32b35908fd16606c6747d3fa9b6b8f032a847cea4d087c4eb8832509c6e8f07eafb0dcf8aa
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
similarity index 85%
rename from virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0.ebuild
rename to virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
index 6230b1ec4094..961db361f7c9 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
@@ -8,7 +8,7 @@ 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30.2* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.30.2* =dev-lang/perl-5.30.3* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index 697016411c3e..7da2331fe12a 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,3 +1,4 @@
 EBUILD perl-Module-CoreList-5.201.911.100.ebuild 666 BLAKE2B 87c5c731314f0b6520a85ed09ebc5674ad4b4b1d617594463142e6d6dd036c5e48867822f67d7fa8540a7a385ba6ed3bc1d48530d2b3ebadcfa800f24eda808f SHA512 c166549cba493c444a2ac0eacf1d9547ec5a1b019ceaf7e051411dd9d96b39dc19a3b85238e28246716918e87b75d0b0a8d2f44b73d227cd49dcb185ed9d6252
 EBUILD perl-Module-CoreList-5.202.003.140.ebuild 675 BLAKE2B 4da46731fc3a55e2baaf516a7bfca644a8613fc91b0066528c6c7c5101f0a31669cc74fdf91aad90c8b09518bd71275006915562f09ffad5a022830ebad9ad93 SHA512 677b0f0969379b7f99c356e6621ebe041b8cd65aaf63d3aea03358ab984439864e5b92e147bb4f3cb869424d4f4d5f855cc273e7ec56e7b3d645f655cadaeed5
+EBUILD perl-Module-CoreList-5.202.6.13.0_rc.ebuild 675 BLAKE2B 25dbc657ab6112ff7e5e6497ee867b51604647f56a87b38e5ba11ef0f2995cb65c6d054a23fc97366c9c217e65e83ef05859a736afaa65d627901ca2abc64b2d SHA512 6974c125b822b4d744bc2ab982b17cf95a26455229b4585f024078d6399bbc1a9b3ca7e2e0a2833b4590686e5e4e1eaf8f176c104abecfc9e1640ddae9caa552
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
new file mode 100644
index 000000000000..a2a69636bd31
--- /dev/null
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
+# When bumping this package.
+RDEPEND="
+	|| ( =dev-lang/perl-5.30.3* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index e7f1ce3aea31..84cd62c56bf8 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index d6e93f225a78..ad5e6657a881 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,6 +2,6 @@ AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b
 AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d1538c77baa33e0abc46110fa8aaf3207490a80a2fedc13d42558632703ee4552ebbaa99d67d929720008dd2 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839
 DIST modsecurity-2.9.1.tar.gz 4261212 BLAKE2B c47c7934d8da870e629c5733cc8c37452e4d90351269a14b99483188e8e3161891bd63bfd70e0723648c8daf51f1c33d900bd90ab0157332f826eab772f09f62 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-EBUILD mod_security-2.9.1-r1.ebuild 2768 BLAKE2B a278a8138efb52c23378fc561adcb2e72345bf63d5c628f11e7c2ecf641ce16dcc5d9d018a7fdfd78f95e03783f8700062ab3fc8e78f1ed41ea3a53bb93fbec1 SHA512 09a1dacfa56d0c188976312a0d4786ee712dfba38ca2d280f96945c308d6f2cae54c014edbc6f5c9ea82bb233fba2bca368a3e7c1123bfa9032ca00666f113e8
-EBUILD mod_security-2.9.3.ebuild 2616 BLAKE2B 2bc64259b3cd4ed532812e1b5ceb72a1ea9d16935b6a0f396d14e67a5a0858b1eb1b0829fb9a5892817004bad1a26fcc63a2f4ab46b42bd04e8fad6b3d4bb343 SHA512 38787e38faffbd7c1620bdc777dfdf1e19d3c8c9aca93ef508439266d60c2a05e216ce2be3d8e533d4af4e2dabbdd3c9da58e7f1beea7f102bf4d841c9501056
+EBUILD mod_security-2.9.1-r1.ebuild 2770 BLAKE2B 6366d2b03e9feea20b55629ea0ae5a9febe8e766b252c9a9b65249b34ed15de9787fa56a65164652493b6669cd2e9700aadeade2312965aac4d6130eb86a942c SHA512 802861ffc99eab081221e4d379ed46c53c93ad110dd8c3a62582fb15df51744377c87be0eeb9a373c8a15090ac9528e77720b4565d807bdac2076c76d605efa1
+EBUILD mod_security-2.9.3.ebuild 2618 BLAKE2B fa9fe5da3353e89e3083c705908d020fd7e3ea47fba9731e4a58bf232ad11e7e0604b5b7f4e3ee57df1cb4686d9f536c6b1eab3345530eb436079bac3c3c27ff SHA512 fce129f6138269782b1cd2523c81657bfb9d7332cc2566e22314fdc6c9188a8b0eef4a714e6c388b9d6a274eb204b484e29ad9de0869c66e2f3168a378bacc2a
 MISC metadata.xml 1009 BLAKE2B a3a9f32a3cebe4447b0ec621c62292f77bb988a3860f6eae63974b794a028f763a5603f35673d9cb82d3836ed24168c12e24ede6109db65dc9521617b293cec9 SHA512 98f9e6ded7565d6d0dbb50804de7fbf9079bc7f8ed2cfe1fe640d09a23fb88e9ef3242557b2418e3c12af747b7b647b29cc950702bbef57050d56d5e5012852d
diff --git a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
index bd1f363f6e7a..eb214cbee1c6 100644
--- a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,8 +9,8 @@ MY_PN=modsecurity
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Application firewall and intrusion detection for Apache"
-HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.modsecurity.org/"
+SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/www-apache/mod_security/mod_security-2.9.3.ebuild b/www-apache/mod_security/mod_security-2.9.3.ebuild
index f04a0e597d6d..9d48ddc8d7f8 100644
--- a/www-apache/mod_security/mod_security-2.9.3.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.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"
@@ -9,8 +9,8 @@ MY_PN=modsecurity
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Application firewall and intrusion detection for Apache"
-HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.modsecurity.org/"
+SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 0d25b67fa620..11ecbc35fc80 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -5,6 +5,6 @@ DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325
 DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
 DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4
 EBUILD passenger-6.0.2.ebuild 3984 BLAKE2B c5510d888f52ea09bc94d630804dfddcaa19ba8a504280fa38e3283cf3b03e18e8aa6e320f76b1a7b127fa4e1530b52eecd27e7e6977dec03bd2935a775e6f55 SHA512 2040af42ca47efe8ed3b51e8c5a2d3cf96cc840bb4c9e0e8cfcda06c150947a8a6bde5563ed3da8bd27b0374f334980802c84d2737c934c78c27fc320bd0b663
-EBUILD passenger-6.0.4.ebuild 3979 BLAKE2B 9ed1cd575c59b2c897b183c81e863685ab1ab992527f0267f3709f31e332ecc373b780593bc7cd0469f252b870159a21eee041d7b22d76601a2f0936d0472da0 SHA512 394ba8a643d00912031cfc1b2169d2cfca29d374ed10195eda3340b4f995cd0a3da08d2c98122ae86e9d78b72b549b1af9a08ac8934d5223faa0c8cf417db17a
+EBUILD passenger-6.0.4.ebuild 3977 BLAKE2B 136797a63538618616ce49f3b2a1082f7155b88934b38d3c9118216ee43490f4a336164def33741ac072612fff9b96bc3bb897e2d76080e7eb030a2c180159e2 SHA512 584b578239cbe18ea1866d91231f92c5b1892d9481e3c52dbf768ab81396dfb17e5b861f956e33de81ba8c3365f61e06bd1ba785f966bc74e226a453478d3c54
 EBUILD passenger-6.0.5.ebuild 4066 BLAKE2B 8cbaf653657746db6ce0e92beda4600862c6e7cae12c85ecdcb189fa2b1cd337070fb38767b903e9ae6cf96a308c8121af7d7effa5d4e19c6a3784943d8913e2 SHA512 e03ff853dca4f3115cb11e548d807c2feb6f8946a76fbef2a81a8fa52f150284dcefe91d4adba302005812a5570ecfd86a4109cd3633e7cc82f28ff3a6330ef3
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.4.ebuild b/www-apache/passenger/passenger-6.0.4.ebuild
index cca1985ecf44..3ec3b0b2167e 100644
--- a/www-apache/passenger/passenger-6.0.4.ebuild
+++ b/www-apache/passenger/passenger-6.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 079111d856bf..e4677ec4d498 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 76bba6468d34..1d1bd673f4d4 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,9 +2,7 @@ AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.10.6.tar.gz 30147860 BLAKE2B e41e226be820eb0a436783f49bf90a1149eef4e0dde00edc09bc76bb086ea53ff2856563e31ab261e1529a03753785e04c1fe8a02f72eef01a6de173df82098d SHA512 be64f73eb0819c28e444b9dae8d4baecd910aad790efeb515a981542125679257f48a5f4ab1c8453b5372a0c8b1e9b84275e61c89dcd2137d7f7cfe8c71f917b
-DIST gitea-src-1.11.5.tar.gz 68923871 BLAKE2B 99e189b4a95e9ef6079a5e8455c05209da742499ff1b18e9f5edab2620ff8deb64ca3b7cb59d456b6fe25558602be8e1f8376ec234229c6af7baf24cc6d15023 SHA512 b12bfb2fc13bd0ca5799d52c37b5d2988879041892aa1e160546f7c80e2faef086f76cd753de90f2468fe9f87af6eca64ca21df394db160fc347137fc9a0fd52
-EBUILD gitea-1.10.6.ebuild 3427 BLAKE2B bbbeac7a2b28d7cd601d9a3a2c8ef88165238933544ab95a9e7acf915b86164afc7f97b93a8e1f3f94b8bf526bf318e1d19eead4ca81c5e779e50c4b074b9d4f SHA512 8d09ae65094ab6403b61e7ef3fb045ac54d7f5e27184ea98b1a8da1618ef546bfec0787949faeb3b8c598d8868bcc08a62c3ed2a7288aaa696832478dec1c0ea
-EBUILD gitea-1.11.5.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
+DIST gitea-src-1.11.6.tar.gz 68915319 BLAKE2B 8d8fd34fe38e153aa4af932a83933d0b5ad81a63bf7b7b5be59e64dd82db3282072686979a41fafa3ac2e523f79d6926ed057b2ed18645040bf1c446c6ab04b2 SHA512 57d5214a5e05581c134d42e00ec29fe15f3245a75440fca26c7162937570affc5a2e4ba8e903cb7f15fcb271144183ce5aa473457245f36d52686ea9f1cc93b3
+EBUILD gitea-1.11.6.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
 EBUILD gitea-9999.ebuild 3579 BLAKE2B 8bd251e0fe851dc894dbb49aa476f20760f74c245de2df7d9bd026da36115a3f5fabaf7af00f0137ffb363566a2f35b93c2276f1bf6b9c69a2d821f439c79500 SHA512 75836046d9d6e04a438e9128bf5b2cb997ec12edb1f3be9591ceea89374b550317b185e8d5b4bf125de824b25a1e5dbde136521f4b17531f1e97084b0eaf8451
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/gitea-1.10.6.ebuild b/www-apps/gitea/gitea-1.10.6.ebuild
deleted file mode 100644
index 473b669f45b3..000000000000
--- a/www-apps/gitea/gitea-1.10.6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != 9999* ]] ; then
-	SCM="golang-vcs-snapshot"
-else
-	SCM="git-r3"
-fi
-
-inherit golang-base tmpfiles systemd ${SCM}
-unset SCM
-
-EGO_PN="code.gitea.io/gitea"
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io"
-
-if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-else
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
-fi
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite"
-
-BDEPEND="dev-lang/go"
-DEPEND="pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	acct? (
-		acct-group/git
-		acct-user/git[gitea]
-	)
-	dev-vcs/git"
-
-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
-
-gitea_make() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		TAGS="${gitea_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
-		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
-	)
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
-
-	env "${makeenv[@]}" emake "$@"
-}
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
-	fi
-
-	gitea_make generate
-}
-
-src_compile() {
-	gitea_make build
-}
-
-src_test() {
-	if has network-sandbox ${FEATURES}; then
-		einfo "Remove tests which are known to fail with network-sandbox enabled."
-		rm ./modules/migrations/github_test.go || die
-	fi
-
-	if [[ ${PV} != 9999* ]] ; then
-		einfo "Remove tests which depend on gitea git-repo."
-		rm ./modules/git/blob_test.go || die
-		rm ./modules/git/repo_test.go || die
-	fi
-
-	default
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
-	if use acct ; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.11.5.ebuild b/www-apps/gitea/gitea-1.11.6.ebuild
similarity index 100%
rename from www-apps/gitea/gitea-1.11.5.ebuild
rename to www-apps/gitea/gitea-1.11.6.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index b68f50edc07b..478d4666d6f4 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,6 +1,6 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.7.3.tar.gz 65083849 BLAKE2B b567885d58f4e28d2873feb4bdbfd364697d3c742039441d12df0f7a76ed8703ef2a08450125feeb576c539e7e2a84d193da92436cbd82601b65a5d42862a7a3 SHA512 15d02ed101088d845ed94fb88c629428f2a899a23dff509ec82cb148689bda07b56883765be145d5a5769ed0e3d3b9d98e50fc940c95a1074f5b5e3adac19f30
-EBUILD grafana-bin-6.7.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
+DIST grafana-bin-6.7.4.tar.gz 65083442 BLAKE2B c619432325ac5254c78ec08579f048483dfd1b28fbf8a9b919517277ad887b238f953ba796366af5c9f29a53daeade160c55a2255cfe75bf767b4ddd57474f87 SHA512 fe412966558529f114b70a5cb42f82c37dce67b2b04739ddba0d9821a3e12a5f1e44757df19d283a9b486737a411ca759adab9beaca6d0f14259945675218df4
+EBUILD grafana-bin-6.7.4.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
similarity index 100%
rename from www-apps/grafana-bin/grafana-bin-6.7.3.ebuild
rename to www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 080443033931..097bdcf6a78a 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
-AUX webmcp-1.2.6-gentoo.patch 5143 BLAKE2B f4b8ca3ec283f3b4e7149cb746adc889099ac90ffaf5265670ae9446d55135fcd73907e84525f44d0d20a312a6e4033fd503c48caf884c6b106a6c1a054f5c85 SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10
+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 1414 BLAKE2B 23deebc5359c15f31d9a76b8b2cca925451f8e753385eab93ab7e7e27a6d17a521e2495c56c0742f8eb8dafb22f86dbe7f779ddc4f7e13669a9e02e499d191c2 SHA512 04de52cf954b54031cf41f56dbd10ee655b778688543e5c490c1aa6beb2f357409a71702dcb49ba5a94316f7c10218cdfb7320b335247c65b04f0d892147574a
+EBUILD webmcp-1.2.6.ebuild 1430 BLAKE2B e25f69e511d1b0bc9349761573fb4617e7daa96435584ba313d2d57e71fce09f3792551b3e95bbe8515a39df9e4531e6e5a60e7494029a3bdd780c61d9cf9684 SHA512 635a9ac44d15293681bb3beda2964bbe6d5e37dd4d0429d03242474b56c45f05f73e7d9b3e305c47c4866abb7d7784e96d5744fe9b08c76fc48156775602fa22
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
index 2fa1eb4aff53..3b399fe96ad9 100644
--- a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
+++ b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2013-03-12 21:49:03.976676966 +0100
-+++ Makefile	2013-03-12 21:50:02.888103540 +0100
+--- a/Makefile	2013-03-12 21:49:03.976676966 +0100
++++ b/Makefile	2013-03-12 21:50:02.888103540 +0100
 @@ -1,11 +1,11 @@
  include Makefile.options
  
@@ -34,8 +34,8 @@
  
  symlinks::
  	ln -s -f ../../libraries/atom/atom.lua framework/lib/
---- Makefile.options.old	2015-05-26 21:43:41.354197822 +0200
-+++ Makefile.options	2015-05-26 22:01:34.594735786 +0200
+--- a/Makefile.options	2015-05-26 21:43:41.354197822 +0200
++++ b/Makefile.options	2015-05-26 22:01:34.594735786 +0200
 @@ -14,13 +14,13 @@
  # C compiler flags
  # TODO: check alternatives to -D_GNU_SOURCE -fPIC
@@ -49,13 +49,13 @@
  
  # linker flags
 -LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
-+LDFLAGS = -shared
++LDFLAGS = -shared $(MYLDFLAGS)
  
  # additional linker flags for parts which depend on PostgreSQL
 -LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
 +LDFLAGS_PGSQL =
---- libraries/extos/Makefile.old	2013-03-13 21:49:19.710360750 +0100
-+++ libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
+--- a/libraries/extos/Makefile	2013-03-13 21:49:19.710360750 +0100
++++ b/libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -65,8 +65,8 @@
  
  extos.o: extos.c
  	$(CC) -c $(CFLAGS) -o extos.o extos.c
---- libraries/mondelefant/Makefile.old	2013-03-13 21:52:54.884250479 +0100
-+++ libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
+--- a/libraries/mondelefant/Makefile	2013-03-13 21:52:54.884250479 +0100
++++ b/libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -76,8 +76,8 @@
  
  mondelefant_native.o: mondelefant_native.c
  	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
---- libraries/multirand/Makefile.old	2013-03-13 21:54:29.399328173 +0100
-+++ libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
+--- a/libraries/multirand/Makefile	2013-03-13 21:54:29.399328173 +0100
++++ b/libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -87,8 +87,8 @@
  
  multirand.o: multirand.c
  	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
---- libraries/extos/extos.c.old	2013-04-05 23:19:52.028115226 +0200
-+++ libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
+--- a/libraries/extos/extos.c	2013-04-05 23:19:52.028115226 +0200
++++ b/libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
 @@ -12,6 +12,7 @@
  #include <fcntl.h>
  #include <poll.h>
@@ -97,8 +97,8 @@
  
  #define EXTOS_MAX_ERRLEN 80
  #define EXTOS_EXEC_MAX_ARGS 64
---- framework/accelerator/Makefile.old	2014-06-21 20:15:21.019918183 +0200
-+++ framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
+--- a/framework/accelerator/Makefile	2014-06-21 20:15:21.019918183 +0200
++++ b/framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
  
@@ -108,8 +108,8 @@
  
  clean::
  	rm -f webmcp_accelerator.so webmcp_accelerator.o
---- libraries/extos/Makefile.old	2014-06-21 20:18:25.594611956 +0200
-+++ libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
+--- a/libraries/extos/Makefile	2014-06-21 20:18:25.594611956 +0200
++++ b/libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
  
@@ -119,8 +119,8 @@
  
  clean::
  	rm -f extos.so extos.o
---- libraries/mondelefant/Makefile.old	2014-06-21 20:19:58.218962359 +0200
-+++ libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
+--- a/libraries/mondelefant/Makefile	2014-06-21 20:19:58.218962359 +0200
++++ b/libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
  
@@ -130,8 +130,8 @@
  
  test:: mondelefant_native.so mondelefant.lua
  	lua -l mondelefant
---- libraries/multirand/Makefile.old	2014-06-21 20:21:36.950197127 +0200
-+++ libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
+--- a/libraries/multirand/Makefile	2014-06-21 20:21:36.950197127 +0200
++++ b/libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
  
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
index 8442fcfc0a2f..a156ac3bbf96 100644
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="Web application framework written in Lua and C"
@@ -15,18 +15,16 @@ KEYWORDS="~amd64"
 SLOT=0
 IUSE=""
 
-RDEPEND="dev-lang/lua
-	dev-db/postgresql"
+RDEPEND="dev-lang/lua:=
+	dev-db/postgresql:="
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC)
+	emake CC=$(tc-getCC) LD=$(tc-getCC) MYLDFLAGS="${LDFLAGS}"
 	# Dereference symlinks
 	cd framework
 	mkdir lib.link
@@ -61,5 +59,6 @@ src_install() {
 		doins -r demo-app${subdir}
 	done
 	dodoc doc/*sample.conf libraries/mondelefant/example.lua
-	dohtml doc/autodoc.html
+	docinto html
+	dodoc doc/autodoc.html
 }
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b47d61dc50f5..c7d66770b505 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 779d1ca8b9d0..811d8826405d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,11 +13,6 @@ AUX chromium-83-gcc-permissive.patch 1165 BLAKE2B 21d88135f1dc1d92624c8e5214de20
 AUX chromium-83-gcc-serviceworker.patch 5784 BLAKE2B 04716147312146254b4507750e0f946032692ce12186eb710d9373ff24b80b07e8bfcf449fa4cff622c35946f07de44d7115297e3a42d9fd679e17db9b88d99d SHA512 8cc321621a2412859fe436340186a5de0a042d1bc2fa1d99e828222a14b3f4117bc2ec2a1af976d51b433347d3ff0a2d99caa785a6a6c49134ac16b9f350e6cd
 AUX chromium-83-gcc-template.patch 2655 BLAKE2B 6a0b3bab385073b164b7fba58e642388ac071317a2653dbd2187af21aec5b2bada48d6c77e7ce2bf0b4f8d72cb044cbdb8818de79bd1f41e5a761d1b13e01be9 SHA512 11990bff9502165b53eb992becaeab56af504eb07ef191a76f7d28245b1ba42d15fe3eaf2c58384f88b43848951d4c32236dbc70b0ccc4d770ecac9aff0415ec
 AUX chromium-83-icu67.patch 6873 BLAKE2B 03487ddcb27a73f682dd825a59ae38da6c9a96c9af6b9daed01f31ae3bd30e3113bcfe393a7ffc523fac83be71334845ee3bc0ddd7abecc5026b5bd30c3c2c3b SHA512 08fe78ba4957fc8f0e26dd1df9915805a768c11fd420f27311c3a13fbf1e6c7c1a0e69c0e85b2d093c406e36fe8c27c4df52354195b2fd2ea0eca27df583ce45
-AUX chromium-84-gcc-include.patch 5292 BLAKE2B 1e36493ece72d1a6da3f83608bacde53b914508b91c9ccdf880fa84ab556dd0e45256eaf65fc5d7ab8c2bf84eda942dde319df4f595a4eb7bcdedcb6ea2242e6 SHA512 30d95a2cebcf2944c57d392309eca4a5f31e4c0cd5fac33a6be7376312a0b395c2e6b834b886f264b71fd831195f4e50bc7fb3d147570ee84f45ba4dec88cabd
-AUX chromium-84-gcc-noexcept.patch 2639 BLAKE2B 607c85191810113fe4581d80633c4dd8d3a5c6af95b416af777b12c3aed2e37e5356cac4399ad20b652f303d6697146cdf59e72075db2e15cbe97fe2411b8c24 SHA512 675e3fea7cb81569b0b2d113ffe80dbde8e64334894305f5c52dad6b82d07b4cb6a028e9c0b4511ba1d58c3548fa44f4f004f35c91c2299350dc02415a2fda5e
-AUX chromium-84-gcc-template.patch 6766 BLAKE2B f2406e5d53abe82846d9600f2978f2aee00cc0428cafea7360d469498e3f334871f11b53d6bee0106a7b07f5f438afd42d750b90c82e83886d916a11797463b1 SHA512 868b307b0809335882de7cd877d24489b32d2967dba5dad13a3b9210ef0c4e17e456d0ebd5cb2bd3545cc995cc837691db23cca3856787153ebef8a715f24f7b
-AUX chromium-84-gcc-unique_ptr.patch 1289 BLAKE2B 8a7061d405c4fd4051c9043e538a7d5a2c4e2a7858364b0369f126b5e7a7fbf022048e39449a3c37b91397526db1a48ef067c524cbd5ac16cf1231645865ebf5 SHA512 7274326a335385045d987d84171bbb122e43e79b6a1923f24dad7f158d41fc01c98bee67070d79f6d1c20f19fc2bc82f2cdcefc0f5af7826de608ac71fc47fcf
-AUX chromium-84-template.patch 3339 BLAKE2B 4698ad031c8d6250eb82b8fe48110de133e268ea80f231388be69aa70111c5ba14b2b0ffaef4a9faa60aea5e40aad850b9a757714af01b53b93d189eb7a9c325 SHA512 d91d6416fde9f2ae064d65e3abe48ebdfc28da44343d6db925ed4a7e4b21b3eeb185a8c169894f16968ddc5dba9a3dbf67f5ac0e25805c40738bdc9deb970a4f
 AUX chromium-blink-style_format.patch 1043 BLAKE2B 9ad25d1bd0574535ac347b7eff9d03ecbb1727003ec303864aefa76aef33f031256ad44c826cbcbf2687967ceb438c46b183472cc579de3be97b4d0faf122750 SHA512 f09f118b950c2f37f6cb51b02568ea6fc7f3f030e51903eb69357b7723b48eefbf3cadd4dcb9d8b3872f0151a63f8992f164f2a3d55d54ec182a918fa325defb
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-compiler-r12.patch 5680 BLAKE2B e45848b2fff230c87d2f31cd5f6e9aa85bd4fe3f354323728292b145cd1ad9c914c8511f22aa43067f00d1ed4a10b05d4a2f5886c5b26a127c0f3f6ceddf9596 SHA512 7cde27589a708ccea35f2a9b8ebf9280822b8c505dad62cb8ecf1f360670eca4d953b4f2113695eef9f227ab1f368c57fffad489b4eecdeac668f4adf641a8b6
@@ -25,9 +20,10 @@ AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fb
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-83.0.4103.61.tar.xz 802558244 BLAKE2B d71ec15bea46438dccda49bb5d8ca0013e89e6876470aba077fbad70578a6f4d9ffb71150a9f0c676740be1cf3a7c681077e39ee9cf961b508b8a59167b4b949 SHA512 0fa179bdc61399c3e15e03ce1e720ca6487df603712689ffd4161ef1103c131b0baaedca3c7d706dfdcd2fa3328337cc4a807c0478a429f88358e512cfacbcba
-DIST chromium-84.0.4136.5.tar.xz 840308252 BLAKE2B 3f10ea5dbb48dd2a39cfb8d39289ad439d0257bea6e40ff130d427f96252890a6164a8dae3b5d30b7e74bcb87815055a6f27826add3ef5e9849e72c6a7dcc3b1 SHA512 9b6285ec2bb9790b8e1593473f8e1f2642a6fa851fb5645c282c48911dffabc2107aa99c90b6d6450eb8c0dc38daa089c514801921bc1ac782b25e34d9b8fd84
+DIST chromium-84-patchset-1.tar.xz 17652 BLAKE2B 17008a5d7b81fd9dd3934f815922a10c4b33bd4b3a13b350011d60627133f2179c2e70a6e74ef11ddf9b68b83b988fad3df15e9307f871006ccb7aca52c819da SHA512 2a45183c60794256b150bf67aa8395bab113e77b338775f737ebd8a822fd17be776b786ad12ffa759774a8876e0976a1c285ef90257e9532cfd9952baba7096d
+DIST chromium-84.0.4147.30.tar.xz 845012272 BLAKE2B 2f88b57f3411886fe69731de8dee0bfdec7877ccc69e64acb697c1c3fe391ceadef429a636be2fa9c17059c0cdbf5339692bbc542c6e82727ca4c3917e3e6679 SHA512 6188727638c64fb1e9cf1760b038ee196853b0460dce0a8d5ce9ed890a08c6da19c1619b847b1f9462fb97942909ac44404d78acfbb8a26ffce2ef3d7eca5dc6
 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.61.ebuild 25648 BLAKE2B 34859da4fa2688d3c41022a2806ef93f8b6e2210cd1dc005ef7909cc74e815b8061435f4ebcf6c557cfc361902c4d942a678d2b092d8f2c153f0c906be3d90be SHA512 6bc55b9021ac8239c1f654c12b32a97eb9633cb1c92fe75880aab5b86b79bb16261f257be8649af6e0dfab9979cef0b1575c2bb2c5299fd4c7e7092b4ecdfbeb
-EBUILD chromium-84.0.4136.5.ebuild 25846 BLAKE2B 80a15d416b5c58e533cd750f03c827aaf06662dee9a87f0ae685318ae7b32660f39b6767457c9b08868b690e21c23503836264743fba6dc3d249d15eb8ace205 SHA512 28f7db8e158d309a93251c0b0bd14d2ce695bf88d8f15e90da7bddfac0925e2f00f0038ef7f0a74ea72d1ff8b5ed3c88dd073eec0f43969c3815bd9c878feaa3
+EBUILD chromium-84.0.4147.30.ebuild 25255 BLAKE2B cb7717ceb16c481778945ab62668ed80339a91b4811f843f1b2f6f385ee19c6f0f57261e542b756264d6421f6374728effb03bb93dd680fcded000527a5577c0 SHA512 bcc8ecb32947543ce9d94a2c1d8afad6ce060d5f2c0cbcf369a664d45a993e3607c7458b07600a565a219a39ac007354d68abe712382e0357864bd79e41977d2
 MISC metadata.xml 1351 BLAKE2B fb5be12f788385e19aa41ab929c0c0f2744a61cc83b19ed973174cee564043a871f68fadb721ee91d688020aa1daba5fb2bca4535c53630bd88cc0ede527ef53 SHA512 ae812473401017ce399461a829e7182e6e28c56b01c1da926883bd3edf751fa804dc88f429c77a3f533647b2115c960a7bba21572735dcf3d039a6d87fabf51d
diff --git a/www-client/chromium/chromium-84.0.4136.5.ebuild b/www-client/chromium/chromium-84.0.4147.30.ebuild
similarity index 96%
rename from www-client/chromium/chromium-84.0.4136.5.ebuild
rename to www-client/chromium/chromium-84.0.4147.30.ebuild
index 58360a0999fa..7e7c4d23de9c 100644
--- a/www-client/chromium/chromium-84.0.4136.5.ebuild
+++ b/www-client/chromium/chromium-84.0.4147.30.ebuild
@@ -13,9 +13,12 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 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://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"
@@ -100,10 +103,6 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	closure-compile? ( virtual/jre )
-	!system-libvpx? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
 "
 
 : ${CHROMIUM_FORCE_CLANG=no}
@@ -116,10 +115,6 @@ 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:=
@@ -165,23 +160,6 @@ 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-template.patch"
-	"${FILESDIR}/chromium-83-gcc-serviceworker.patch"
-	"${FILESDIR}/chromium-83-gcc-10.patch"
-	"${FILESDIR}/chromium-84-gcc-noexcept.patch"
-	"${FILESDIR}/chromium-84-gcc-template.patch"
-	"${FILESDIR}/chromium-84-gcc-include.patch"
-	"${FILESDIR}/chromium-84-gcc-unique_ptr.patch"
-	"${FILESDIR}/chromium-84-template.patch"
-)
-
 pre_build_checks() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		local -x CPP="$(tc-getCXX) -E"
@@ -227,6 +205,8 @@ 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
@@ -267,7 +247,6 @@ src_prepare() {
 		third_party/angle/third_party/vulkan-loader
 		third_party/angle/third_party/vulkan-tools
 		third_party/angle/third_party/vulkan-validation-layers
-		third_party/angle/third_party/VulkanMemoryAllocator
 		third_party/apple_apsl
 		third_party/axe-core
 		third_party/blink
@@ -304,6 +283,7 @@ src_prepare() {
 		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
@@ -344,6 +324,7 @@ src_prepare() {
 		third_party/libxml/chromium
 		third_party/libyuv
 		third_party/llvm
+		third_party/lottie
 		third_party/lss
 		third_party/lzma_sdk
 		third_party/mako
@@ -575,7 +556,7 @@ src_configure() {
 	# 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"
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
 
 	# Disable forced lld, bug 641556
 	myconf_gn+=" use_lld=false"
diff --git a/www-client/chromium/files/chromium-84-gcc-include.patch b/www-client/chromium/files/chromium-84-gcc-include.patch
deleted file mode 100644
index 1c6d96cb9c4f..000000000000
--- a/www-client/chromium/files/chromium-84-gcc-include.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 60e856c553f4532c2035b087dbdbdde42dbb5f09 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 9 May 2020 11:33:04 +0000
-Subject: [PATCH] IWYU: memcpy is defined in cstring
-
----
- cc/base/list_container_helper.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cc/base/list_container_helper.cc b/cc/base/list_container_helper.cc
-index afd386e..7b594b4 100644
---- a/cc/base/list_container_helper.cc
-+++ b/cc/base/list_container_helper.cc
-@@ -7,6 +7,7 @@
- #include <stddef.h>
- 
- #include <algorithm>
-+#include <cstring>
- #include <vector>
- 
- #include "base/check_op.h"
--- 
-2.26.2
-
-From 5e20370e4bc1fd3beaa9af62fe27aaedb903bacf Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <ptworek@vewd.com>
-Date: Tue, 05 May 2020 06:06:35 +0000
-Subject: [PATCH] Add missing bitset include in web_touch_event.cc.
-
-The code uses std::bitset, but does not include header declaring it. It
-works when using bundled copy of libcxx, but fails when using system
-libstdc++ on Linux.
-
-Change-Id: I8a88078e110b27623b3cdea38c94012ba4050ee7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2179123
-Reviewed-by: Jeremy Roman <jbroman@chromium.org>
-Commit-Queue: Piotr Tworek <ptworek@vewd.com>
-Cr-Commit-Position: refs/heads/master@{#765415}
----
-
-diff --git a/third_party/blink/common/input/web_touch_event.cc b/third_party/blink/common/input/web_touch_event.cc
-index 7ef37fec..aa054f9 100644
---- a/third_party/blink/common/input/web_touch_event.cc
-+++ b/third_party/blink/common/input/web_touch_event.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <bitset>
-+
- #include "third_party/blink/public/common/input/web_touch_event.h"
- 
- namespace blink {
-
-From effd506ce070d58e731bd6086681b9cded8573ed Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 10 May 2020 07:24:38 +0000
-Subject: [PATCH] IWYU: add a bunch of missing cstring includes
-
----
- .../crashpad/snapshot/minidump/minidump_context_converter.cc    | 2 ++
- third_party/crashpad/crashpad/util/linux/ptrace_client.cc       | 1 +
- .../crashpad/crashpad/util/net/http_multipart_builder.cc        | 1 +
- third_party/crashpad/crashpad/util/net/http_transport_socket.cc | 2 ++
- third_party/crashpad/crashpad/util/process/process_memory.cc    | 1 +
- third_party/crashpad/crashpad/util/stream/log_output_stream.cc  | 1 +
- 6 files changed, 8 insertions(+)
-
-diff --git a/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc b/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc
-index 0c840deac..1d163b42f 100644
---- a/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc
-+++ b/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc
-@@ -14,6 +14,8 @@
- 
- #include "snapshot/minidump/minidump_context_converter.h"
- 
-+#include <cstring>
-+
- #include "base/stl_util.h"
- #include "minidump/minidump_context.h"
- 
-diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_client.cc b/third_party/crashpad/crashpad/util/linux/ptrace_client.cc
-index f097ad985..e91ce2eca 100644
---- a/third_party/crashpad/crashpad/util/linux/ptrace_client.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptrace_client.cc
-@@ -17,6 +17,7 @@
- #include <errno.h>
- #include <stdio.h>
- 
-+#include <cstring>
- #include <string>
- 
- #include "base/logging.h"
-diff --git a/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc b/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc
-index 267960b27..8ed7edc2f 100644
---- a/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc
-+++ b/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc
-@@ -16,6 +16,7 @@
- 
- #include <sys/types.h>
- 
-+#include <cstring>
- #include <utility>
- #include <vector>
- 
-diff --git a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
-index 4dd01b6e7..60cd60c17 100644
---- a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
-+++ b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
-@@ -19,6 +19,8 @@
- #include <poll.h>
- #include <sys/socket.h>
- 
-+#include <cstring>
-+
- #include "base/logging.h"
- #include "base/macros.h"
- #include "base/numerics/safe_conversions.h"
-diff --git a/third_party/crashpad/crashpad/util/process/process_memory.cc b/third_party/crashpad/crashpad/util/process/process_memory.cc
-index ab87b940f..e02bcea81 100644
---- a/third_party/crashpad/crashpad/util/process/process_memory.cc
-+++ b/third_party/crashpad/crashpad/util/process/process_memory.cc
-@@ -15,6 +15,7 @@
- #include "util/process/process_memory.h"
- 
- #include <algorithm>
-+#include <cstring>
- 
- #include "base/logging.h"
- #include "util/numeric/safe_assignment.h"
-diff --git a/third_party/crashpad/crashpad/util/stream/log_output_stream.cc b/third_party/crashpad/crashpad/util/stream/log_output_stream.cc
-index 03c0a5a02..45d823aa4 100644
---- a/third_party/crashpad/crashpad/util/stream/log_output_stream.cc
-+++ b/third_party/crashpad/crashpad/util/stream/log_output_stream.cc
-@@ -15,6 +15,7 @@
- #include "util/stream/log_output_stream.h"
- 
- #include <algorithm>
-+#include <cstring>
- 
- #include "base/logging.h"
- 
--- 
-2.26.2
-
diff --git a/www-client/chromium/files/chromium-84-gcc-noexcept.patch b/www-client/chromium/files/chromium-84-gcc-noexcept.patch
deleted file mode 100644
index e3918ca28f58..000000000000
--- a/www-client/chromium/files/chromium-84-gcc-noexcept.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/third_party/blink/public/platform/cross_variant_mojo_util.h b/third_party/blink/public/platform/cross_variant_mojo_util.h
-index dee0b95..0c83580 100644
---- a/third_party/blink/public/platform/cross_variant_mojo_util.h
-+++ b/third_party/blink/public/platform/cross_variant_mojo_util.h
-@@ -124,7 +124,7 @@ class CrossVariantMojoAssociatedReceiver {
-   ~CrossVariantMojoAssociatedReceiver() = default;
- 
-   CrossVariantMojoAssociatedReceiver(
--      CrossVariantMojoAssociatedReceiver&&) noexcept = default;
-+      CrossVariantMojoAssociatedReceiver&&) = default;
-   CrossVariantMojoAssociatedReceiver& operator=(
-       CrossVariantMojoAssociatedReceiver&&) noexcept = default;
- 
-@@ -155,7 +155,7 @@ class CrossVariantMojoAssociatedRemote {
-   ~CrossVariantMojoAssociatedRemote() = default;
- 
-   CrossVariantMojoAssociatedRemote(
--      CrossVariantMojoAssociatedRemote&&) noexcept = default;
-+      CrossVariantMojoAssociatedRemote&&) = default;
-   CrossVariantMojoAssociatedRemote& operator=(
-       CrossVariantMojoAssociatedRemote&&) noexcept = default;
- 
-diff --git a/base/containers/flat_map.h b/base/containers/flat_map.h
-index ed82c5d..1af6b40 100644
---- a/base/containers/flat_map.h
-+++ b/base/containers/flat_map.h
-@@ -202,7 +202,7 @@ class flat_map : public ::base::internal::flat_tree<
-   ~flat_map() = default;
- 
-   flat_map& operator=(const flat_map&) = default;
--  flat_map& operator=(flat_map&&) = default;
-+  flat_map& operator=(flat_map&&) noexcept = default;
-   // Takes the first if there are duplicates in the initializer list.
-   flat_map& operator=(std::initializer_list<value_type> ilist);
- 
-diff --git a/base/containers/flat_tree.h b/base/containers/flat_tree.h
-index 9412ff6..8ecc1fa 100644
---- a/base/containers/flat_tree.h
-+++ b/base/containers/flat_tree.h
-@@ -125,7 +125,7 @@ class flat_tree {
-   // Assume that move assignment invalidates iterators and references.
- 
-   flat_tree& operator=(const flat_tree&);
--  flat_tree& operator=(flat_tree&&);
-+  flat_tree& operator=(flat_tree&&) noexcept;
-   // Takes the first if there are duplicates in the initializer list.
-   flat_tree& operator=(std::initializer_list<value_type> ilist);
- 
-@@ -519,7 +519,7 @@ auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::operator=(
- 
- template <class Key, class Value, class GetKeyFromValue, class KeyCompare>
- auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::operator=(flat_tree &&)
--    -> flat_tree& = default;
-+    noexcept -> flat_tree& = default;
- 
- template <class Key, class Value, class GetKeyFromValue, class KeyCompare>
- auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::operator=(
diff --git a/www-client/chromium/files/chromium-84-gcc-template.patch b/www-client/chromium/files/chromium-84-gcc-template.patch
deleted file mode 100644
index 15875109d755..000000000000
--- a/www-client/chromium/files/chromium-84-gcc-template.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 2cd1ba11c364fc0f2f06c5fa3c15ff75ee860966 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 2 May 2020 16:42:38 +0000
-Subject: [PATCH] GCC: fix template specialization in WTF::VectorBuffer
-
-GCC complains that explicit specialization in non-namespace scope
-is happening for InitInlinedBuffer. However, specialization is
-not really necessary here with templates and can be moved
-into InitInlinedBuffer method without changing generated code.
----
- third_party/blink/renderer/platform/wtf/vector.h | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h
-index 81a4e7b..30ffa89 100644
---- a/third_party/blink/renderer/platform/wtf/vector.h
-+++ b/third_party/blink/renderer/platform/wtf/vector.h
-@@ -950,11 +950,10 @@ class VectorBuffer : protected VectorBufferBase<T, Allocator> {
-     return unsafe_reinterpret_cast_ptr<const T*>(inline_buffer_);
-   }
- 
--  template <bool = Allocator::kIsGarbageCollected>
--  void InitInlinedBuffer() {}
--  template <>
--  void InitInlinedBuffer<true>() {
--    memset(&inline_buffer_, 0, kInlineBufferSize);
-+  void InitInlinedBuffer() {
-+    if ( Allocator::kIsGarbageCollected ) {
-+      memset(&inline_buffer_, 0, kInlineBufferSize);
-+    }
-   }
- 
-   alignas(T) char inline_buffer_[kInlineBufferSize];
--- 
-2.26.2
-From 421aca221966c7d736c4bc5f268a730199f02fb9 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 9 May 2020 14:59:07 +0000
-Subject: [PATCH] GCC: fix template specialization in TraceInCollectionTrait
-
-GCC complains that explicit specialization in non-namespace scope
-is happening for TraceImpl. Move TraceImpl implementations into
-different nested classes and select implementation using
-std::conditional.
----
- .../heap_hash_table_backing.h                 | 80 ++++++++++---------
- 1 file changed, 41 insertions(+), 39 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/heap/collection_support/heap_hash_table_backing.h b/third_party/blink/renderer/platform/heap/collection_support/heap_hash_table_backing.h
-index a6c73f5..068ab8e 100644
---- a/third_party/blink/renderer/platform/heap/collection_support/heap_hash_table_backing.h
-+++ b/third_party/blink/renderer/platform/heap/collection_support/heap_hash_table_backing.h
-@@ -241,50 +241,52 @@ struct TraceInCollectionTrait<kNoWeakHandling,
- 
-   static void Trace(blink::Visitor* visitor,
-                     const KeyValuePair<Key, Value>& self) {
--    TraceImpl(visitor, self);
-+    TraceImpl::TraceImpl(visitor, self);
-   }
- 
-  private:
--  template <bool = EphemeronHelper::is_ephemeron>
--  static void TraceImpl(blink::Visitor* visitor,
--                        const KeyValuePair<Key, Value>& self);
--
--  // Strongification of ephemerons, i.e., Weak/Strong and Strong/Weak.
--  template <>
--  static void TraceImpl<true>(blink::Visitor* visitor,
--                              const KeyValuePair<Key, Value>& self) {
-+  struct TraceImplEphemerons {
-     // Strongification of ephemerons, i.e., Weak/Strong and Strong/Weak.
--    // The helper ensures that helper.key always refers to the weak part and
--    // helper.value always refers to the dependent part.
--    // We distinguish ephemeron from Weak/Weak and Strong/Strong to allow users
--    // to override visitation behavior. An example is creating a heap snapshot,
--    // where it is useful to annotate values as being kept alive from keys
--    // rather than the table.
--    EphemeronHelper helper(&self.key, &self.value);
--    // Strongify the weak part.
--    blink::TraceCollectionIfEnabled<
--        kNoWeakHandling, typename EphemeronHelper::KeyType,
--        typename EphemeronHelper::KeyTraits>::Trace(visitor, helper.key);
--    // Strongify the dependent part.
--    visitor->TraceEphemeron(
--        *helper.key, helper.value,
--        blink::TraceCollectionIfEnabled<
--            kNoWeakHandling, typename EphemeronHelper::ValueType,
--            typename EphemeronHelper::ValueTraits>::Trace);
--  }
-+    static void TraceImpl(blink::Visitor* visitor,
-+                          const KeyValuePair<Key, Value>& self) {
-+      // Strongification of ephemerons, i.e., Weak/Strong and Strong/Weak.
-+      // The helper ensures that helper.key always refers to the weak part and
-+      // helper.value always refers to the dependent part.
-+      // We distinguish ephemeron from Weak/Weak and Strong/Strong to allow users
-+      // to override visitation behavior. An example is creating a heap snapshot,
-+      // where it is useful to annotate values as being kept alive from keys
-+      // rather than the table.
-+      EphemeronHelper helper(&self.key, &self.value);
-+      // Strongify the weak part.
-+      blink::TraceCollectionIfEnabled<
-+          kNoWeakHandling, typename EphemeronHelper::KeyType,
-+          typename EphemeronHelper::KeyTraits>::Trace(visitor, helper.key);
-+      // Strongify the dependent part.
-+      visitor->TraceEphemeron(
-+          *helper.key, helper.value,
-+          blink::TraceCollectionIfEnabled<
-+              kNoWeakHandling, typename EphemeronHelper::ValueType,
-+              typename EphemeronHelper::ValueTraits>::Trace);
-+    }
-+  };
- 
--  template <>
--  static void TraceImpl<false>(blink::Visitor* visitor,
--                               const KeyValuePair<Key, Value>& self) {
--    // Strongification of non-ephemeron KVP, i.e., Strong/Strong or Weak/Weak.
--    // Order does not matter here.
--    blink::TraceCollectionIfEnabled<
--        kNoWeakHandling, Key, typename Traits::KeyTraits>::Trace(visitor,
--                                                                 &self.key);
--    blink::TraceCollectionIfEnabled<
--        kNoWeakHandling, Value,
--        typename Traits::ValueTraits>::Trace(visitor, &self.value);
--  }
-+  struct TraceImplDefault {
-+    static void TraceImpl(blink::Visitor* visitor,
-+                          const KeyValuePair<Key, Value>& self) {
-+      // Strongification of non-ephemeron KVP, i.e., Strong/Strong or Weak/Weak.
-+      // Order does not matter here.
-+      blink::TraceCollectionIfEnabled<
-+          kNoWeakHandling, Key, typename Traits::KeyTraits>::Trace(visitor,
-+                                                                   &self.key);
-+      blink::TraceCollectionIfEnabled<
-+          kNoWeakHandling, Value,
-+          typename Traits::ValueTraits>::Trace(visitor, &self.value);
-+    }
-+  };
-+
-+  using TraceImpl = typename std::conditional<EphemeronHelper::is_ephemeron,
-+                                              TraceImplEphemerons,
-+                                              TraceImplDefault>::type;
- };
- 
- template <typename Key, typename Value, typename Traits>
--- 
-2.26.2
diff --git a/www-client/chromium/files/chromium-84-gcc-unique_ptr.patch b/www-client/chromium/files/chromium-84-gcc-unique_ptr.patch
deleted file mode 100644
index 4fa443bb66ad..000000000000
--- a/www-client/chromium/files/chromium-84-gcc-unique_ptr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9b749dc5c7fdb0f4b1bd0df5901beb6af1b81ff1 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 9 May 2020 16:46:07 +0000
-Subject: [PATCH] GCC: fix DCHECK_EQ in NGInlineNode::SegmentScriptRuns
-
-data->segments is a std::unique_ptr, but underlying CheckOpValueStr
-has no overloaded function for std::unique_ptr.
-However, overloaded function with const void* exists and can be
-used with std::unique_ptr::get().
----
- .../blink/renderer/core/layout/ng/inline/ng_inline_node.cc      | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
-index 55ca9e3..ee691df 100644
---- a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
-+++ b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
-@@ -891,7 +891,7 @@ void NGInlineNode::SegmentText(NGInlineNodeData* data) {
- 
- // Segment NGInlineItem by script, Emoji, and orientation using RunSegmenter.
- void NGInlineNode::SegmentScriptRuns(NGInlineNodeData* data) {
--  DCHECK_EQ(data->segments, nullptr);
-+  DCHECK_EQ(data->segments.get(), nullptr);
- 
-   String& text_content = data->text_content;
-   if (text_content.IsEmpty()) {
--- 
-2.26.2
-
diff --git a/www-client/chromium/files/chromium-84-template.patch b/www-client/chromium/files/chromium-84-template.patch
deleted file mode 100644
index 73d277560b19..000000000000
--- a/www-client/chromium/files/chromium-84-template.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 7ea92bc4f0cbdf68bf8e04b18f560aece9666e9e Mon Sep 17 00:00:00 2001
-From: Hans Wennborg <hans@chromium.org>
-Date: Tue, 05 May 2020 18:23:40 +0000
-Subject: [PATCH] De-templatize ContentSettingsAgentImpl::GetContentSettingFromRules
-
-The template definition was not in the header, so callers from outside
-content_settings_agent_impl.cc could not instantiate the template,
-leading to link errors in some configs (see bug).
-
-Instead, provide overloads for the two types of URL parameter, and
-use a template internally (in the .cc file) as it was before
-crrev.com/759360.
-
-Bug: 1077605
-Change-Id: I5c6f1e60ab694d60f7c20ce77a435a1b03e32e08
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2181364
-Commit-Queue: Hans Wennborg <hans@chromium.org>
-Commit-Queue: Nico Weber <thakis@chromium.org>
-Reviewed-by: Clark DuVall <cduvall@chromium.org>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Reviewed-by: Balazs Engedy <engedy@chromium.org>
-Auto-Submit: Hans Wennborg <hans@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#765660}
----
-
-diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
-index ffb225a..4e24dc5 100644
---- a/components/content_settings/renderer/content_settings_agent_impl.cc
-+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
-@@ -169,7 +169,7 @@
- }
- 
- template <typename URL>
--ContentSetting ContentSettingsAgentImpl::GetContentSettingFromRules(
-+ContentSetting GetContentSettingFromRulesImpl(
-     const ContentSettingsForOneType& rules,
-     const WebFrame* frame,
-     const URL& secondary_url) {
-@@ -192,6 +192,20 @@
-   return CONTENT_SETTING_DEFAULT;
- }
- 
-+ContentSetting ContentSettingsAgentImpl::GetContentSettingFromRules(
-+    const ContentSettingsForOneType& rules,
-+    const WebFrame* frame,
-+    const GURL& secondary_url) {
-+  return GetContentSettingFromRulesImpl(rules, frame, secondary_url);
-+}
-+
-+ContentSetting ContentSettingsAgentImpl::GetContentSettingFromRules(
-+    const ContentSettingsForOneType& rules,
-+    const WebFrame* frame,
-+    const blink::WebURL& secondary_url) {
-+  return GetContentSettingFromRulesImpl(rules, frame, secondary_url);
-+}
-+
- void ContentSettingsAgentImpl::BindContentSettingsManager(
-     mojo::Remote<mojom::ContentSettingsManager>* manager) {
-   DCHECK(!*manager);
-diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h
-index b14acfe..2522fdb 100644
---- a/components/content_settings/renderer/content_settings_agent_impl.h
-+++ b/components/content_settings/renderer/content_settings_agent_impl.h
-@@ -116,11 +116,14 @@
- 
-   // Allow passing both WebURL and GURL here, so that we can early return
-   // without allocating a new backing string if only the default rule matches.
--  template <typename URL>
-   ContentSetting GetContentSettingFromRules(
-       const ContentSettingsForOneType& rules,
-       const blink::WebFrame* frame,
--      const URL& secondary_url);
-+      const GURL& secondary_url);
-+  ContentSetting GetContentSettingFromRules(
-+      const ContentSettingsForOneType& rules,
-+      const blink::WebFrame* frame,
-+      const blink::WebURL& secondary_url);
- 
-  protected:
-   // Allow this to be overridden by tests.
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index d813bde721a0..5a802b262ee6 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -3,6 +3,6 @@ DIST epiphany-3.30.5.tar.xz 4532136 BLAKE2B 7c42e7ff5624bd85c380da97b2ca057b59d4
 DIST epiphany-3.32.6.tar.xz 5469624 BLAKE2B 96e35001482c4062917d160d4b3e851ebf83850cc6d9d449e8c62c5d5c44d3fbab4ff0121c265ed363fa1e686d2ff9797a7dff8fe100a138aa72217fb8ba4183 SHA512 2d2fc57deb798c7666e2b7f9859318c1e9ae5477a79ccc3bb4f6de79edfc34c6096493306047ad2134a466da932e825d59881e896136ea7a0586fbd36177b0c4
 DIST epiphany-3.34.4.tar.xz 5295624 BLAKE2B c1867f62f1a0675466e2679d7f9e568abac6a4f3f56c498abfdc3d4ca4510696c4e9cbcab99a8be90bb50c77b04bcb86456a82dbefa76a2a7ec2c6b373ce9c39 SHA512 d9700196e0397032dd84d1fbf14d193f4212dd8dc054320267b4dfc8a59246de9c93fb786ba76463f0c09e7997b26efa17288cc06eddd0fb4aad2e4bdd4276ce
 EBUILD epiphany-3.30.5.ebuild 1746 BLAKE2B 10ba4cf44173e0ebc243336c2cf7f2f8db12451531a0c0dd515158051c81fa0282ace65caa6603eed5b6597c6df2fd817223d43f959e0b8fd34bbf9747fe79a2 SHA512 b39ec011ff3601219e54d98c3d19c97aac0f238d43b062c10eb9a153acd983b82998bbe0a675b07ef97c3fc74799b100e1182af30244deef77cbbe21df741c59
-EBUILD epiphany-3.32.6.ebuild 1906 BLAKE2B 9ddbd5697329e57a4ab53e495f8b9b3603ca701c894d7444f752925c94c03f8bb9daeee710420cad64b3ee9ac159803ba5cf2d91ea40505bec11410661a6b40f SHA512 937b159260428cc25b5e7ee1a43753be39b097bfaa2b462a591d918f37b2e789e0d02072399c83dbe7f0c479775172b4b972bc3c55e6a3ac6016d01d455f5cb2
-EBUILD epiphany-3.34.4.ebuild 1886 BLAKE2B 3aa76cbe79b7908a84865598f6ec907aafab071676ff2ca5d0e37dcbd1956d26fbb7710ef00900a219d4c7550e7cef2fdc826046807f0a085387d7470b76d6e6 SHA512 d7b495652d209af396bc9fa89cedab447a354bdb8a2b2b8da366c07a0fbd94cabf74c9ecdb17ab010985e0bdf032c24c8999c51b51fa9d62ef5160eb20d3d2f0
+EBUILD epiphany-3.32.6.ebuild 1911 BLAKE2B 67e047b56a26fb28b1ca16c2808babc8dc3996e6c5188cbe09c71d8a623a4f72293b41941c55e72e7e1704caefacca2e00655e493edebcc2f51268df7a0b04bb SHA512 31957dace3d807bc68ac10f28891713db4088cb3fa591f189eaca5f4b7193a182c78068663686b6715aa624247614a4f8e62157c4e474357c93911d3e4102055
+EBUILD epiphany-3.34.4.ebuild 1891 BLAKE2B 0478aaf5cc1c43213e4bc2e4a799a30d1af83ba5e19582383f836cc700de6e60c5f9eba571d8407933378400afb18b235f4118a2f7be591f82cb2dbcda365713 SHA512 3e2382261a8ad61cbff481d14f5cab3f05efb26ce080e66f867aa6e45f1d575e91de06d3dc1e91772bb04d641cb4f88d9ad8fe3109e9db99cfc1ee0b912d1886
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.32.6.ebuild b/www-client/epiphany/epiphany-3.32.6.ebuild
index bd29559513b8..8ddceca44c5d 100644
--- a/www-client/epiphany/epiphany-3.32.6.ebuild
+++ b/www-client/epiphany/epiphany-3.32.6.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/www-client/epiphany/epiphany-3.34.4.ebuild b/www-client/epiphany/epiphany-3.34.4.ebuild
index 25a5ae82ef2a..da74b629ae25 100644
--- a/www-client/epiphany/epiphany-3.34.4.ebuild
+++ b/www-client/epiphany/epiphany-3.34.4.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.61.2:2
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index e25e4df68da7..097e093ca48b 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -184,6 +184,97 @@ DIST firefox-68.8.0esr-vi.xpi 529131 BLAKE2B d74d7a0e94f7a7406d4ccd0f593e496720b
 DIST firefox-68.8.0esr-xh.xpi 470231 BLAKE2B 2d9e369ea3f2cdb788f772840e31a972f0b962100852a1f6c01cb22faf64754f156894e5b81555b42796d2846c7810d9ac3652861df9b12971310ff8acbdceef SHA512 b090d35be41d87420401537bbf5ab1d7186ce223a05848fe8fa76d1481e03c71ba9e499c6ccbd3af526806c7ae15482150825eac70933d0c14bb90dac38bb0b1
 DIST firefox-68.8.0esr-zh-CN.xpi 536431 BLAKE2B c5e4bfd0f2533d5d21aeed767180d36bb6affd379ef149b5106397829fed06856447924a8bbe13d404ec5df0575f7935488a1fe04123413d87732626681401fd SHA512 3fa69bcf5023e6ab038fb57ffe24dd7526e614450e58d19c6297043a6d2e12866876c23da355c2d0280e3f1009071b7c303d17c7e02c53b7435b4ea12d5c21be
 DIST firefox-68.8.0esr-zh-TW.xpi 535851 BLAKE2B cce1d8402cc8c61f734d6a20f25d33c6710947f5b5c26cc0c60919e5a82dbcf8eee0ad7dc34d092cb5a8c7cb631957ee7ab31aaf3601070fe14b0011b746824f SHA512 207208729b9ca9233523de9fffcd6bb45df795c21617783849b5d40251e84b33ad1cdb3a180053526363362634c4ec45f3cbaffb5123203114d88d090f4d0c9a
+DIST firefox-68.9.0esr-ach.xpi 471593 BLAKE2B 143f07e25eafd8670c8cb993aacbe4b0b0c78c76bf039a5a775ea8c127af278e79cc7a9c7d25ba442e7260ebf64ecab30046defec59174f9a0be6aa03a3fb82c SHA512 ded6298331fdb09dd56f8148e615cbcfdbd6f823ad9103c83f1857b09ea4db39d8370dfd7c9cf18f2295f015e6b7ab027ff8a58cafa80748e7eb426bbfe5417f
+DIST firefox-68.9.0esr-af.xpi 450300 BLAKE2B 5a1856da3dd8ea324efce77e7602d8dde825ee8d879ca2a8cbe041b19326fcc27317dd29313d8186b0328064969d7008825aeda40f305131cb52b52fba2ce9dd SHA512 d9811d5c447386a92c6a114bfe579c3b452b7ad07b4890bd7b68059581d7c8b270f45a2c9eff2df1186dbe55748bc78563a758f0f20b42b6453d5c331eef9ef1
+DIST firefox-68.9.0esr-an.xpi 482749 BLAKE2B 061a50a7b20ad99179048af2e5402fd932800b046c6708575a8d882420bd32393f1c5c16b0dbdeda100ae3a61c89e3a3fc59036c265200f1c4d6263f609000ac SHA512 fb97490519dfb891ae068f381ddfa2b2f606bec6552b6e756df220b4a0504b45b25c76a8e683b87ae2ff5c5963b8b88a61f976144c480dc540d682889c5948aa
+DIST firefox-68.9.0esr-ar.xpi 538828 BLAKE2B 01ba9ed40d7e6bfda15620e26355b56cd94c852021e30216b4648af836ee2f09c8fd77912eef28f6fbdbe4cb898d7aade0fcce628963dc9e798a4f19ac488bc2 SHA512 fd64264f036aa84b85bb9c1e00faa3c46e7b61f0b1ae0d47d09545d872d67fbee41fbe11e61e197d68250696b0a73b3565eb3b9e9e3912fb55853142cd547846
+DIST firefox-68.9.0esr-ast.xpi 480472 BLAKE2B 4b3614ac24277a27faec68b1f64a1c072ab574d3eabdfac9de1e52520fbbaee478c34659086aa5042b406a0009815182a1d427970e88d586d37eef025688d267 SHA512 739c1c65f4215c787a74feaecb04f77f84d0f45554a599637eef7338338bfc75c43db59a21d3c45c471947e1f5b226ecf28e9744e0bb211fd34e65142692336c
+DIST firefox-68.9.0esr-az.xpi 510014 BLAKE2B 1691491985a6da2060b444c98a212b06d69780556e70dd26618a40a6968292b2344770f0aa0bf3941868db1dd092f124a4112e329e1ea94d5bbc1195c5b3b415 SHA512 55e95ebf70ce87c7a8b01aa668d8223e42bb735618d4eac615fd99aad15b22f7d9534d9cf07c54f41c586c984d0ec7ed00c603c200dfd1658c69f5c4477f9515
+DIST firefox-68.9.0esr-be.xpi 581919 BLAKE2B 5c28f239437db235ba033f4bd80416a21fa8dfd53247b2d699f01886be0410439a51ffb576824481e8aa11adf8699f2ef6d43421751a8aeebf20295d5476f279 SHA512 c29bc9ea3ef33cf0fe8342cebd8acb84c83993a6b0ee9b181e524e6a492f618653795cc4a1d58eea4bce6f68bedd09f14dfe08b899c3b98b8ad7273de1113e3b
+DIST firefox-68.9.0esr-bg.xpi 545028 BLAKE2B 53100b4d9f9f8b2c6dd017fa44a997fd6b32369d8960a14736e08acc7a5e4958bdacb768273ad69f37ac5ece0a0cf82c455db37f0f47b32e14ab247c268cc4f5 SHA512 36347a54ab0a284d591d2d7f0ee274ce85416e18771facbce4dfdf32eb887aa7380192c201cf141b1ea9d2b21524be3cfe4686ecd1a66c0535497cbbce49a6ae
+DIST firefox-68.9.0esr-bn.xpi 566412 BLAKE2B 0a1cb0eaf9a128b9ae06e330cc234a8cf9f6dba390afc247f98654135d91c6daf502a16a0d653c08460b1417e007598d3ef73ff5001e52385aad81074ce5a4af SHA512 404f20db8de9c88c5a96a2fec44bed546c2211c91937b00058ec0585dbc2a73a24a092864b404aeeefc9fda072de9615232c302b60b837c127d3093e014d3f1c
+DIST firefox-68.9.0esr-br.xpi 501484 BLAKE2B 2e882a05479c38c876107139bf1f7a9701184966d6073f577ff8a583ef1aba5a3a4963c77f96b6ac5492c12080083eb6f2f0e7876119e02dc638cdbd7c90a93c SHA512 7b83a11416a6fe8ec2fcea59281f7099426ccffcf61f3da53a9ba357a82405b1c5f78ada7d8d35d8878c75a51ee36ba8dee8ed7567b9f2525d77c5daec92ce5f
+DIST firefox-68.9.0esr-bs.xpi 482785 BLAKE2B 3e1bbfb49ca35b4ac426d38c2b9c750b35fcf466cbf9e121f93da76c829579ffe0789be52e7595989705ad6710337014244aefbb34bce758c23d4159efa9fd6f SHA512 0ca9af2c6af96e4a4397e4a927bdc407cd9a5ed445d175e881376a81eebdced7579cea0c71c3e6248f0a36d7dcf75bbcaf5606c9d75297c7175b2b583bfef9ce
+DIST firefox-68.9.0esr-ca.xpi 499723 BLAKE2B 600630142473c6f4724143239997ce51bbb47df82036b2e0a95a12ef3c48ab5fd57cfa349a1a57fa61b4649f187191346433b0da88c08882ad0e6a3b970706d3 SHA512 2e4373c554b5a8a4c44d87cc98bd478d442889a244711df977f1c006df08981c32b7882f58a7247f291be7e66ea2b25a1710da8621aa1ec3d8f4ad42e3cf0961
+DIST firefox-68.9.0esr-cak.xpi 527172 BLAKE2B d486d901ee27861e3d2bc077559641514816f94684884c33613a6ebba2479bee6055b10ad75887de402cd9a885eb3182165c09a355375c5a775c069845a04384 SHA512 c35e30ec0852ad4a60b97195a4fe2dafd472000460e35bb3f16ee28f8b6f3d8a43653d44285e3fcb94e3e54da5cdad6bf69e117c5e191e43043d5405977cc8dd
+DIST firefox-68.9.0esr-cs.xpi 519714 BLAKE2B 402ec30c2a0557bc02b853a9a0ba35b2d43f9501056d50591d25b87bf0c8e034114b4c4452cf475e172cc6600e806c2aad0e61d8a87cc0526ffa7e4387f3821f SHA512 54aab973c39a38a0eb09451f2d42aaf306661f07a59bc944474b154cd16f26e8615dcd7df8b8f50d6bf573e50ce7cd0f44cdaf1fec1a93b0592e81207064ceb6
+DIST firefox-68.9.0esr-cy.xpi 506945 BLAKE2B 165ffba06bf5d9109f1278d2b77ea45c592a7b04d11cc0adebe8b27b4fab578f6ddc627daa80082143f47e454b89f7236ff9f0785428acabef8b089c970f98fb SHA512 aff19cea340ba2ebed3bfca4ec087aaae2fc5459aa84f695168b186dd3f3c6b847b745fb4d14497cf1262ae7507ab79d9b75b7f9ff13e5a327d1441bfee5c5da
+DIST firefox-68.9.0esr-da.xpi 520040 BLAKE2B 5b405daf12b7d2e70f1d864e53612b85501ee7fc61341cb053d073400cc0ee9821a25687a086e13283abb2871f1f66c731e271cace6e50e09584fbd68c1d8b0d SHA512 c345f04eeff9a36d7fff091806168376cd0feef7fccd8423bbccb689f83e9483106dbcecdd32e86d58c02f6cbb96cb3d43dee4a9bc7e91c01df215275d76dccb
+DIST firefox-68.9.0esr-de.xpi 523530 BLAKE2B ee31f02415bb0ba3bfa74bb52668b2881d5d3898bfb45166fdf1a8dfff4cca037c4f585c51a914d8dd962963c947f58377b5123a825df72837a73c8a1e5f57e5 SHA512 de681c92d3bae7d72acacabc3b8e639e17c590d3be2462ac7dd8eea762c070756fb14199224d80addb889e1532c090d748b3c7f5d7b36608b805f2e6f2ae4a7b
+DIST firefox-68.9.0esr-dsb.xpi 528446 BLAKE2B e76947887a815de22a6a8bcf3ce462817094e078206b63b39cb2e7b4a2be38575762701b268329750ab89407637980432aff5342b7df7059eac42d2f223a5148 SHA512 61b27b32a2befe764b4a32667ecbc22f6d2cb500f072329ca4d1b1de92b4734f7ab4815a5e33d70cd56d38c54c95ef6e43353b1165dfce4b7bc2ac084473833f
+DIST firefox-68.9.0esr-el.xpi 597172 BLAKE2B f706c500a321f1d5cf661ba16d9d40e5b387854b4d30f86a9e2a14fcb4f9b62c11c7be09b5164ad3bbae25e2274878cc1e6a0d142c899cd050bac1483716acf7 SHA512 120efbb753190074b11d71ccba57d0bb5fa3b1378c171c2695037962bea6e2a29a679983cf68ea28fb858dc8554918c93f816679aa9815adb58b7fcf372471df
+DIST firefox-68.9.0esr-en-CA.xpi 478272 BLAKE2B b581c590ec501db421c5ebe4cf5f6085efaa1e2ba618497cb47b862f46db2baebad10330f71c73f952633f9d63a49e90b69bf5c4d64825292325dcf2f591b968 SHA512 b5beef90d77386cc14cb14bf0c6dbd523164b4f5f7e4f59c8492b5533b0834e17ece32df980777a452780daf6a61b8190ce5f11a8ad020bdcf35ccdce8f78742
+DIST firefox-68.9.0esr-en-GB.xpi 478070 BLAKE2B 2c3d14b5a071fe7c68ec4a364458e30c859c1f44e567b25142724adc962606c2693ff5c9a3caaa6d34ce110e7d10e01873b64ced34a09c5fea5a7981c29ac72d SHA512 282c899a2a56d2025c08df37515f16d49866634f48c6fb68387c6ce6471e7689c54bf526fc49b6ef4bf9916528e5ad4e38f5669f090100f2fa9c1ebbec40c3d5
+DIST firefox-68.9.0esr-eo.xpi 503987 BLAKE2B 41b6c908a3aa5c727995eb266b6831cf823576ce1eb21ba8ba7731f459780eba6ad852480c0b773af8ccca71af6c7aee83ae21ac0e7812c3f36c69b3c54bcb47 SHA512 6e65c57e91712d277ec0349e2f152bcab23554ef5eb4aba6f307628652ffbcd1ba93082ba657c137c423c92d3fb7a222f28dfc376b908e9010db1c71111aaf13
+DIST firefox-68.9.0esr-es-AR.xpi 512292 BLAKE2B eae9cf2d63191535da7deb9169afea10d10feea57125199c9f7dde7aff9261f85d8835d8bda751337a5ea20829e1bbc6db03f0ba1be297193dd2cb5c8baab74e SHA512 22242e03ee8f6f7dd9da37b86c26142f5d7152b426bf6931f39f64704d40eadd0cb0a2aa31b4c0c38395eca671b54ea89a2f235da4458abdf315271561c5ad25
+DIST firefox-68.9.0esr-es-CL.xpi 511651 BLAKE2B a28303bf1600c699dc4fac76558500f59523135c03791deceb486264cc2f6df61ebfb9fa2da333d43230fe4ea4b57c87403864a586cfaa66bf670d6189b04f22 SHA512 d63e1a412607652e3f81faa6616594bf7f118f33972a650f12d157ccd1d9053df58e01db4ba4dd9589dc3bc04d417f57c9ba1fba334fa077bc206c7e7c79ec67
+DIST firefox-68.9.0esr-es-ES.xpi 481270 BLAKE2B 9d8bbf12445afb1bfd722a4ba06797dc0d434817c98db0da52078997387184e04cf84e4b2e54743e13207049ba7502764b5e9e33da4b9c659af2864fdc0b71e0 SHA512 b85e60b1be7264cc62b76060ee5c8d0590df8882e12ee7440d1791354c67ca3df02eb76e8f52d9a1b56de92aa236e62ed2d0c107915ad5c17ce5d467480bf590
+DIST firefox-68.9.0esr-es-MX.xpi 504489 BLAKE2B 4e6555a91cd628a6da3ef4b1b038c199cfe47a7786253055a4457efa04f891d74cdf680d3e8af3772f5a5d0995e5c3dc4296402980e0d963deca5505e83e8986 SHA512 40eda0697c367de406c26a3585de5c861759a3bf93ed67352f24d4f9eeb530e29d3477fa7b32bdf415dc1539787e0624684835e40c617205369b26c94c3d1663
+DIST firefox-68.9.0esr-et.xpi 488292 BLAKE2B f6855a71e5fac06f386551befae43f9e1fe9f5a01b17a85edca201ed618e6ebf5d9fc6909aceb05ea610704d36579eccbd1417ba9fd2be2ea81c306614a6d631 SHA512 0b0c59616bed3d1338244547b20abeacaf68d9de85656dd8988bab700e82846a9a9092685f5024d703edce9f4eddae5d76892159a4e184c41166c839c2f7eea9
+DIST firefox-68.9.0esr-eu.xpi 502329 BLAKE2B 2acb9f4a6e92e279e508cf4fa05ab7350f33a76f2f47dad224010fb47d5c7990ea893f0c16eb8216e9532a03fd5a2abc81be9541eafdcb2c9a1d24325111363f SHA512 d20934f3a4ea6e8ad102e714911dc5840dac8cfa64e4e021c16666dfcc041679f4ab50c1676cbf325e17cdce1d1efef7dfd70cc13c299752532a58a8c90c7938
+DIST firefox-68.9.0esr-fa.xpi 547567 BLAKE2B c099575e2a66a3b5c316e0a3fbeccaa053c05cf051ffd29eee5ddba659c62616387331d628667cc5f71d0789072384bb6d3722b88e715cf9e38892275ef08b1b SHA512 b458a668f8f7e4b314a7eb34910185530778696f262e530f5336c1b40a26b4dc74947e815a09ba50db843317b7b26a748356518f08e97c18a747848a06c5a20c
+DIST firefox-68.9.0esr-ff.xpi 483734 BLAKE2B 49b889917a21f3caf80ca37ce6c9e4ee653e04b26e9716363be9da3e26f241aae746f27eae2ec001192823f8ea8f380188e353919f227290e2d8b09d0deb2476 SHA512 54a9e30882611e1182f8cf5cd99a7f38e1feb2ee5dba585268b3a99586ab1c21b8ff4ddbcd8e6aae0ed001456d0510351b81a7f4cde074a224cdcda41a9d2253
+DIST firefox-68.9.0esr-fi.xpi 494105 BLAKE2B 3c5aaadb833b53bd142f4c17927e2ba009422b085a84082af5332e1b4a0a290df1a2f072553f2264773fd395c80337654ed4cde18eef56dfccabac4186be2a55 SHA512 ecc5d918caa81f09a7ae3c458b4e8696611cd8c96121685ffb2ee21871ca15acc228658f067a90a17db676a4fc8e6a0c0d69c445d195c9d44233e369120f5f9e
+DIST firefox-68.9.0esr-fr.xpi 522982 BLAKE2B 7294bef2dfb2d2d8a2c6e84b748dcb490c3e2b191e241068c91544c21dc06e755ecbae7030c92846ab14e9511d19d4cd72a54b7abca7a0cdbe6f1801f8f857f6 SHA512 2b28cb987fe49f1ae27b07dcc73214307ef171f4abe7af1c4fba01529c19745350196b4a00e26782221940f3f87fc9d332906b936c59289761def8822dc66f2d
+DIST firefox-68.9.0esr-fy-NL.xpi 510190 BLAKE2B f0f2e9596047e0b62842fc53c16a5b31a77633fc26ad02aa463eab9dec340dc36fac4436b1d6bba608a764c857727cb4cd4e895d2a0d90d083c29c7bc0e9dc84 SHA512 920473e39f86e60e4321aba83b8e255869912125da51f6a3add307123f3bd716a2d34f2e21ea33884aff9564a7024039ec534653259d1930e02d276f57669c59
+DIST firefox-68.9.0esr-ga-IE.xpi 489308 BLAKE2B a9d7eb80a97fe580d6dbc358c11d63bb5d197b436e37ae5b42f6c4602ba4512f3f58587afffbea274f50782b189718dbaac5216927ea2a1a1dfc18f7c6598388 SHA512 534e894e9a4a551713b2b49c33dcbff47df01be954528db6885683eca53e57bf8f1c0d539d87173c92e406725cc6298d6ff6ce4357104784dbf14a20913e012f
+DIST firefox-68.9.0esr-gd.xpi 506415 BLAKE2B c9e2c79e778dd713312a01a187165d55396fea3b95e43ca10ac4861cad63116b65a26944499fe5646855db113bc7d959a1599d13b789d8788870bfd2c5500dd1 SHA512 6c71f762072d1b4db063f95b6a2321e2911f7f87b84fe8c1207ff33196288b9af2da680ccbf0b83960fa24bc85ad97a75a84a2f39cf97bd4ef90fe4647c3af1f
+DIST firefox-68.9.0esr-gl.xpi 483660 BLAKE2B ced10cbf37d2acc15da4e31e7d19d7c994ff1af90941176fec98f6570fd24050d61f449a115258d7e8296b1ebc1a183cfa39bada7c481e30b31869a0efe86cd5 SHA512 0ae97c0186c068b351b189604fa2cd8ca3f67b2ee27e8234a6f4df71e71a9c144a0867ce0d23ba688f0c1e97f3866f96ad322d9d07d217a9e87aacda6c904dbe
+DIST firefox-68.9.0esr-gn.xpi 521840 BLAKE2B 16c507ce649da403be1d764928c31a3565efd4cf4fa9d3a4a991641dcbca1d4793809b4ee5c22ce2a1c91fe046faf4f3c70016fa5d091500e35b9ade03ad80c0 SHA512 8085432859e34c64adc9d7f3fcd8c7e870816f87830b2add69305656125603959e78f45e42a4b31c2b2baf2e194d2c2406582a00eabb16dbebc6cad1059e3fae
+DIST firefox-68.9.0esr-gu-IN.xpi 571578 BLAKE2B 10da7528fd5113dcd15aabe3b231536ff7f8a1ae1e959f6e31e01ce8b244a2bdcbc62b178ac524accc8dbb7bb128741f294ccdb952e42f0d242d971d00abe917 SHA512 9f4de3247b4c32d18c77fd28e92f86ce67defb2def6c5cfe1b9fea8ce45ae6aa9b3bdebbd1e2c46f9a742b38a4b41fdcdbac6670ef7df24776acfa20a79d27d1
+DIST firefox-68.9.0esr-he.xpi 513835 BLAKE2B 17aa9abd7832d06065912ad8c1f0dfdbd7f570889f0aa3828c4e8ea54081607548ae505f6dfbeca1e41df02a0f14dea523517208b1548fbcad4a88c5ad59ac99 SHA512 8339bc8ac5bfa1a62fce041c6c2f35debc6ded191a106f9a68911958660a69bb1c744face8201751aa293b494492cfa25e9f232516e21c0a5ff79f57b131b0b8
+DIST firefox-68.9.0esr-hi-IN.xpi 555187 BLAKE2B 6d7541769e091625ef905de501e71186795a8100fca6931198eb9f6e0e9ada2b0110402b0560d20ce77b02d93b8cecc98e1bf4ec96413c2e2529037520abd413 SHA512 6403f546427888688db51f7dfdba985930bac8fd75f333a6067d11fe2a0247b07dd0526b775317cdb2a74ebd7b60d026b72ebe859a1cc1f9984551ec29cd82a2
+DIST firefox-68.9.0esr-hr.xpi 491116 BLAKE2B 206d5d2b0049424c1a8db8ec4a6e9e96e731aef4f8c8fa648975e60f3670d059b9d2dada310e2132fca16d58a7cc4419b9cd549ebd4f8168ee799f197512b5e7 SHA512 105f1f5f723185572a6f6cb248b3f4930dc8846659d15da1d7a6a9268a78ddc1e4b7e3d202f08efc53429f5947be14d6c47f53eab800123aed36edeb469e3cfa
+DIST firefox-68.9.0esr-hsb.xpi 527747 BLAKE2B e5db03b09b86f08b599f9f44de2c1d7d8afc2687bad8c33cfebd8fc0d802e444168e6eeb519c808a6a043d4fb8c5a2bfcbcbbcc995521bc3169567ddfa6ca79c SHA512 4db3e1d5c9878301cd028245c230d084d26efbcfe74a9979e411c9c86a046137b6fb21826f2576e10b5088b07b65085f5329982f8068c320db514c5bc70e38e2
+DIST firefox-68.9.0esr-hu.xpi 526050 BLAKE2B 15c1ebfde4cb42246d114960035feb3da615d457060810c3a9f9a54522710d874238ed1c9f8097f414751042d8a9aa621925156644ef0a4150cb1a4741264d7f SHA512 1ab242399d70cbaa488d3547e107a0b8dd93df16fca92adf2ea53e5edb5ea03ad04da82bec9f43d057033bccfbf392573789cc5eba4b266d096dc0667fef353c
+DIST firefox-68.9.0esr-hy-AM.xpi 542289 BLAKE2B 8a66eca292ab8745ed08b4f229f42518908dfef515d107068fd85f40b19b8e559b16948f7e9b10787bfce62d272d3c61bc1a7f67036dc731a6ca5ff8491830ea SHA512 b1947d039e8725930eabc6d21313239d98c20605013c1314924040cb151c8b81e55274872f3b8e60279f3ea42d9ba52c32ac47492e15c578ccec767f2ff9b9e2
+DIST firefox-68.9.0esr-ia.xpi 496302 BLAKE2B a0a5f6f23c3d58a22a6025a40e0d80e16dc92c7f9cf10b3ef997c070eb6fc4dc82d942e636b33cfd5f16defdefab32f9a4445536ff8b4aa172722975d01f5d84 SHA512 b3b42948b88c60eee49c767267a9d5b95ae54b5d02c7d5cebefdb629acda40606ceaccad21a36266321a3326ae4fe014f2d9eea2177b6f87dcbfb0f45583fed2
+DIST firefox-68.9.0esr-id.xpi 491731 BLAKE2B aa3704e7fc5608075b7575d654feb31c1f6ae1c932801f87114a6618f64ec95a90458d1e132255520f4873fd68d319dcc6fbbe4c25140bf62da65703bcee0eaa SHA512 91d1e656ad8fa37313945cb4ac4397a7d5f521aecbe28095a2d1be0fcf5cc8b9c34b4a9780f4ee31024be3e4823d26cbdd34a230b6095bae3f30753c7ead7325
+DIST firefox-68.9.0esr-is.xpi 499778 BLAKE2B 4d4956f566d0ab61bb29f156064e785fd35da3bea68b7609d5200fe7b7c5833a67c83a87195714866f86ac10f9b8087fba30924c08e561e315d67f7a0ffca8c9 SHA512 867fe4e68f6352de1a7305385d953af4125be5f8e675cf94a19f94dcc181bcc52e03c66b7400056774f03f4128178b371ce39a03b6ade549ac14a4be9d93d12d
+DIST firefox-68.9.0esr-it.xpi 383623 BLAKE2B 22eaaf8ab8fbfc7b26e297f73f747f7f910ed9443186a35e977c900c7b341dd50837de6f2f5ba5be2f8a02c9e975b70e17480242b1768d761cace086203bbb99 SHA512 11d913ee12a52a88e96011a5426f68ef6fb97d260a02e18db0809761ec2484e1716dd14a85db705d62fac44ee3d5b51c1574099ee571e48f3e8b3478f2ef0ae5
+DIST firefox-68.9.0esr-ja.xpi 536928 BLAKE2B 2785d5999f51656fab86c0ebbe784e84d5702866299b8c0648bc762f7470a0d596ed386dc951b98bdbe7bf5f0fb1a53213d6210b933ceb008021d6a62d064590 SHA512 a8fcf4b458abc4ffa69c1a6c181b8ed1a97f8dbe372635c9935f97e9da08512fb562a7b54d71a0c94bce622066d9a6dea0fa4f6b4e7e43da85de1ed66406da07
+DIST firefox-68.9.0esr-ka.xpi 544467 BLAKE2B 1fed179dc7cc5fda31d99478c49aa2abec4d6814e2bb22c2b866560bb5463278a23b4eead45e4cad9e931b2c83b7ae79a98f2a54d89ff51ef5299bdeee64397e SHA512 ecf931ecc2c220eff31d69d04985cab1585d961633d22bbb4e6a6306143985614eeffccb66490b6f39cbf1059109a0c14b7aa508920a60cdbd04e6483967229b
+DIST firefox-68.9.0esr-kab.xpi 508425 BLAKE2B 5923a381f9ba79f0aca458faf61bdb9ef1483e7c4301759d9b113dccac9c0ebf20b3e1f3804922c3dd92648c91d279608bcb32bb25a09d3927aeaf1e44109241 SHA512 97ca3c8610ae394eb0be0ac03a5e0ea391eef240831023fe52f904efdff06672aeb10f5325b557b3fb23ef1dc6e0ef7af9b8370bb61de34cf9bd89326e3e92d0
+DIST firefox-68.9.0esr-kk.xpi 578761 BLAKE2B 0b3945a49e3971508706266d2c2123d0832c75e62155be252ea2069d628988d6259c50e2e116140e6cf4ea85ab503b28450c9048a97be9b0ba57823d03260340 SHA512 c322d69413f31300c09ab83e36d27fcf707a0228d38ca8994b38defca5b22b2a13df20fd44a486405d66b08756178468a6589adc76c92c3ab595959b924b6a30
+DIST firefox-68.9.0esr-km.xpi 551172 BLAKE2B aa731558559e53290dfa4ac0616a04f2f3beea67cc293bfe1bedb6d95d20bacc9c2033db7ec127cbe035ea4e30149f6fac2a95d2e36034f50040a6656ee5932a SHA512 e3b0e3d0d88d57d2fc36d1739422bc92e0f5e9355d4902939000f5d2be828a1aabac430d74f3521be58a30fe3dd28ce1613c7c4b7ded7e1aeda787233a011b80
+DIST firefox-68.9.0esr-kn.xpi 547371 BLAKE2B 4f039ec853ac98b08a96a38f31ce78f55398153ad6c9d78c3dddd24432f253e873d8f20f4cae67d8750b7c713dfa9fbeb73dad835f74c8c9eced6f8972f20b4f SHA512 78a5a799e047c1b2d8a25fa87846eae9e36675663b7de816dbe76e85e920665bdfe530a162e145a6542cebe61b865f766842e63ed7b8d3ef90ed0189679096a3
+DIST firefox-68.9.0esr-ko.xpi 535780 BLAKE2B e1014c9f34c807e478ba6817b752ca6c5cff1d6014949aa9dd2021d53e28b376b7fc9c5e7febc7c79328084f7f3bce7fc47129e6ffa7de59fa375dfc8a8a09ce SHA512 6f29ca15eba8d665bdbe6aec4a5dc9d54c4c5db3a83ab2f367507d91f056e119b30316a559e29b9ac592206b759335f64e4b520587979f8825efd0322c23a1ef
+DIST firefox-68.9.0esr-lij.xpi 481738 BLAKE2B 443d1678fcae2dda62a9448ca9f1d3d19ebe093920434cd8c6df73a9e99bf9c5fa929d1d0886bf26ecaea13401a936549e7711f5147b8a898b5dc68448ba9723 SHA512 d7afe291863680d433f0d6f0ea53a55474130a9ae7ee65d3c8b2b732de8121bdde648e82f61e3cb5a2e8deb1c8bccc7c8e5df7105d420c22ebd6aedaf5f947c3
+DIST firefox-68.9.0esr-lt.xpi 527443 BLAKE2B 81ea7b05406ed941e1c8ca80c60254ef7613b39c7f16392b9b4b462f3ccc815b94fba6a7c077a54abe6e374ff5c5923357cbf9b49d756b9e27f1d3a61d6ba44a SHA512 07c7e02d9470f8ed9a860490faa295767379e1b4bfdd3fd7ce8b1edbe87e538f581f37074c8426cb1956133ddaf8ff63e0c0170d576cf90e4cee4eabad2c1f70
+DIST firefox-68.9.0esr-lv.xpi 500107 BLAKE2B 78d6d24ae3a5fa189e65471c97c31e809e5ee3d965d8a921b151e8904a684d95043bcc7581273dd84df5d45df6a04d3e1e40dfa070659640a5f235ce985000eb SHA512 e47248137713b4a1a9f8a2047c1684a94f199ca6acb72e8ced8d516e7766a20db58a4c37c5b119b9ee6cd91b29403c04b1049b5b2500159de36f0c82c49b40f6
+DIST firefox-68.9.0esr-mk.xpi 484991 BLAKE2B 69439ddcc62ed8bfe4742e8fa5deb663f5983fc5e4dfe5b95326d3b4ccbf801d156467ae7ce29e3a55acc865b2b8bbb5a0485fd625282d4fdf31003da163f979 SHA512 b22b1521731316171ae950e55c9ca93a6175963740e9dc977a2f477c7a1c1cfe9e0066b5f176a567548d68aaa26da51f998aee85ecf3c771b34417376858bbd4
+DIST firefox-68.9.0esr-mr.xpi 558964 BLAKE2B ceaa0474e763e6191961330a527cdeb42d630319d73afda3f74b25af84b2170566b21dc09509789df0fea24a240cb65877005ef887a23262b9909ff3d10073cc SHA512 b7d63a95739a97b065303a18e26cb2f664f8df70ec5cd800a3488e863b56b1821b1370bf32b2a8baba60937347de3a12cec1d7a8c5d99890f1cd58652d08fdcc
+DIST firefox-68.9.0esr-ms.xpi 480108 BLAKE2B 8dfc46607f3d606ac26166496af5ae2cd586760e8c31da4f4a1e4c41a5f66f05e8785a381fe7b2b346a410f5e8a7018ea01080795f6aea82292a25fb455c84ce SHA512 16a9823b56b1f7ad803b671594854ff55e85983b39f513b687bbe519339ce31438ae0ff4e7d39cdc7c8fcf9378b3106a529bffb490d3d2add41606eae83cf8c0
+DIST firefox-68.9.0esr-my.xpi 551919 BLAKE2B ce53432d3a78da6ad0d54b17f493d46f38d888dd6882da563359c6576746f84bc30279ca0f83a04a0e5e4b6c8d6837ba9a2dd09fc5128c555565988e6fa53ecd SHA512 8934b3eb67b0a980b7991f269ff1cf8f0651b77a48549cd11517f165a6a5f7cce6e42e84ca04b879f393f6497ddea87b0d40b9d3abd77da7be3387f7e66205b1
+DIST firefox-68.9.0esr-nb-NO.xpi 495876 BLAKE2B a249c0c9a085923296bfb6e2530b69087262be57aeee84c547ed902a7b6b33bea03175905513ba501d71f30f3603f85ba72bfb7f9f03435ce96ad1f15d61c66a SHA512 12381a5432d2b953af33d72c83fb37c67b12f278cdb1f996f824c2a8f9db3188efcabd9070cd41a9a91787cd0bbd8daa48aa81138dee514ea40e64f97e94c475
+DIST firefox-68.9.0esr-nl.xpi 491976 BLAKE2B 7faa4cb1fa5ac0c4fc594ea81b2d4ccc61454e6a42c6adfaaaef8d4d1c357306e78eb015e1b1e970c56dbd14097d39e43ae27e3553978f91c1479946a1899654 SHA512 1efb3c390371c031dc367c1ff71d370ee8462e06aaaba77906b38f7fa92140cf5404afc42e1adc58b6646b0b71906432e1a9bf26fd855b995df0653348338c26
+DIST firefox-68.9.0esr-nn-NO.xpi 494527 BLAKE2B e709f6c59f3c15d7b886d721c2ed3b028b14d1e7cf0eb5b321a4a672cd6c20fb857c5abfab6c7207f2bdc5bea875d4f9339b03fb4b19882d40e03f3fdfac448d SHA512 5c0dd5dc7eb8f66b5f0d642a8cfd03c003fafea0d77b2dfbed6116109611362cb5381dac1cbd889eb41ff9da4e083b500541e2066b8ec525ba5d9f0d84083fe2
+DIST firefox-68.9.0esr-oc.xpi 498526 BLAKE2B 327b200d6fff6ec8ce138d30f94cfa256684d097389a2bbf073e1d535f9ebedc7f161d10c9ca34b554e11ab46ebd4fd6193fe876c71b2d62e93371c569a1f125 SHA512 ddcf6eaf5be37e0649c76a002704657f793fa06478bb91c03d2c278a5b47d71cf76c4b45da630c7a29826eb13f2d348aa7a3c3a62a42d0b1e4f1106bc7d875ab
+DIST firefox-68.9.0esr-pa-IN.xpi 542374 BLAKE2B 480620568c5ede4709bde103839c0da9e9f0996ece515a6921c376da7b9b25d7269895408ae27ae00ad666b4ad6c2502daece1a68f44ed5600eae8e39a1b82d8 SHA512 0b9f6914ab9005fd239444507c2b3b51c053d770a4b66debf10420904fcad3486ccf0b24ff02eb7837f619262364850bcc0345e98bc70fca3e64d16595a9a900
+DIST firefox-68.9.0esr-pl.xpi 495645 BLAKE2B df61f75cd447930e6d48858e5209641977c03bc8ea2d9247015b9648ce30eb3c6cf7a071f4d72d6f96c6f3f9b9940adb95ea966995f487e5e32004065f7065da SHA512 d4bdfc7bc56be7095e5aa05e1ae662de509f1dde11808ddcc1df977062202c6f6e9f14c40cfb07000e92de5565976e04b70267067f055657ea27c8441c103462
+DIST firefox-68.9.0esr-pt-BR.xpi 497965 BLAKE2B e2655d9ad8cc884938fec46af7d9ce9e21ad0f68db6db774f9aa0ca88b42f20b75135c9067084de90cff87a88bcb3327c1b1bd945531fd2ce2cfa44a29deb2bd SHA512 bb842d43c528287b43bb4fd6d7dbee1583e4523839574acf811ac7aea084fec6e667b871a77ba37485cdab62f0a912feb62a2714813345322e33956799193698
+DIST firefox-68.9.0esr-pt-PT.xpi 507635 BLAKE2B 32502a132e7cb000cc954285dcd7397cf9dd057e8bb65c4994a31f7f5def7c529c4ca472a23c9d3b691f56f4cd3fdf6492aabc0963e1de863f7f4dc0808a0d0a SHA512 c7cb9ee6c067d0ab0bc3566d72b3ddd8980f493151b33758a2224485f9d7eaac003d3c2be4d9983e60f07b58b9b02834df2d31b96556fed7d5f9ee422dee1cef
+DIST firefox-68.9.0esr-rm.xpi 495310 BLAKE2B 0a13bac2fc2b0f11bf16fecbb2578c62704e67cc45f5ffe280660e1525197a12d3bfc6f172745c07ebcc4d64ba8de2f0b9d86e3edea4e1017730b1b0a6800a5c SHA512 13184b2e865dade5a0be2f85890fe4b56364c115e84a2ef17d0faec226653c61536d1b6cc49391add66e50b5b827834826daf717110529b1a66a2e675bb7c4cc
+DIST firefox-68.9.0esr-ro.xpi 508609 BLAKE2B f02719978237dcb1cd30a9500584b2bdf2a738378aa926658e6f0fe69b2a48b2d677d7544d51f94fba9914eba125169187436c9de70353d55dc5b5dd4299f930 SHA512 71dde7af2e3ab96120c48685b030642fd453bffccd5695794fa5ce8802e6ad910ae59f72c3329e280ea5fe6b2acea61dd0a96dcf7a3cf46d23a0fdd522e4b652
+DIST firefox-68.9.0esr-ru.xpi 583731 BLAKE2B 5ba0c22151253ed5b30220ee28544c85aa8f462717171aa4c2338d9e83e1c4b913158fa0b485d54420f5e1ea5f300b5f9aafb5e5f8536540b13e9468db945ae1 SHA512 4e2511bbc9cf99c2ee0e10f4520d0a956a200d69b9333bd43519ff20c4e442a56bece90ae1bc13ecec2dacb49eccdb483d3e5698aca2a7dd168f1b486bef89f7
+DIST firefox-68.9.0esr-si.xpi 527968 BLAKE2B cac1d6cec3941051115068888df91528c0fe2a27a0e0c48e32d17ed0d405f89aca1f7ff9376fa9cc74a8716c7cbba308328a9514eaf2f1631b746c3ba830d30a SHA512 05dbc700dabfb4bc29911e11dd15dc1a43d27c3726d662d754dffb885e10f612b054ca6ab8eacd1eb77b1f2245de414bd9a5e79177fe2b7bcf51a510baa3767d
+DIST firefox-68.9.0esr-sk.xpi 525093 BLAKE2B 5cd3e26d3ba3de398d43f0ab9e26b9b77873f1629951a2cbc74b9b889a1e53d12f8ddbb76ed24feb3b9e32f543dd07ca5ebb97d02736fdf1eac5fe96921c9783 SHA512 0ad3d790e48b6e3da31edb54e727c420218b1db342e7172b3ff60422751e6fd85c89e3a036bb8180af5893f0504df4fca13b3c732ba408bbe1fadac422c30ca4
+DIST firefox-68.9.0esr-sl.xpi 502148 BLAKE2B 5cf6b41f76a94722ef3d34feeeffaf7acc2ed785e713a32bd0203141637d18340ecf6d2c8aaabfb96e85f54ce011f22480d257e58625fa542c3fd5cfdfe25f5d SHA512 1818e558b6c70e3affd09530149776b0d0d338826abc1e5be179b2d75085eaaba7b30fd4f63e60fb091d6fe6daa1925eb9e06c043c0df2f62a759bbbecbad5ad
+DIST firefox-68.9.0esr-son.xpi 458714 BLAKE2B cffafd90531a4bad2da6c536338e2949bedf5319eb5d0f430d717aa5e7f7614df244a393a6887bdb5333c31a02f8fd62895eb98f486900a52d4e077c5aaa0704 SHA512 744190139709c7a4deda62618eb97a692666618a443a8e898eb0c5a1cef872365785cf90d2590d2881c5d278a84c989a359bf95dc108e749e842c5bfb43edcee
+DIST firefox-68.9.0esr-sq.xpi 521478 BLAKE2B 4a0e28a1ad24a0ad5ae66a303e986e896203d7e518190c9a69e1d29ba1bd5a887ac0f0801252c75ad7f1a1473a17d9d46cd6c7a2e44cf74696db7008a2f350eb SHA512 7184498e3108c858108322dab9c610e5f616ebc59403ba35514fb16d1a571ec7597cafa699e36b488033a04f894f41e8b2c39531306a6d35388fa80b2db0d82b
+DIST firefox-68.9.0esr-sr.xpi 527354 BLAKE2B c08c62d9f9c15903eb9c02d7014723bf695dba34ddd791a46729c1e71bd8e2ff7f216e738ac6634a7c0c6203e777e99f8279c68216c3044e5b1ab76cb80a23b1 SHA512 a15a117deef62f3e5cc167b84326b6282de82f1becf892b654b044f185004a295fa259802170e116db3d389d9051f73b65abec665f894d2f4c56237c3849c156
+DIST firefox-68.9.0esr-sv-SE.xpi 506628 BLAKE2B 61108197f76818c89c74b04ad149440277e89a1462ebb5d65a9be323bce69d903032406e40bff617cb7947b15348c2116cc31bbe9daee864a0a3c769641432c0 SHA512 6441fcd2d8e882b4d0fd0662f3676dec1261385dfc22a2b8e0060ef73979707958ba8ca7361462bba3c6fc15b1189a56d7273c99fbfc85588677d9721dc3daec
+DIST firefox-68.9.0esr-ta.xpi 548954 BLAKE2B d0a68f3554ace83f1c17cb9ae0b318b624b4309310d06019ee94de3c8ae48bb2041dc91ca9eeca19f9b87d8fddf65ec83ee6fac6ae72c1013f2d12091849df36 SHA512 40558b1fd46d704722ea499e679fa99599ed9edfd294e4f41ddd531b88371835aa1db2e51c3feb25d52c0b2763f84b251cdb75826eb1b2810b3ab71640a651ff
+DIST firefox-68.9.0esr-te.xpi 561505 BLAKE2B 905dad08fe14a8a20ecc62f609554bee9d5b5f1219b5efd04314c1377da960863cc5d633ed1a2e843fdff9af1bea8f4d631475e8879ebc1b36d0558b1148e6b7 SHA512 58e1bc8737f1ba625d9589868f03b4f110c57433de6df88a68b7e6da01a80a6e9795ed629422ad5d3d3e5298f9a81896d4b9cd56b5c6f4823eb370f4064ffe48
+DIST firefox-68.9.0esr-th.xpi 550754 BLAKE2B 1244296452f9c965b62c6f3a08c791c6ccc20007be1393031a9393ec4e498e9a9c0dd9716cd671f82b5bc7e71f5c395cc129cafe2e924e4ffb148bf12002e744 SHA512 3ea6b678673c66097c592cfd215262881349d51ef918faa3f2f1f8098e64d74559547b7e696e1fdfdb5c30d5bb4a9f7c47b2238e795ea020b8d445fae88838e9
+DIST firefox-68.9.0esr-tr.xpi 515126 BLAKE2B 51396158fcf791df79d19995bee08b77e084ce962374e72ee4c3bdd5c98b5b9c23e8ec9275530948d555482666460b7b3ba96ceb3e6b96d6cb2c2cf42e0484f6 SHA512 232bc246627cb4aae36939ae06dcf060774102c5d02d6f3545da3560f3be39b7bc66ad90ebfc82192423b6e20257c337893f6de3b4f845fd7a4b24e7f5626845
+DIST firefox-68.9.0esr-uk.xpi 568872 BLAKE2B d416a83e2f506eabdcefe0f5467b6a154eecac35f73563b66dc9b327a598760c33386df4fde4a6e638a573bd066cefa0f83a3debf28f577bdd0e2d1bded38600 SHA512 83f24f18f5dd45f9c58602d2ad1be32fd2dcc57a873e7ba4ee3c601e4059594926b32d25323f40204ac947dc0ae985083bf197fe4620054bf8f430cdc07ad83b
+DIST firefox-68.9.0esr-ur.xpi 542336 BLAKE2B 49126464ab5c8ba65625e55c55703c5a2664140859f59120860dd12a117d35ed2c4250600e6a636a18f8c401c0a201cee48e3c8e29ca5b7c18d396eaae003f31 SHA512 fbce6b86ebafc3f2e43a75ba6a5c2d7a3c5967a4bdbb8628ae7327766d8844e95173ca839ee1f9630e22a73bf3d132f62609435157f6611737ef197df8a35251
+DIST firefox-68.9.0esr-uz.xpi 482282 BLAKE2B 5444e8f2a9eb0d8312195bdaa6922b900f2ee340bb907ecaf457275744423b2f01c8b20615a4f259da4f474888a289b05c22c1094dbb7ac41955e8bf1b774e3d SHA512 30c086d8f6d8223dd62af45380c126b10cd3fb06ad448aa2b8594090a4b936ae89eb3030e24b02983a5d2e8ec5fb5fcb417b3705b7b4981194d2364f0eb42a4f
+DIST firefox-68.9.0esr-vi.xpi 529128 BLAKE2B a639e5dfa743439a7935c6e15cd08135dd2e0e570a3ec4376e6fbef9ffc21f4db530292e1a2a1c8c53e8502ec4c0c4ffba684f18604ee9028dc302b7cbe2b183 SHA512 f6224b711a04f37c7a10e915a1eaedfae9a1c0d90fbd8ffe0015d41c532b24504d4acacb1d3a72f8c262df11b36c59a407fe0002ddfa1d7483125d2e096e573b
+DIST firefox-68.9.0esr-xh.xpi 470235 BLAKE2B 6c1c93fa7eabc74e1f2b72171f22f02e61fef341a2cb92d4f87cef85aae7111bf77ba959b95e70272bb9d93ecfa60a9b46e41401a6858ab92b724f7400ac3eae SHA512 1d1f2430e3b4e6a138017041311c9138ab672cdbb8d5023c2a561671bc711ab71effe3d7d3b0b2dd33a428355abab11a519d372a5efd5accf52669c2ade08492
+DIST firefox-68.9.0esr-zh-CN.xpi 536442 BLAKE2B 01203bdacbe3486d21a272f6421c520c338674b4e334839bfd4d31c8945d5d9f976643eb22f9972eeba3663217a66c755644490948a2450940846e08b80162f4 SHA512 80f0328780e9318bfe4d9e73692ad91644343d6f713e4a2bb8e176bb365e14046cf891db03686f6004ab39da68d7b2fd01739aecbefcb1fd26a5fbc129583623
+DIST firefox-68.9.0esr-zh-TW.xpi 535859 BLAKE2B c6090a11752131689a4d8d81d9d5ac32c2af89985d763ec3c124aa0817b5e165234e1af019e3c84f452679a6358591dd3657418ad1c186607ef02ed51ed780d6 SHA512 1aec08e7c4d1a8d49163966ce916f2d7f5a714b66890a6a1d8d349c594d98f65ce863a739736c9d50964cfcd656a24fcfd6c4da20756be9dead62bee1f2c90d2
 DIST firefox-76.0-ach.xpi 508335 BLAKE2B dc951b6da4382a2778fc01fd90fa610a71626ddbd89b6c42abd37eeda35d9ef5611b1c0f7277fb10d3f4f80b7a8370a72262c508c3f71dec87a457c087239070 SHA512 9a543b888ac026c5d5a201a595897d6ff4b2ff29107b6eb87be9d0d07830d3c83b6ca45505729497cd23f7d094f9f5c10779bb1f301ef35859a23f18516f828f
 DIST firefox-76.0-af.xpi 462166 BLAKE2B b1ecddbc083f2845f8ae0f8b198b17f19f3fda8f196acb6dd7aa36a4ad92938a4dd63de6073c93fff62b2fa80bf11e6dbeb3437496ddc16428a079194fc1640e SHA512 9b91278c854cbe4c65e5bc6080e7942c0ebbfc984d0a6fbe191aee83311e29f60786649049d108f179db72925d7d6d0e219333face0b622325cea746ff834cdb
 DIST firefox-76.0-an.xpi 520893 BLAKE2B 5c967ae1d907ad721c702f387c4d4d5647502f6b656e14a4b5144813f1aaa78209fd08e27f14b550a0d0f51c459de85e1627e89c5d2ad74834a51f9a75788889 SHA512 4c4e43fc4f3bd04af90a3b0817c5734d5da5db3826174602df56e55169ec497f17b6c57f533f71f85a9d45f9a2561a85255fcea126cf62bae723d43dd99fad69
@@ -366,16 +457,113 @@ DIST firefox-76.0.1-vi.xpi 588340 BLAKE2B 4bc61cfa8c2e0a6bac591c098215a990b7e08c
 DIST firefox-76.0.1-xh.xpi 483087 BLAKE2B abdfcb0893fc8b07d53df7767819c05f5f5409d1169f378ddfa30f5959ac706cad807e814ed18f33a950dc17eb138b1dc3d2ce8e00dc7b5f1d4805bc4eb3967b SHA512 d3ca2d970e68a81b04c104330afa184fcfeac9396d270a7a451b618c7c3d68aefc133ca9ffa4b3a11ccc742db4df1fd7b9a838f3c9e1233e8ed2e796f2a66145
 DIST firefox-76.0.1-zh-CN.xpi 595481 BLAKE2B 593d929e6af40f814cbea9b6799dcfa5347e95efc1654920229c386f1f90da8258b644ac8b1f4865339b80c9dae64ec989aae0d14f50273052428536c16f50ac SHA512 99b85bf8db9ed12b2c2f4d3394b1e384d4f8edbf88dfd77d4993f20d7a9f7c802274e5be3d53f07fe21b725cede717196b719cb004aa5816dbcfabf2e76161f1
 DIST firefox-76.0.1-zh-TW.xpi 593884 BLAKE2B 7077379bac353dae92b962e9dd209d80670b7eff466a3fa98bc171e8e679c96f1f6bd96eb33bc28761ea062dd915aa783bf48a026574a771e1dace93e32125b9 SHA512 dd93fd2960bbd724f3a2dde4a38491a5571c3051adc933088c18db2fe1e53e9b3ba88b40d391d3843ed44b957066447ef06a964610f97dad6f903547f9bb4ede
+DIST firefox-77.0.1-ach.xpi 494093 BLAKE2B 780cc3ea7ca743058e1f1105c0fd2c8ad4ad5a78075bc3e7813864face18f1620126c9b059d1723f240654b5bc974d4b53669f58f79f5cce2e52377436117228 SHA512 2e3da0476e6c70540d18ab94c27860d72906081ca38858dc07f033150a9ce67894aa8449b1a2757e4a566ca690dcda17726728e69d37f51deed9b938f7e7f538
+DIST firefox-77.0.1-af.xpi 442418 BLAKE2B 829b6de967e5e9298d9dd29e9d93ac60e9f91e1cbe38cd07c6cebd057e0f6678e8a0b1f926df5f1c94bc4b4ac0f68609e42d285b8612fd5c2a9c836ba1aa08a8 SHA512 9959d1ec14faa04743bb4d496ddf32eef910e768c8bf78471e645f465be8e6a5a14d721bdb770b1249f36c13e58220b70906268c56bb3f126c0e02a6de649e9a
+DIST firefox-77.0.1-an.xpi 516658 BLAKE2B 54c50392f4f0627c42503b2b10c1c306cf383de52af176683a7a706c74738c804c2ff45cd09e68e6ae792bddaeacc605596d073470e1c9f7deceed9f77730007 SHA512 84ceb15f1d8e41b8fa2444e54d01c22767e777d170b17ab2876716b2c81bc041909bd7367b80b19e465347e93036fa70f21c7e399f721124906a5663d3fcd100
+DIST firefox-77.0.1-ar.xpi 594310 BLAKE2B 545a8880e6f26fe16a241811652692efb52d35206eea163b5d8f8ab7ec7e00de692811b1ef0f5a7b33949e6219dbc7ddfb8bd065c3a2a1edd0776e8cf1c63cbe SHA512 46f0df8c8919d1d183c8e2f2de7cce3bcbe78a118cdff28858d5941f6925d07d00b995028480fe8357139b4aba23780f670763b78d7e821150858f8faa5334fd
+DIST firefox-77.0.1-ast.xpi 505455 BLAKE2B 565d4f9c90234860681b285b158248a2aa3b6eca48959f8520ef80f7252d08ed9b15c50d18c9e5d2d07beebfe57f3d5fe695add0090b54e7ead00ab6dab2f555 SHA512 922b4cf638ca6f12e2e10de22ab1608de127a932967d993ac0e69ca35ddeddaca9b91c167a281835dc386f48e1826ab0eaefb9d4c53e58486997c64b583af4de
+DIST firefox-77.0.1-az.xpi 541956 BLAKE2B 9afe6f68710744e221bb513a87bcebe7d78811715efba7b28f8cffb1e9af90f085056ddd3301554a801b7111ed7c46dbbe957a963bff8feef1b1c45bf59e0ec8 SHA512 a368a9e99813eebf2fd1d8f016506fbc733ee4e0f80e858b278ae40b5baec47dda38db24cfa8e99e858a370fc76b9fd2cb59afe1db08f95d15736a1769f10794
+DIST firefox-77.0.1-be.xpi 645154 BLAKE2B 52c47578b3ac0500aa8dc32547666f121483d48bbc2a3e41e6bf6b7c7d77cc7be416bfa11011b2b0b71b28d20d0ef49b490709db6fd4ac2f463ebe7906ff5b97 SHA512 0e2c9ac5d1de879b554f3b25c4af871b8ff8a0f308bd3be71996c4897e3fc18f4bf565e287b680550257a913c7b96a90beed909ffbb1b0e5368886fbf126e3d4
+DIST firefox-77.0.1-bg.xpi 614850 BLAKE2B 032c3b67535f26c496eaa08c34fa0593921a6503ec95fd3f22d709cacd46b3927e48e7c58bdc5eb6db5faf9899c04dce64e1e3f4a7156690b30f0f01fa4438d3 SHA512 50716a6b9229654208c4f528ad6f839f06090eaef6c0ba22bcbaa1666e3ca98472ccb846d86300cb8d1b379b05bd5e9ea9c7fdf965730410545fdd3c02184562
+DIST firefox-77.0.1-bn.xpi 637289 BLAKE2B c3465f189735aa9d838475ed01bcf56132f6cf1ee030905174e0c21835dff149e275ab4be3180e5e1364418229d9c59c7a9d12be68c4a56841f3f4539175eeee SHA512 335028c461c75c49debb8316fbc6df10a96d157ba52632bddf07b168a93ed7d9c17745ca78dae17fbaac5556ad176b6e3139fbeafebbbf5bebd41742ab55b7a5
+DIST firefox-77.0.1-br.xpi 554370 BLAKE2B ace55184be1feeffd68c31118cf813b56ee93f89624d75dc5442701b24f85954a49182b0bf3f507575d30470f1a8dd6df0e375955a2294c45ac347d178ba87f2 SHA512 b8139083d2bab32fff4cd64233a3a22cab5acdd9e24878cf22210622114eed693b7823b4aa5ff5220fc45de44385412d3710f1c7385fc180cc5b51e9d37404a5
+DIST firefox-77.0.1-bs.xpi 513717 BLAKE2B 49040a98400e9c7d9ba798642c76a2ddc147ea27ed1abebc0ddc8ded5ae3a960947b686ceea4a6b3aab36f9ff11133f27833d7cbef510c8301e996e67fa435dd SHA512 684c468e768c4edf773075ba70d5debbb2071d32ec1c71a8c733a85ceb876b466a36bbc8b5d1caceb0b0746319bbdfd7f462fb89981fa6fda91fb722d4c1888a
+DIST firefox-77.0.1-ca.xpi 552827 BLAKE2B 37968fd930ccb2365a7ebc5efa3e919c109cf940b484846266b4810342c2449557aaa17b2fc7fd3c1944067d5d77d7c5f20d6952637ec8d5b72ab9b7832b754c SHA512 97b881808e0b7d9488ba0c94e8d129caff48b7fad7d6ad42c231ffd17332955171df76d4db558d2aa3824b3ae592edfd063e8f866f463f90c53e93f6c96cd752
+DIST firefox-77.0.1-cak.xpi 584404 BLAKE2B 4ea946cae91641f51837863d0e6ff59773575ab42f3575197efc81d89d603f53ea6b4c8da1f75099ebe6ae126839b7a56828b1698f74f6e44c85837cabbea3b3 SHA512 4f59a72b2588c29a668a3718099e88bd5345955357783dddfcbfa632e74d4018b57cc361775171da4347478906ed0e037ecdf2d0dddd564ab23ed561a938089c
+DIST firefox-77.0.1-cs.xpi 581154 BLAKE2B 3111bbba4c712df8a2aa5bf64e170422cbc3db26d857e439d056ea9cdf65f4d54134f17d61e3e9bde397b15763fd0e37a950334641fa6779238af7f739cd7344 SHA512 395018b711853ef882cd1ff0954c7b0e23a6aef994e08286bdbe083c1c98e8adfcc562d410c5a8b8fb0613eccbc444a20f2b14bb891015bcdd1cd41313110941
+DIST firefox-77.0.1-cy.xpi 560588 BLAKE2B e98e6c658e3cd332aaa83829487cd1d97b9984a9488a7367655b6bbab5b47347f7de27ab1918d98a4767423c99d993c8b0a905bfe5aff4c6f8b90c084c9f90b6 SHA512 bf69d3b3d27b5c2ba6200afdf9bb351f0113501748f87af8c50784bc6e1df2d5fcc64baf9b517cf810bff31f1c5de25d95a88e5bfdd5ea952b5bce62b54ddae7
+DIST firefox-77.0.1-da.xpi 544223 BLAKE2B d79029ed5046016bba7133a37bae14cabd596c46456719318c54e7bd810153816e0508beacc3dd5fa1130035c0c27f003990d08203aaa6a7a1a663266f1642bc SHA512 e54dd07c42bff718f3ee0c6dbdd4b49b7826b294a852a44863b1d6560570c17a68af27306e23509f6c74b79c010aa4efc0ebd643bf939dd01b3a614c29f551d5
+DIST firefox-77.0.1-de.xpi 576074 BLAKE2B 9dfa044d4e53f551aecfa731f2d9b4b4a6290c406381e780f20b516ad52e51d5750703c13113f97a6f94c98953591198400e393f8772ab3bcd57ec0d571b6450 SHA512 366f0929e3269c0e49756ab2c7d6ba61d3f4662abd562305e6d4d994873805013696901dac411063aef32d3ab6372688fe01b15597b308d81904fe56d5edcd8c
+DIST firefox-77.0.1-dsb.xpi 584589 BLAKE2B a1e9c55e9e7ec3d80a7db8c6788626fd5efa19a47afdfabf36550e86a94e151e3b7b8b83cb4905d72a2944261ccdc44dfc368561e04afe77cc5c126b318113d6 SHA512 9cc8c5ca10e5f7df989104ee6aeeb22650637129d68d7d756165d4142d6909a8081a0019c081c27815f0909f7c0638a35b2b388ed008ae5a9f12483d32e258e8
+DIST firefox-77.0.1-el.xpi 647875 BLAKE2B 7f8ec79fbe206f7180be2413a701fb5b88d7965404ea71f65e5acf39f242da07dd67a2efc4d0415206002a0334376b0fc7a5aad28356c1a02ee6fd019fa428c6 SHA512 bc20cdc43ca1f83d400543fb9be0cfea797513164eea46b853893f551ad33a22f61b6768f76fa589b4730636c8dcd2b1a81c154fe9e67e5b9f4a82f454bc4c68
+DIST firefox-77.0.1-en-CA.xpi 528214 BLAKE2B d1eec4119098efbd1823ffeabf250dff41cc314a9550a5e7b71bba1ef107b54c6afe7ef86a1f0cc3b16abbfe05fe8f14badef98a06c691d71ff26b40dfc0ad6b SHA512 1c3865796c0f8d05596c39b04355f74f4faa49dcf6d8c75b2b5eb21a6e5fc008d08dfc594580d0d199515ee3552cd70534d69cafe79c3c76ecb04410d083b7f4
+DIST firefox-77.0.1-en-GB.xpi 527777 BLAKE2B 1418d8225a3ce67623c453a08ac2f0217dfd697b9215a7c7d3041762cd958f6e427487dd991a5ddb19377526765bbef837df84e47091c3614a557d53ca665a47 SHA512 66ae394010ec2bfd71fc58967d3426b6bf4fa6abb8f72557f78d51dc3014965b515688b99bbdc4e8854aa154a998d39a387be433bdb4f4d03544410df1a465c7
+DIST firefox-77.0.1-eo.xpi 556412 BLAKE2B cd75b0212682f5047f093cdbed733e6df4f27436e53f660779ea5ca381405f7e7f3b65c5825d7beda5a5f7d03b2857919b3ea992944b9071469e2327fddaeb41 SHA512 fc38c693a5ce10641c6a8c1006f925af60819e3bb86c3bc74a2eba50da6b0fdd3d872ba8ca91bef7913287e15462285f483a5b9d8baeb8108e48dcd99d7cbd00
+DIST firefox-77.0.1-es-AR.xpi 565581 BLAKE2B 51639b4a7756ed79c87f19a213bd2077cd3037bfef4dad5599df04e37312c540bd0423585e09ed6907396c47e3c998b3a4847adfc298903974dbf7a93a76f82a SHA512 73bb18262df4fe761abdde77037a3f29417eebe80a64881f45fee384e419e16ec5df3c7c041db75dbe43ec350690d446e81291fedefa823677459bd2e3f26f3b
+DIST firefox-77.0.1-es-CL.xpi 565176 BLAKE2B 31e829906529ab9b46d74bb4b7d859983f8cd4db2a90e49d8120c62314527ac7d33ddba3a354630bef8cbb76f8138b9eb0219069a4348bd456d730f6d8f3174a SHA512 4d483e1e6ba69ec48fad723dda32438f8039d3004bef23108e1d09fa1b0a318066de1128e43ec9ab938157ffec119e441aaccf998b04f4045d02360964f69d28
+DIST firefox-77.0.1-es-ES.xpi 544053 BLAKE2B 970b260e5c14ecfc4524f213b8545a65730598796a1c8cfdf6f6864e1fbe9d9b9df439dabf8793d0a65915a0163ca5ca9928e68c3a8fdd807e92e87d046d3c8d SHA512 f6c10d7884a830c024799c7dbbe094de3642b0f788aa0b1d498af3695218bb96c01efb3ac67b77de481609e37f984183d86e3a8224c218418f4dfb0f506d2dee
+DIST firefox-77.0.1-es-MX.xpi 569215 BLAKE2B 06bf9aebb992262600350847a48f772516c0ff3bf794e88aec776170f7173d28496889e9992c80f090d7c6e2450fbe31a6cb1d68968bb9bbf3048df0838b2b2a SHA512 845eaa89b940c7d7fccead49a2ccf2e61ca4b229b6af40d8903f5a368751901e5fcc74861c631f1d29a41cf41b55a1835559c98a85f69bfb947a7ff7cbccb0df
+DIST firefox-77.0.1-et.xpi 540401 BLAKE2B 0b77179c092b3dd715d82c2406b38497d0e7adf7f1179a412cd03be6abaf99b97e45e8b7dca4704fdcd1600e3a049b0794b99640fe822c1df7b96b71e9bfa6d1 SHA512 169c4935f2c0b07b898935cb7b77b2922f6307ee497f27593e035a486c50b4da5edd2fd3cbd27c5f3b2b06540d8d8f15da28e78ccee0b3294329b78226b29c6d
+DIST firefox-77.0.1-eu.xpi 555938 BLAKE2B 7e6f14d32bd82e3e64fab6f9e69cc627ca86dd6e366721c595b87cfa6f695426724a2f70019110ccd07e19cd649bb8bf2d3f82d8edad81a72e2b630560c259b9 SHA512 7d2e634147ad9e9711c63d8985eeed2b65d2dc65ebf4f5bcd7281e775ddaae8179eea7c457a760a93569c29882d10723693a6cf9ab779c27225c79bde0cad576
+DIST firefox-77.0.1-fa.xpi 601077 BLAKE2B 8244945903f954770ed8ae423c241a323a8040d42fb8c2c60a919a124656b3bb92e32a7a6de70f81e316f29aef08474d5b61927eadbf4a16d141a2d65c693b2a SHA512 d49d22ec0276c42da0b97405cb35cf147db566e3610bf4c73365297a3351598fb1afa99c61ef518f16ea7a1c9941989c6ff680c723fac30237bfd54af38488b4
+DIST firefox-77.0.1-ff.xpi 542653 BLAKE2B d5be582f4326aec4a2660f0417eeabf67705e9e9060d6982d9c448eadde887183857f655e6b690b16e2fc4be7f343f3587e4bdd07f4526496df6ad26a533ca96 SHA512 d7c1b65050873d03b7e0f07531d01edfcc3c81d7e8294b9fd945423794d58f45589156ec0471788ef63bae61630bcc58d00fe2591392a3c99f98ca35927f0517
+DIST firefox-77.0.1-fi.xpi 551812 BLAKE2B 20a3bdcbe56a6846edfc4f61f9448bcb5eb575292726f59fd8530591bbebf769f437efca4349fe1f5b70c8041ee055633b4309d20c0e7657fd92a78cf77c01fd SHA512 2bc1ea7c1131ab4bc0e31df6de990cb8ac6da221513817e5877fe869ac8a11c8b890a6abfb8afc391332eab872afab7201697fb7f09f62cfda47e8c4dbbcdc33
+DIST firefox-77.0.1-fr.xpi 575987 BLAKE2B 9b65a02b91884a492a7e7adec4aed0d510ea97a1270588971f1a882f1ebf4d307127f50390991a66b405206f7c7c5125bd9498dffe80b0961544ea08fb9a45c7 SHA512 8f4ccdf67108af0c2d592cbb54450410570802f7b80775c911063133842565d168e2530c64b529cb28fc37add5b73901a78b54aa6d4457e28b656e6802e7f422
+DIST firefox-77.0.1-fy-NL.xpi 560909 BLAKE2B 2202c60d4785e73b3241b2b46649d996bc57cbe4e7d4045e8365f2fd2b046d96c07cbe4601ee15f3e563668680333919b518e03a6ca69a2de9bd43a2c67c1574 SHA512 c78846e05627b2dfdd92749ee0e659f2474198babac9114a13bc567d7abb53a1ccd480e8b4a7378877f2866293c849475ba22a63ccab41cec77ff9f3892e4f76
+DIST firefox-77.0.1-ga-IE.xpi 507069 BLAKE2B a93c547c07212147f21a7906d5223c492565b541087235badda59535044e8f3f824bfa622ed04b7c50c481a073160963c23eb193ee06d04619ba7fdc3fd14879 SHA512 b591dad3cb7f842b273486e2049dbbfd479df4b5e96b99dfcf2faffafb28a85ba034daaa215756e64da7882822b5802afa6fa5feb53903bf53252909279dc7c0
+DIST firefox-77.0.1-gd.xpi 547687 BLAKE2B 41700654553df6ae9bfe6a74316230ce8303a812fc52bc8791046ea80ea4ed9560cbbb8fdf1c814694dd69574ab54e5283c735906d400c2c10c516c76abbc8f5 SHA512 b8f7e1c402fc76642e9fbe12481b3ac514e4eda23df53ea65e024e85acf85e967b33394893e57085c8765c1c13c8661fc6aba654394362f008f85323c65ba57e
+DIST firefox-77.0.1-gl.xpi 515346 BLAKE2B c3d39ad8bd7f65d90982a2e8e369ecca2efc2106b20af1b207b1261557d7a88be6301dfde12e94853f6eb68a3c073efe7950c14a56537777faf5bfb039271dd5 SHA512 453330c49ab364ce53d10ae03e48bc5a15b4364a3e32c659889af76d31d023ec37642fb8f15ac0ad3395eab871a196be9ee5a379ca958bf5715e186de09dcc8e
+DIST firefox-77.0.1-gn.xpi 578470 BLAKE2B d0d9a32f9693b857c03dd62148ab4a5e045ba0727c72b859ffef9e7703331ce3b7e051e1019f523b30965b30ececeb9be84266af846b239fa83cbfc0c2529aaa SHA512 49c2a8b3d528562e1406155b792a8c63c9135b6b1d69f8c02cb5dad10cf1b01582d34de630c9424da1afef066cab48c321bdfe1b3e40224c9cdb24e554c96c1b
+DIST firefox-77.0.1-gu-IN.xpi 611848 BLAKE2B fd33fa59a22e6aeec837d6979b6e7d96239b729a3bc5160c4efccfb1474e85cc043d502b52f0d13c6564a85a21ca393709ef7a9fd1d8b4d9ac2b3b5b3fec3042 SHA512 080c5ee6a5486786c52b08e24877a0633fce2535765c413688719c2fd064e8561bb3503e6402bbcbd48083586aa68e427d89b406095052ee11fe06c2ebdbb5e0
+DIST firefox-77.0.1-he.xpi 575499 BLAKE2B 3fb4f14a0cc1f0c108b78bed8d4a48ed202ddd3c1ec5c0f03c82017e379c7013e0a9343ac9112f63dd94fa8ef0e14262ce71dcb50f2c42d296a52f3fe39a3336 SHA512 87997619c5ec10a608a92113895d5a057074e2f4281ece1bbce58c19d002b9fb9de678e396ac4e5122aace66492a483b9b2ce1d8ddf77c692c3d59f27f445907
+DIST firefox-77.0.1-hi-IN.xpi 622018 BLAKE2B fc605a043fbae70499355923d55273665cc710c4aeb76fcec1df1cab3a0dbecc638f886c3b7108c1295aa6694a785dd1b70ca6477f3f886b05b3798c82d208e1 SHA512 7f3799e6bbb34c3427377362a6f450a4eba7f6d6fa02098ee8386427e20af8fea97ee1f17624fac0b53be10e1bce66c100fd5e3c03b2060f1026e5e8ba3b184f
+DIST firefox-77.0.1-hr.xpi 557588 BLAKE2B 10bb64ef2fb6c17d6fdb0f91b12da8462eed255f086ea2ee6034d1aa784e0385b9a149bbbe8cca5d31e29155885dc67809ed58c4b38c42a7d4de8babbd881e33 SHA512 041e971dd70551f3b7a295e5cb7b9c90da4f807cf66842218fa34dd04745c43cb208722c5f862cac67913eb64b3517030be629b764dc821632eb1fcf2b4daa83
+DIST firefox-77.0.1-hsb.xpi 580071 BLAKE2B 7dca1adae8525232c7eb765bf64efa9a159d72c1af9cdf8c115c21e1830105f7c10cc32493366e4b74287e64accf5a4e81c733c67da181968d482ece73933f90 SHA512 b9ab4c74d51d17dfd8ff7b954d076b9667717ae35a69403bd549aac5a444a619d2683571a8d3b72161b27e4bc131904bbe4b1f5928e408dfa5276f522d12b809
+DIST firefox-77.0.1-hu.xpi 586295 BLAKE2B 0f535e3cb212a56650c0e3858e6f6cb25ba5e943e09fa1a728b3bcfc381aec215cab24acd1684cca12c916ace5728ce4b6b6ca4978f7c7bbd4aae745c4502c50 SHA512 a2cbbb9d0117a3ae937a1a43ede681418cd765ae8aadeca2fcb7e64c35e85c783987b533f353b38585f025639a8150dc6b917c6a117f70c7995b654dc48e7344
+DIST firefox-77.0.1-hy-AM.xpi 637656 BLAKE2B a86f58eff71aaa4b99dfb97cc8df70818b445193531d4470b88ea66cba75753a31d93cd69e57a11cac4977841cefbd18fd32bc8e57449fe4afd8af6a98d054c3 SHA512 15e29147be0dac2845ab4101e69bc891ccc7132770d89e4ddb960388dbcb3c1fcae64532e648bb6ad8c8121237c58aec4378c4a77db8c0504e2df1fddafad769
+DIST firefox-77.0.1-ia.xpi 544137 BLAKE2B 91038012f5fcb49a01e148598ce6605d9ca805240b3cca53c11cede8dedc4f2c4db43e1b563fc77ca9a98025b3651303c4d8a716e3338759e576c1f4e9283fb2 SHA512 bee0db33a9e3bd876947c38cf99c213adaa53de73aa22ce5660cb14c54333166fe21990709c2cff34c024a963ed3d449901f09b57bdc620f9a91ba923d50fc8a
+DIST firefox-77.0.1-id.xpi 547523 BLAKE2B ad64f16554d5a039f655e36bc75e184f6da9aa8637b34f9e73e9e29ab53c3410e4a9cfa6df082d39ec1db249c5c7b14200632b0a9d049260f25fbaf17e2f4472 SHA512 1be447a5da4dc3e363eaf3eae5768db49b05ef9bf667084f01e8f7e8dec4a69912468e27447311fc954cc82270fa38751b313c0917f4f7386d19fb46f8a9af17
+DIST firefox-77.0.1-is.xpi 531101 BLAKE2B de4fc280fd526b5d00675ac4ee47c8b496ad7b41ae454f05ce7955dfc8e79d84f94141eade363df898f01e7ea2c013b2c5dacce092843a50d8b6140bd014e8e6 SHA512 25709563743e0a96c88f5979b7d0f7cfa8142161359f155da267ebf1619c1505b3a61fbfb1e56250ae334e4ae8158dff47972611c88353fbbd61a966a96fe325
+DIST firefox-77.0.1-it.xpi 446609 BLAKE2B 8eb6b668cfbfae87cf1f6b6b275c2bdee450619c73e78ef2e8fa1c83b6862a5ac49f8fa8ae4eef04a1d755756ce1ecd601c5b25a2235d7b0e143be99312e4873 SHA512 18249c67b036eb26ffc63a64298d90ea737e55ab623b4a96d747a036408b5a6691fc5da5db0ea15602218cfa7bcea87607da7c7e49036276619461faab62a3e7
+DIST firefox-77.0.1-ja.xpi 606874 BLAKE2B add0a8bdfc3f39dcef3ce334fc2db3887f22c744871f3af07a4c73aca16fca386103ab1a9a33a69d22f806011590ff825cfce2751a29d8fd969a1092ed66e6b7 SHA512 1dbf98b334573b38086e27dd6dc774a28af054f252ee93441e46518afcd2d0923903f73cf13e7cfbe748bef5efa765126732df46871264343e6a41f7ed35f583
+DIST firefox-77.0.1-ka.xpi 608081 BLAKE2B 358f5542b2e2b1d81150ff400873eb7872310942b9458085ad4aca0858ab954d330f105b982a587058c7f5f198f3c8f140065bc7a06cc559ead047bf00d574b5 SHA512 08eb02789ccae91bdefb290b8b7380aeb79f01438fb788803c7ff33e38b92ae70fac031cb93ac7fd9a490daaa1c132b3b46575bff9b126933a4077145e6a3c7e
+DIST firefox-77.0.1-kab.xpi 567984 BLAKE2B 67f053545d1a25ce63ed0a155fbd9170ae4dd31d763a5a36013599ad735433034d446fc21ff7832539446b8b6d5dcb00f36b7c7f16c5c2c77437e2bef67d825d SHA512 20745bcdb429ea8b046a165ebd786660b08c71234fdb5af167206aca4cd426e7bf1cb334fb7a6ebb29d199b2a1f06c5b449325fe87b0785324afcdf77d826344
+DIST firefox-77.0.1-kk.xpi 636209 BLAKE2B a2bb0dfc5fb3d81eaab7ad4d8b2d7f8a627d2022850b243001b45aa4805315bc27a6568128784841722551972b5b552db3d6d9ea826dca6660deac93165369fe SHA512 f691dbdef1fc58507ff479ce9f53022b93a4a369beae489de01739538661fff9a85a992a7e5909b4145877af7a71335eda03cd37b9c7caf793bcec0f88163e6d
+DIST firefox-77.0.1-km.xpi 581217 BLAKE2B be7f74e3b411be503b5a772251cab15b999e987654f17f68b77a4575add89494f9ace230f89dc93de4a16746611d95afba3260ab87a183a7146b5e4f3d8c2998 SHA512 9144d8bbc3478402338d5c0722f0574d803ac163f4d8dfa574a1bedaff275045accd39cd55de133190140973038be280a0cc8f47504c8ff188a29f4eb08b6851
+DIST firefox-77.0.1-kn.xpi 571488 BLAKE2B 1415d10f95ac5ba465bd02bbed222c5f35eed793ab9f81e4c326f4ccca0fdac26b25c5c4a138b51022b26285a22c26be506310519e87da77a5c8bdb1fd43a699 SHA512 8e386d4877bcb772fc55dd165fa9dad619f5d83de0ae61c29a4abace3938ea88d7a63a5e522d54e860c434112b0368cddef4c59458212a062a6059e24ffa2fcc
+DIST firefox-77.0.1-ko.xpi 593681 BLAKE2B b2f1c7dde75b7de22a0d78ebb076fac79f93f2ed1cdda1c8b44e669dc7e289a8ced5d606ce3bf65ba7628b745cf4ff03412070cf61575da333cdefa448bed9a3 SHA512 528f13bb0a3bc8806a2f7308e756bfbefed108a63cf1b22027e258db5e204f9eb58468eb0469a8e640772fee200773603684a40b6ed327d83917c5760152a1ac
+DIST firefox-77.0.1-lij.xpi 522984 BLAKE2B 0688d1d042090552af12552feafb97f41a73400024c40a2bdf8d185945c94d62d86fb2ae21973829dd0125d15e93292d6978fa33cd30f115166ed8714c4eab31 SHA512 b3e11bf633a213f19d18dc12f0a9e0f4778522b7e2cab1ce3e1dcde5d42d9228d51101c06c9ac37a76942270dab3b2efebfe77277b76e484e498801a599c75a4
+DIST firefox-77.0.1-lt.xpi 582708 BLAKE2B 37e7420bc4e2257f1426c317dd2c9d121993a4b035bfd20a3e700260c00bd567ff0b988279d92011ba952b29f19d8f88dc6aeaa5cdc269a19c9028cff79c5744 SHA512 020851b9bfc76b7abd891f00ec9e603650a3f2354cc2ed442203a55597501e231a8c599a19d0b416a88995d1b498a7d1bbeb1260ae455143d4affe5cab6d4ef0
+DIST firefox-77.0.1-lv.xpi 530450 BLAKE2B e39e632ed5f031d2dad03d7f34eeec6482b17b43ec4a3e76331c00d8c5f77b6f8c24f4484f801926339fbd93e0e378fb369e293dc195d3d9a2a6e526401113de SHA512 b6989d3e07304cf4bdde7a1662235b2039d4b9ca3c6bab16bbaee0b2660e788d1e9a77d40739efed500308cbab453ebbc63446dce9042ab65461f1b7b3d2d4ed
+DIST firefox-77.0.1-mk.xpi 497021 BLAKE2B 0f239124244e5dfa1735bb0e395a9b27431b8f28d47053bbe25f31e00445b3448a1590a224f0c660fa2269f4dd9ea77d9fd3f9b5758f603ed1e91a76efe3626b SHA512 1d6737218a86aa20d43d64be2b36f5923f739b80c9e3c36285065d918cedb818343df96289722cb04bd8404005cd0a335a76a057acf1b8b4e3ae237ee336ca60
+DIST firefox-77.0.1-mr.xpi 609594 BLAKE2B 75493e8664b69f6116b8a936e45a87e3b1b42d9c3ed93422eaebc03035894f502b7ce2f435d0e67943590f53be54f996ccbd84c9eaad47e40241d6475295a6cb SHA512 afa65cba80621b5b437dff3e9925328c3b6928bfa48350e68af52dcfcf9cc7ea11506a7f06506f041256efc9b9c76515a26bacc5d8e44451dd57ab9a89f07f82
+DIST firefox-77.0.1-ms.xpi 510292 BLAKE2B e630c402b781a531a46420d7209d145d6eeb4cfedcd37482aa1007de82849720162abbfc1653693c22710a62744b3392e3b99e0e5cc80af7955347454f06b31e SHA512 08fe18bfe3b24696b48f3483b200fdd3ec6a1600ac908dbc827a8c290d28a555f951e324280e5126e66328b7ac0abf0bb461f7715ef1f8d6beabf1cc7698423c
+DIST firefox-77.0.1-my.xpi 573507 BLAKE2B 1c33ac6dd569e018b8d9b7af4a177cd322ab1363401d4e02a6511b561691fd88d35003bfeabeaea79583c496e1f62281bd3e652cca21197ec66415b1724ccc61 SHA512 5493ef7d5c43e22d50b8864b7b947e22b97a0dd34cb4b693f01f70475a05235622b462278eccf1e4f69db2931e3ed6b33cf17744857b8e9ac0722ad611bde103
+DIST firefox-77.0.1-nb-NO.xpi 547037 BLAKE2B 1a0cccd2a6234775b34bf23ce4d15c00daaf7152e2567996adddd04da0e5d973d3f7a4b15af570965012c5900c7af36b0dae1c02bb6926e5f3c8d5d0f40656e6 SHA512 867be418fc82c9a9b34a9f03d59378155b465f57d3f1279ce1b7f553fc28064122dc623aceeeac27d56c8a68947c545eb10c41f60bde1ecc674a753d77c4e9de
+DIST firefox-77.0.1-nl.xpi 550244 BLAKE2B 57739646c8d5306dc020c2c916134aa33e86083c4611783c11ade62c26090d1615c9756fc8d20c492b55f4f4bf46f0c77aa9f80233c25f3a93c4375499ee00ee SHA512 a7ec20579365e890fae52bb5063d031461db090f246ff8085dbb61b546e7c1c3d7502f5479d218a12546bda388326ce1adfc52d09b45df72ea982d76260ae7b0
+DIST firefox-77.0.1-nn-NO.xpi 548967 BLAKE2B a3a6db4eb44999e8044b0f62974e9af278ac18e6692930ed80807bb57743bd47225ff3ebcb2c48b0d7d910c2ad26e37202e55b1de94b67fcf0e152915bffb5ca SHA512 ffe2b8d82a40bf7a6832d5f2fb44213530fa481c8a28d430ff5dd5135754e6a5d26718cafdee742e293e61cc53bd540daa63c763c20c3962651f71980599a7ea
+DIST firefox-77.0.1-oc.xpi 567665 BLAKE2B bc3bddaaad3924a0e222732c36c233eedb3ed6d14c790b0f055ec1f4b41f749b9e3bf70254897aa799c64c05611987fccf6e2bad92360eb2493fd5c6ec132bca SHA512 e127c20a3c7fa2369633df185d8229b3fe511ee92afd3f0a05f34053f56a058f48dbe1072d3332ddb7ffdb3f8391d0c33c1c9b9a92ee49c5997ecded7c967638
+DIST firefox-77.0.1-pa-IN.xpi 603404 BLAKE2B 8cb486862452598e160f8974f1fb74a6cbf0d0524e6ad943bffa881ad8babdaa235f5df72ed9c73a704acafdea528e95a0857781894ab6a0a7be846d9d85d3d2 SHA512 c85857af3483356f25645bba385668c3b986575b564f3d1d47e88401c9311ec7290e6def9e3d4b6c79e6f9480e658b0326f34b61480424fa63da07e166abf3ed
+DIST firefox-77.0.1-pl.xpi 565658 BLAKE2B e25cd7b582af69463acb321666cb23f955f8839370b1294171d80fa5aae76ba75903ded235bb447e8ddd90bcf5503c9d9964b86bf662637f9d81c2631f9c0ca5 SHA512 69447a4381b9bbcab9007076d04de5938b4d092687b40189ca62a1c138b83f5e9f6e6cd735b0c29036144dfdca34ea2ad0debeb06424fc5a8414927082c3a1a4
+DIST firefox-77.0.1-pt-BR.xpi 550569 BLAKE2B 20800241b6995d6486e122c0f1f3da126a3083245d682c731cbb217a028fa70f25ca884a15610fcf0141315ffb076cde5730d27ef1113af526d96e314fb846cb SHA512 7d7d32b220f51f146a54d4a3652306e8e551e2d426e5b7f3e22d5f4aa81985b62fed2e1503ff76038fbaa0a5249e93be4062521ca4525f6efc981eb5f3405736
+DIST firefox-77.0.1-pt-PT.xpi 561743 BLAKE2B 6523e2e84790a23283fb9708cff74500978e6428dd1843281b285326ba7f9ef5cc205023922c131cd43842483ac3ec402c31e7b9b55544a79bf9720c94da4bea SHA512 0446f255af2db0475383279a3bd48f4ce9b84743161daf783bbb3e4e4720cdaff781603137e0cdd95249a2ddea6d4b1d7270bc75c44a7ddf0339983336345eca
+DIST firefox-77.0.1-rm.xpi 553786 BLAKE2B 7f469d94e00d7b8c3043ce3cb24e1e57667e3916a33da068c225a2f75f9d6710ac91bd55d9767d321e71c90060388de6a77f9617a50a730bdcdd21b310796a27 SHA512 f12d9d7d6a4bdfc9650c340597e249ca843cf5f509aea44c1fa09979d9af6aebb9c452cd4441260c8ed6ab32dcf144ba7ea220540ad46d8db71e58cb5c803b1d
+DIST firefox-77.0.1-ro.xpi 567574 BLAKE2B f62c153236fa072464517e09c0628df2d834b005bd7598cbedc52be6ddb48b2af8f6343b9bf47bf7cd64b40950a68e41f2b5b64dbcd1731078b39e064f47fe94 SHA512 dd89ddcd98a10eab280ed3f2ac8505dca534a201c54e47f1667f9dfa4c2720e3dd0885641257b4d00e6f30f2715cdcb552747280cc31a58c6d772444c92c1396
+DIST firefox-77.0.1-ru.xpi 647078 BLAKE2B ce076c8ff16bb9c17b1cb3c0e0f8e6ba8403d0797df547e55c25a9147ba96e3b607d8def09aa0cc2b12944bec3afa25215d7c23363f58e61736a0c25de539488 SHA512 f9e91e54af02a9c227f3f5a3e58e6d0cd3959e18172414fadd5d01cb62b7a8bd129d197eb2e4243224e59b2d2216ec1a4b6f926f0fbc8c49d48381259ab037e4
+DIST firefox-77.0.1-si.xpi 549952 BLAKE2B ad01489eb43f0aa65634bde207333c27af3f6bd53dc2b26d21c4e15840ff229f78c65c2b6e507889b98c98e6d8af0dc0f0997d2361d653202305b80a12b7d617 SHA512 8038b3f74282918c1d531c867d885938626803565e373fa32a3907e91c7fd7db52f691406b2004ef415b7812335bd6ec25a04a773ed8c41bbd551b953a3c0288
+DIST firefox-77.0.1-sk.xpi 580412 BLAKE2B b5afd0c8b65836c1901597bc6903c618caf2b4da871279cd9a0288071d18f18a43501ab388420d7babbfd5933ba46b65a546351ac69de3710b59fb99b68af281 SHA512 65fa08a791552ab733b94be03b49907fc10f57af22b2fcefca3d32d107d13df7a6bf4bc16bf49090e9d5f4b3c10722eaddbf8216dd47093ace73bfcc8308e5a9
+DIST firefox-77.0.1-sl.xpi 561268 BLAKE2B fa6b291f6daee9b18bf097bce3b0ba0680d61286b30cdc10cd3b7515245ef6452822da860cf088351d2f545193f55e17fc47c033ca13706eb86495490962175c SHA512 3f6ecc9d06a5c6caef7f9652a98592b558eef8b899c72ff4a9c046a92444cd94bfc4bd376691c89395da7054d0422384c016e419b703e374d3552a2e9d2348cb
+DIST firefox-77.0.1-son.xpi 473463 BLAKE2B 42339e880ebd731c3d73024516b12c96f3f49122a445000a290960fd0bcb9a63bfef92665364a174b4104591882b67c7e30c1118fbe5aacdf0e86b65877d8ad5 SHA512 b14db793687ad1c74c5a4c61531084759dff0aa4c00b4ba7e32593e6dc94170f794fec2791d5013bc35bf044afeb361b96e72ef0a3b20a6b059ae678ec2d65d5
+DIST firefox-77.0.1-sq.xpi 575019 BLAKE2B be39faa8b9be9a2ebfc6dd022970abeed7d0b0b97902382359b68e6e484da1848638667d1b7aa30c1b1b509f0ef484a6a560d48a17113c626affa893dd5cec61 SHA512 43e8c48954cbdd7578e5ab364a7acf93fc813ffd1342b22abec6d8844f721e5dee43f5638e4397a5d3771576e0f5d624474a639a4c260e8c358c7a545738b872
+DIST firefox-77.0.1-sr.xpi 602834 BLAKE2B 173550094e9262a72b3fefe84e4f454cb3da6dc6fef586e9a072ae40f7554e98eb1b22ee58a20d312951d9aa7da3f389bab0ab02c0e5f7dacfc54291fd35ff43 SHA512 3737b8bc0e9ab1f1d2a60b2b5314867aebd3df0e462a835fb0b16480ceeb99a6fc8443832611544a62d5e583e43c5db295685a7d485033fe0e1b38ed3059e13b
+DIST firefox-77.0.1-sv-SE.xpi 559177 BLAKE2B 42de70c428c6bef3808d49ab0fa282aebd403171fa90c6d42358a5a2d45167eaa3f114bda80090b9f25363732ba1bbfe1b3fa7ed54181ec31ea28bb79a26f7f0 SHA512 9c61b401d79be19852dcc0eff9f3ad0acd2777fee048b66da921ea14dec6dc06803ea5194857c5b44da8634fe7763e267932b07b491447c64c3066e15b9ca80f
+DIST firefox-77.0.1-ta.xpi 579186 BLAKE2B 7b7679ddfb97eb9d31012f5e3df4a456bd81946b40ee5a73863031af76bd67999ebc54e41bbd24cc8ffcc9562934acbcc9065de5375d8e1406e3b92e2fe7ca0d SHA512 cb62b9d28ee27c551c931d2973e2c7f1ae1e3c23dd6b283be5dfbee3fa71c9d80732a0147d3fc773f8b937587bea8d05818d6384bf9a6e159704c0ef76ee542e
+DIST firefox-77.0.1-te.xpi 599741 BLAKE2B 064c2a662dd11849d52e43bda8f63e3f8b13ec3a0a0c1ec4365f382435026fae9165e2ebaff433be8c928d5e4f9ea502b4d5f47511f0419db249d1e2c8965605 SHA512 5afd95976a2b553e27ae5e39161012b1238320d278e7fb12fb5f681b53a04b7e7ebeb65c7f61ee272381412d83e24ffea7d47865158dfffa6a38a98e41a5f0ea
+DIST firefox-77.0.1-th.xpi 624565 BLAKE2B 4a45220f23aa6aa6f3e0985a3c38c0f82bef27e02cf505c18a858b2d1cababab2eac3d3ad71236a089690cd24b0e91c6176c842a1ec16e68e629efa8bca54642 SHA512 129f5b675fb9d4a981d90f9a4887ff28b1c45823b6ece2bacefb0e49c27fa22443ac96f5cd7c9fb40a73d91095bf05bc92b2ea02ff9d74ba4884ea7674ee40e2
+DIST firefox-77.0.1-tr.xpi 573719 BLAKE2B 8567e8a9b719e4e727ea45073df4a7b3668f5bb1b6d51e5b03408bea30d798e22522f2f1d98bda0267dbbf986f582bb4a751bf7c3dfa3f311e76eaf506680d52 SHA512 0ac638a00ccbc8afebcc7f1d067d317060ff7cea2089bb5def59b0f0b1ad67f8f5bd2a0bb36faf1ed537527ba195748280ad4bed95086ddb0d3de60f1265f86d
+DIST firefox-77.0.1-uk.xpi 637128 BLAKE2B a074688c7e99078974c53e3bb1331d7567a07a2b05e7d113e7106bd4aedaa0be1f71bc11845d0afbd44563b1bb15698b94d6bdd08ca40a01ff40f15ebb33b717 SHA512 7fd03d79bfb43baad923f8b09d96f0ae867d59e9949467489901d7f5999ed79126d24fdb99545a5fbbd8d8ffb5906ddf08ea2912e272c52a90b7175af75c5d65
+DIST firefox-77.0.1-ur.xpi 610048 BLAKE2B e1953f125fe0d44b9f0fc5eab6b791f7a93022f74f30b27146876afc48b84c24177530f6b57570591919eb37fe84bdcfd1ec740f654d4921726325318a1ebcdb SHA512 9a9eeef68563e8d7dc050350d4dfec6a36c04d7916e1294e0c048b1ddebb9040d40cf6f2525c19b13760a12e9ab82e78266fdcb192b38c044eab8323a5dcc3be
+DIST firefox-77.0.1-uz.xpi 527675 BLAKE2B fc0f60453c05a2a5375daa941926e9f1730385d32662d2d817421fd0e9c1bb3e23f48a19138e4d05d9aabbe492ac4a2466a30d42c5f031b939b91972d2e66c1d SHA512 27688e62ecf0ce0fd162e29b3289d0af0c3b8bc8eaf9ab1d43ff8fceb949bba3a738ff605f951f8c70963e7694cb692a02c64c82c41bdaf90a019c42bd44fb04
+DIST firefox-77.0.1-vi.xpi 589973 BLAKE2B 2ca28aaafbff59a76ce8fdaced7c36da85f7747703d66668a81b3d4b22bb2d647cbc28a231be5a95b93484b16dabc794d76400d2461d440f93992813af08f098 SHA512 a884527951ace14ccaf0255a0d7c838e910450274a57261b1b60adb7099a6db79e90428c54fb6615bc1dbe862f9d2312046173f58d3bb39a88d2e9aa70e990f3
+DIST firefox-77.0.1-xh.xpi 478153 BLAKE2B dcd5c4e59100cd837b39e4203d4d46272653663530c07f7ce752abc9bc7cd5df1c6f7c74a6b2caa29c6e3f3520baccb0a2a876a65b4bc98064bd2454f2e1982c SHA512 7f79ad0298db406dd33be70760714ba7804a3c91a6252fb1f28b970800d4af54db7238e3dae6fc56437b90820a3cd8c0b1ce2beed62eeb2db99385ceeddd74d5
+DIST firefox-77.0.1-zh-CN.xpi 596100 BLAKE2B 440edc453f303cb4d90f9b665bd0ab421b3dd8849fe645ab02dff2111c7c1efe7c045f8c9febb68d536a51f10f4cbb496eafa39071af6431d11428d0638426fd SHA512 80aa55cc304cddd9fc299b1601ca20642129d23dac1807647fc7e14dcd868825b239baa239809ffb459c1685042e1433699bb3f9d86553eae83f8919fc1a32c2
+DIST firefox-77.0.1-zh-TW.xpi 595265 BLAKE2B 305b43f078a6696f63f721669180b502c2211a7a5d40682f4148e33015f921346865fb3df55a5b8a56fe92a6a86a3ab0ff0bd3f2cd0318e2299ab8dc17c70898 SHA512 5ab6fb6973146b47d5886c93481e010dc8dac0efe0f6ec4f8897cde2539a52a28850b460c27067657ef8a66ab555bce6201da6a3c1f27bc56214f1d9329674af
 DIST firefox-bin_i686-52.9.0.tar.bz2 58598632 BLAKE2B b9cde89261bcaa57841d2ff5e440c2fd86ce0011a1a6c4c6292abe51f2d479324a5e6c9f6a6a135c2811975ca850656cb35d922a169ea2604f3c13aa5aee4856 SHA512 f0f6b494eed4f84eb013065ed1a586efb03b50441023fea866306fbb65de3e7ebe5ff572575d868c17e3ca11958d90b1d6a8cffda0babfa8432e4bd3f19eda15
 DIST firefox-bin_i686-68.8.0.tar.bz2 67073130 BLAKE2B f8315b5dc7e6221c8055c4f54298c335018f8f4e029fb3913c9921b0bb63dba685345a9c7c315f0975006e0d95f7f0cf062e729a4ab20f0f3efffa4f0ac66621 SHA512 cdc5c1958d39e66fffb10653cc8b3643a954791161639730bac6f5e7d08d5cb161e27ecaaeaba2573d416180757361619f0f04d02e3ddc070c06a42519b9ba16
+DIST firefox-bin_i686-68.9.0.tar.bz2 66903045 BLAKE2B 76bc9e234162a7ec0755de3b695f2303d98a0fa85b64a1fa74c4a76a84008d7baa143c3565380ed41d44189ea2005f9a1731796919b9c2d3d588e27f492cd6f3 SHA512 7a418d487d1b70cc9330f53bcb7dada634732c70061adf6c881adbfbfb529c2bd0551affd47df72bc356c53461a490aa23d075509bf2f2fef7bb8acf1d77d9db
 DIST firefox-bin_i686-76.0.1.tar.bz2 70260239 BLAKE2B 8333986505310a31503d278cc9fd255a3e6e2b269a4240db70bcc51ab1de8314db5b0244a6c59139b883fda37dbd74f96ab14af952c8ec8918548d7bd59c388f SHA512 aecc89ed562adcd72b9a20a52a36d0522555599429fe1c00dde42f50c7f179b37508647bf2bcf9eeaa8cea67c2c4dc3c90fb95f218c13bfefcabf4d329adf3c9
 DIST firefox-bin_i686-76.0.tar.bz2 70289047 BLAKE2B a3b8de159c06f3d25f59ecf67d16925eaa5b3f8fde5844b7c57c3c44d884970d641796c3bf55ec4223fec286eb0dddbe99ef53aca38610eab95d62fb3a3cb008 SHA512 26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020
+DIST firefox-bin_i686-77.0.1.tar.bz2 70911638 BLAKE2B e89f605fba43973c9f01e912261cdbdc6b9f37b1b89014912f055a879d2e006b34b760475adbb7038b3fccc081c24b0b5e1f1ebcea6b72fb0e5427ad2b65b3d7 SHA512 b3da650b9da5df10c611aeb5e08a6f96be431a85edc0c3768221faabfc3b302bb23677b33527d23d9df37aac7b83daf869f4a373d461893a9be83d1b74937e87
 DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf0273c59d9a4d7f46491aab34b7995ce76fe43366c06b859dd2ea1d8566861e1086e73aa30df28ff4d9dd634c1948868fad7643ce6a SHA512 b5d7da00766354e72f5a48f4f2143623428256d79d0b3e958ed6764b680afdf2b3188c61b09a02dd1537c8b8d3ddd1a1b828b1cc13a16df02a52538a42c62954
 DIST firefox-bin_x86_64-68.8.0.tar.bz2 65131677 BLAKE2B bc0291ad6d54bc67aa9c7cfabf699aaa442442dbaa8d80f029e618eddcd346020306b8ec0722541e41c918fbf321ac7164f11d30ad8f6962f22fe8de0b551496 SHA512 dd2eedf5079664e230b4e32066eb8834da7768f8387a56920f585268af175d8a1d399c40eaeef012693ab6e9a85f9a08fe4d805e16f538b673e83724fbb37685
+DIST firefox-bin_x86_64-68.9.0.tar.bz2 65001744 BLAKE2B 9dae901498b923559592d18621cc086854ff5aff07c9ce36df3dfe2a59986f79cc97ac5e139fc65f9a92cf8d0949fc715b3489ea6679d2228017cd3da5a3bd5e SHA512 3f5e505a5e1c92809d2ece9f8126c92bf2bb35a007685a54e8134330723ba92caa533fc1587bc3bf1f87084ca1645c31186fceca663f12cb6c4322af508e15ad
 DIST firefox-bin_x86_64-76.0.1.tar.bz2 68109819 BLAKE2B 592663527ccd0448b2d8f64952d944555e0e513f943bedf377df1c67a0141d4f3bb644614660715c1d2ef6d8a9f7e8251276e32ffec3fc284faa11615a6a6715 SHA512 045fa38e72c51852656ea2a1e61956ad1fda524b1ce1530c49638c75fdac2d558d823cdfca25ab7348a4e366c20a8769e073d89e9c5e308e404f2481f611bebf
 DIST firefox-bin_x86_64-76.0.tar.bz2 68102012 BLAKE2B a85b4fcbef5a0376d93eaf89389447a202e1e7bc4328feb3fa7eb1b566cdecdf9be372cf616288d0a0b78f2acc6ee3bd034be47dc56693b15ba2b3afdaab6d8d SHA512 993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a
+DIST firefox-bin_x86_64-77.0.1.tar.bz2 68798336 BLAKE2B 6e0888bf63b2418689e44bcba38edf7ed7a863db143a204ac5150847ae49d0507b3063f1c235f06623e27e4adecb5233fda03777fc517221197f2bf445e06f5b SHA512 28b0f843220a88759893813c48f9b02a255c26fe954632e530f956f43c4cda6441546f3e9d827fd61bca0d61fc6a5580d3134b8d5315cdab90fb57aaf96fa5f8
 EBUILD firefox-bin-52.9.0.ebuild 5477 BLAKE2B 50d4699ded70cbf71b2988b01985bd870452d7cd16c7e4b1c7d51ec0fc3433ae4141bb9142eace3999b4c1104dd07fb3c0f8fa8db996018975ed0e46473c6078 SHA512 f7bc036c3601d1aa9fe3044c74b7902dfaba701271fb456d4f71bca3ecbcb0781ca394470e64ef06cf4507424f0bfc9301ec7108909afcb349e38c471313b9b3
 EBUILD firefox-bin-68.8.0.ebuild 8012 BLAKE2B d435f66a1983ff08caae936de02671753af778d3fc0c5e3f844b4c0c167fd9491cc132069057c7d4fbc81ab69846166b70a6652e6fb48cea5fa22d1caa729438 SHA512 f50e3192eaee35c5b6cfb16bce21b8483920b59553f39dafb706cdaae59c94797cd677849f78c8636b397275928a3c4e57f0c81da35cc4e4e612d2dccb5e18d4
+EBUILD firefox-bin-68.9.0.ebuild 8012 BLAKE2B d435f66a1983ff08caae936de02671753af778d3fc0c5e3f844b4c0c167fd9491cc132069057c7d4fbc81ab69846166b70a6652e6fb48cea5fa22d1caa729438 SHA512 f50e3192eaee35c5b6cfb16bce21b8483920b59553f39dafb706cdaae59c94797cd677849f78c8636b397275928a3c4e57f0c81da35cc4e4e612d2dccb5e18d4
 EBUILD firefox-bin-76.0.1.ebuild 8717 BLAKE2B 549c54d7eedb6932ce95cde7684860031df344bd9cba43c7dd7b2541af68abd555ab78e9732355723d6743cdb6310a046c53b50e7c77de9880604c8692924dd6 SHA512 198e0b25a58c217d4f57e411979bb449ee2e0d158583c46fc296daa3437ee7150e950536c8c67414a2129cfa561f13189de110bd8e0b5466ddd2e1fa19a64b03
 EBUILD firefox-bin-76.0.ebuild 8717 BLAKE2B 549c54d7eedb6932ce95cde7684860031df344bd9cba43c7dd7b2541af68abd555ab78e9732355723d6743cdb6310a046c53b50e7c77de9880604c8692924dd6 SHA512 198e0b25a58c217d4f57e411979bb449ee2e0d158583c46fc296daa3437ee7150e950536c8c67414a2129cfa561f13189de110bd8e0b5466ddd2e1fa19a64b03
+EBUILD firefox-bin-77.0.1.ebuild 8717 BLAKE2B 549c54d7eedb6932ce95cde7684860031df344bd9cba43c7dd7b2541af68abd555ab78e9732355723d6743cdb6310a046c53b50e7c77de9880604c8692924dd6 SHA512 198e0b25a58c217d4f57e411979bb449ee2e0d158583c46fc296daa3437ee7150e950536c8c67414a2129cfa561f13189de110bd8e0b5466ddd2e1fa19a64b03
 MISC metadata.xml 475 BLAKE2B 6fb55129e2d7a2f87663d6637fd534872b5a5d2ef344eaff67e20ec8b5ba2810d9df753480fb5639b3d76d42ff6cbd7fe1d0b6ad97e14c9dd56ed78015df2a39 SHA512 1f3d857c928fc7cb04b6e25883e8ffa695df6b862183221913d4283b1c9c006b715000faff301e7c42474be86eb57bcc310f103071361f07ec8a2c556c576a5b
diff --git a/www-client/firefox-bin/firefox-bin-68.9.0.ebuild b/www-client/firefox-bin/firefox-bin-68.9.0.ebuild
new file mode 100644
index 000000000000..c02d55a75e8e
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-68.9.0.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=1
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
+he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit mozlinguas-v2 nsplugins pax-utils xdg-utils eapi7-ver
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
+
+DEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+			media-sound/apulse
+		)
+	)"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED%/}"${MOZILLA_FIVE_HOME} || die
+	cd "${WORKDIR}" || die
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-3.js all-gentoo.js
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox (bin)"
+
+	local apulselib=
+	if use alsa && ! use pulseaudio; then
+		apulselib="${EPREFIX%/}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED%/}"${MOZILLA_FIVE_HOME}/libxul.so || die
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes} ; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
+
+	# Add StartupNotify=true bug 237317
+	local startup_notify="false"
+	if use startup-notification ; then
+		startup_notify="true"
+	fi
+
+	local display_protocols="auto X11" use_wayland="false"
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox-bin'
+				;;
+		esac
+
+		newmenu "${FILESDIR}/${PN}-r1.desktop" "${desktop_filename}"
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
+			"${ED%/}/usr/share/applications/${desktop_filename}" || die
+	done
+
+	rm -f "${ED%/}"/usr/bin/firefox-bin || die
+	newbin "${FILESDIR}"/firefox-bin.sh firefox-bin
+
+	local wrapper
+	for wrapper in \
+		"${ED%/}"/usr/bin/firefox-bin \
+		"${ED%/}"/usr/bin/firefox-bin-x11 \
+		"${ED%/}"/usr/bin/firefox-bin-wayland \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" || die
+	done
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 68.6.0-r1 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+				break
+			fi
+		done
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-77.0.1.ebuild b/www-client/firefox-bin/firefox-bin-77.0.1.ebuild
new file mode 100644
index 000000000000..bef5c486f6e8
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-77.0.1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=0
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
+he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit mozlinguas-v2 nsplugins pax-utils xdg-utils eapi7-ver
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
+
+DEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+			media-sound/apulse
+		)
+	)"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED%/}"${MOZILLA_FIVE_HOME} || die
+	cd "${WORKDIR}" || die
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-3.js all-gentoo.js
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox (bin)"
+
+	local apulselib=
+	if use alsa && ! use pulseaudio; then
+		apulselib="${EPREFIX%/}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED%/}"${MOZILLA_FIVE_HOME}/libxul.so || die
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes} ; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${ED%/}${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${ED%/}${MOZILLA_FIVE_HOME}/browser/chrome/icons/default/default48.png" ${PN}.png
+
+	# Add StartupNotify=true bug 237317
+	local startup_notify="false"
+	if use startup-notification ; then
+		startup_notify="true"
+	fi
+
+	local display_protocols="auto X11" use_wayland="false"
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}"/firefox-bin-wayland.sh ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}"/firefox-bin-x11.sh ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox-bin'
+				;;
+		esac
+
+		newmenu "${FILESDIR}/${PN}-r1.desktop" "${desktop_filename}"
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
+			"${ED%/}/usr/share/applications/${desktop_filename}" || die
+	done
+
+	rm -f "${ED%/}"/usr/bin/firefox-bin || die
+	newbin "${FILESDIR}"/firefox-bin.sh firefox-bin
+
+	local wrapper
+	for wrapper in \
+		"${ED%/}"/usr/bin/firefox-bin \
+		"${ED%/}"/usr/bin/firefox-bin-x11 \
+		"${ED%/}"/usr/bin/firefox-bin-wayland \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" || die
+	done
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r1 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 640079bd35e4..859bf383a155 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -194,6 +194,98 @@ DIST firefox-68.8.0esr-xh.xpi 470231 BLAKE2B 2d9e369ea3f2cdb788f772840e31a972f0b
 DIST firefox-68.8.0esr-zh-CN.xpi 536431 BLAKE2B c5e4bfd0f2533d5d21aeed767180d36bb6affd379ef149b5106397829fed06856447924a8bbe13d404ec5df0575f7935488a1fe04123413d87732626681401fd SHA512 3fa69bcf5023e6ab038fb57ffe24dd7526e614450e58d19c6297043a6d2e12866876c23da355c2d0280e3f1009071b7c303d17c7e02c53b7435b4ea12d5c21be
 DIST firefox-68.8.0esr-zh-TW.xpi 535851 BLAKE2B cce1d8402cc8c61f734d6a20f25d33c6710947f5b5c26cc0c60919e5a82dbcf8eee0ad7dc34d092cb5a8c7cb631957ee7ab31aaf3601070fe14b0011b746824f SHA512 207208729b9ca9233523de9fffcd6bb45df795c21617783849b5d40251e84b33ad1cdb3a180053526363362634c4ec45f3cbaffb5123203114d88d090f4d0c9a
 DIST firefox-68.8.0esr.source.tar.xz 312602308 BLAKE2B 19be922cdadc705a267f35450e742cf9cf2f793a3e74dd9a397f898ff879cf9d7e59ccc148a9fa47f3c637c30887c205f01069e689f0586fb9ef82f4e6b160ce SHA512 139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3
+DIST firefox-68.9.0esr-ach.xpi 471593 BLAKE2B 143f07e25eafd8670c8cb993aacbe4b0b0c78c76bf039a5a775ea8c127af278e79cc7a9c7d25ba442e7260ebf64ecab30046defec59174f9a0be6aa03a3fb82c SHA512 ded6298331fdb09dd56f8148e615cbcfdbd6f823ad9103c83f1857b09ea4db39d8370dfd7c9cf18f2295f015e6b7ab027ff8a58cafa80748e7eb426bbfe5417f
+DIST firefox-68.9.0esr-af.xpi 450300 BLAKE2B 5a1856da3dd8ea324efce77e7602d8dde825ee8d879ca2a8cbe041b19326fcc27317dd29313d8186b0328064969d7008825aeda40f305131cb52b52fba2ce9dd SHA512 d9811d5c447386a92c6a114bfe579c3b452b7ad07b4890bd7b68059581d7c8b270f45a2c9eff2df1186dbe55748bc78563a758f0f20b42b6453d5c331eef9ef1
+DIST firefox-68.9.0esr-an.xpi 482749 BLAKE2B 061a50a7b20ad99179048af2e5402fd932800b046c6708575a8d882420bd32393f1c5c16b0dbdeda100ae3a61c89e3a3fc59036c265200f1c4d6263f609000ac SHA512 fb97490519dfb891ae068f381ddfa2b2f606bec6552b6e756df220b4a0504b45b25c76a8e683b87ae2ff5c5963b8b88a61f976144c480dc540d682889c5948aa
+DIST firefox-68.9.0esr-ar.xpi 538828 BLAKE2B 01ba9ed40d7e6bfda15620e26355b56cd94c852021e30216b4648af836ee2f09c8fd77912eef28f6fbdbe4cb898d7aade0fcce628963dc9e798a4f19ac488bc2 SHA512 fd64264f036aa84b85bb9c1e00faa3c46e7b61f0b1ae0d47d09545d872d67fbee41fbe11e61e197d68250696b0a73b3565eb3b9e9e3912fb55853142cd547846
+DIST firefox-68.9.0esr-ast.xpi 480472 BLAKE2B 4b3614ac24277a27faec68b1f64a1c072ab574d3eabdfac9de1e52520fbbaee478c34659086aa5042b406a0009815182a1d427970e88d586d37eef025688d267 SHA512 739c1c65f4215c787a74feaecb04f77f84d0f45554a599637eef7338338bfc75c43db59a21d3c45c471947e1f5b226ecf28e9744e0bb211fd34e65142692336c
+DIST firefox-68.9.0esr-az.xpi 510014 BLAKE2B 1691491985a6da2060b444c98a212b06d69780556e70dd26618a40a6968292b2344770f0aa0bf3941868db1dd092f124a4112e329e1ea94d5bbc1195c5b3b415 SHA512 55e95ebf70ce87c7a8b01aa668d8223e42bb735618d4eac615fd99aad15b22f7d9534d9cf07c54f41c586c984d0ec7ed00c603c200dfd1658c69f5c4477f9515
+DIST firefox-68.9.0esr-be.xpi 581919 BLAKE2B 5c28f239437db235ba033f4bd80416a21fa8dfd53247b2d699f01886be0410439a51ffb576824481e8aa11adf8699f2ef6d43421751a8aeebf20295d5476f279 SHA512 c29bc9ea3ef33cf0fe8342cebd8acb84c83993a6b0ee9b181e524e6a492f618653795cc4a1d58eea4bce6f68bedd09f14dfe08b899c3b98b8ad7273de1113e3b
+DIST firefox-68.9.0esr-bg.xpi 545028 BLAKE2B 53100b4d9f9f8b2c6dd017fa44a997fd6b32369d8960a14736e08acc7a5e4958bdacb768273ad69f37ac5ece0a0cf82c455db37f0f47b32e14ab247c268cc4f5 SHA512 36347a54ab0a284d591d2d7f0ee274ce85416e18771facbce4dfdf32eb887aa7380192c201cf141b1ea9d2b21524be3cfe4686ecd1a66c0535497cbbce49a6ae
+DIST firefox-68.9.0esr-bn.xpi 566412 BLAKE2B 0a1cb0eaf9a128b9ae06e330cc234a8cf9f6dba390afc247f98654135d91c6daf502a16a0d653c08460b1417e007598d3ef73ff5001e52385aad81074ce5a4af SHA512 404f20db8de9c88c5a96a2fec44bed546c2211c91937b00058ec0585dbc2a73a24a092864b404aeeefc9fda072de9615232c302b60b837c127d3093e014d3f1c
+DIST firefox-68.9.0esr-br.xpi 501484 BLAKE2B 2e882a05479c38c876107139bf1f7a9701184966d6073f577ff8a583ef1aba5a3a4963c77f96b6ac5492c12080083eb6f2f0e7876119e02dc638cdbd7c90a93c SHA512 7b83a11416a6fe8ec2fcea59281f7099426ccffcf61f3da53a9ba357a82405b1c5f78ada7d8d35d8878c75a51ee36ba8dee8ed7567b9f2525d77c5daec92ce5f
+DIST firefox-68.9.0esr-bs.xpi 482785 BLAKE2B 3e1bbfb49ca35b4ac426d38c2b9c750b35fcf466cbf9e121f93da76c829579ffe0789be52e7595989705ad6710337014244aefbb34bce758c23d4159efa9fd6f SHA512 0ca9af2c6af96e4a4397e4a927bdc407cd9a5ed445d175e881376a81eebdced7579cea0c71c3e6248f0a36d7dcf75bbcaf5606c9d75297c7175b2b583bfef9ce
+DIST firefox-68.9.0esr-ca.xpi 499723 BLAKE2B 600630142473c6f4724143239997ce51bbb47df82036b2e0a95a12ef3c48ab5fd57cfa349a1a57fa61b4649f187191346433b0da88c08882ad0e6a3b970706d3 SHA512 2e4373c554b5a8a4c44d87cc98bd478d442889a244711df977f1c006df08981c32b7882f58a7247f291be7e66ea2b25a1710da8621aa1ec3d8f4ad42e3cf0961
+DIST firefox-68.9.0esr-cak.xpi 527172 BLAKE2B d486d901ee27861e3d2bc077559641514816f94684884c33613a6ebba2479bee6055b10ad75887de402cd9a885eb3182165c09a355375c5a775c069845a04384 SHA512 c35e30ec0852ad4a60b97195a4fe2dafd472000460e35bb3f16ee28f8b6f3d8a43653d44285e3fcb94e3e54da5cdad6bf69e117c5e191e43043d5405977cc8dd
+DIST firefox-68.9.0esr-cs.xpi 519714 BLAKE2B 402ec30c2a0557bc02b853a9a0ba35b2d43f9501056d50591d25b87bf0c8e034114b4c4452cf475e172cc6600e806c2aad0e61d8a87cc0526ffa7e4387f3821f SHA512 54aab973c39a38a0eb09451f2d42aaf306661f07a59bc944474b154cd16f26e8615dcd7df8b8f50d6bf573e50ce7cd0f44cdaf1fec1a93b0592e81207064ceb6
+DIST firefox-68.9.0esr-cy.xpi 506945 BLAKE2B 165ffba06bf5d9109f1278d2b77ea45c592a7b04d11cc0adebe8b27b4fab578f6ddc627daa80082143f47e454b89f7236ff9f0785428acabef8b089c970f98fb SHA512 aff19cea340ba2ebed3bfca4ec087aaae2fc5459aa84f695168b186dd3f3c6b847b745fb4d14497cf1262ae7507ab79d9b75b7f9ff13e5a327d1441bfee5c5da
+DIST firefox-68.9.0esr-da.xpi 520040 BLAKE2B 5b405daf12b7d2e70f1d864e53612b85501ee7fc61341cb053d073400cc0ee9821a25687a086e13283abb2871f1f66c731e271cace6e50e09584fbd68c1d8b0d SHA512 c345f04eeff9a36d7fff091806168376cd0feef7fccd8423bbccb689f83e9483106dbcecdd32e86d58c02f6cbb96cb3d43dee4a9bc7e91c01df215275d76dccb
+DIST firefox-68.9.0esr-de.xpi 523530 BLAKE2B ee31f02415bb0ba3bfa74bb52668b2881d5d3898bfb45166fdf1a8dfff4cca037c4f585c51a914d8dd962963c947f58377b5123a825df72837a73c8a1e5f57e5 SHA512 de681c92d3bae7d72acacabc3b8e639e17c590d3be2462ac7dd8eea762c070756fb14199224d80addb889e1532c090d748b3c7f5d7b36608b805f2e6f2ae4a7b
+DIST firefox-68.9.0esr-dsb.xpi 528446 BLAKE2B e76947887a815de22a6a8bcf3ce462817094e078206b63b39cb2e7b4a2be38575762701b268329750ab89407637980432aff5342b7df7059eac42d2f223a5148 SHA512 61b27b32a2befe764b4a32667ecbc22f6d2cb500f072329ca4d1b1de92b4734f7ab4815a5e33d70cd56d38c54c95ef6e43353b1165dfce4b7bc2ac084473833f
+DIST firefox-68.9.0esr-el.xpi 597172 BLAKE2B f706c500a321f1d5cf661ba16d9d40e5b387854b4d30f86a9e2a14fcb4f9b62c11c7be09b5164ad3bbae25e2274878cc1e6a0d142c899cd050bac1483716acf7 SHA512 120efbb753190074b11d71ccba57d0bb5fa3b1378c171c2695037962bea6e2a29a679983cf68ea28fb858dc8554918c93f816679aa9815adb58b7fcf372471df
+DIST firefox-68.9.0esr-en-CA.xpi 478272 BLAKE2B b581c590ec501db421c5ebe4cf5f6085efaa1e2ba618497cb47b862f46db2baebad10330f71c73f952633f9d63a49e90b69bf5c4d64825292325dcf2f591b968 SHA512 b5beef90d77386cc14cb14bf0c6dbd523164b4f5f7e4f59c8492b5533b0834e17ece32df980777a452780daf6a61b8190ce5f11a8ad020bdcf35ccdce8f78742
+DIST firefox-68.9.0esr-en-GB.xpi 478070 BLAKE2B 2c3d14b5a071fe7c68ec4a364458e30c859c1f44e567b25142724adc962606c2693ff5c9a3caaa6d34ce110e7d10e01873b64ced34a09c5fea5a7981c29ac72d SHA512 282c899a2a56d2025c08df37515f16d49866634f48c6fb68387c6ce6471e7689c54bf526fc49b6ef4bf9916528e5ad4e38f5669f090100f2fa9c1ebbec40c3d5
+DIST firefox-68.9.0esr-eo.xpi 503987 BLAKE2B 41b6c908a3aa5c727995eb266b6831cf823576ce1eb21ba8ba7731f459780eba6ad852480c0b773af8ccca71af6c7aee83ae21ac0e7812c3f36c69b3c54bcb47 SHA512 6e65c57e91712d277ec0349e2f152bcab23554ef5eb4aba6f307628652ffbcd1ba93082ba657c137c423c92d3fb7a222f28dfc376b908e9010db1c71111aaf13
+DIST firefox-68.9.0esr-es-AR.xpi 512292 BLAKE2B eae9cf2d63191535da7deb9169afea10d10feea57125199c9f7dde7aff9261f85d8835d8bda751337a5ea20829e1bbc6db03f0ba1be297193dd2cb5c8baab74e SHA512 22242e03ee8f6f7dd9da37b86c26142f5d7152b426bf6931f39f64704d40eadd0cb0a2aa31b4c0c38395eca671b54ea89a2f235da4458abdf315271561c5ad25
+DIST firefox-68.9.0esr-es-CL.xpi 511651 BLAKE2B a28303bf1600c699dc4fac76558500f59523135c03791deceb486264cc2f6df61ebfb9fa2da333d43230fe4ea4b57c87403864a586cfaa66bf670d6189b04f22 SHA512 d63e1a412607652e3f81faa6616594bf7f118f33972a650f12d157ccd1d9053df58e01db4ba4dd9589dc3bc04d417f57c9ba1fba334fa077bc206c7e7c79ec67
+DIST firefox-68.9.0esr-es-ES.xpi 481270 BLAKE2B 9d8bbf12445afb1bfd722a4ba06797dc0d434817c98db0da52078997387184e04cf84e4b2e54743e13207049ba7502764b5e9e33da4b9c659af2864fdc0b71e0 SHA512 b85e60b1be7264cc62b76060ee5c8d0590df8882e12ee7440d1791354c67ca3df02eb76e8f52d9a1b56de92aa236e62ed2d0c107915ad5c17ce5d467480bf590
+DIST firefox-68.9.0esr-es-MX.xpi 504489 BLAKE2B 4e6555a91cd628a6da3ef4b1b038c199cfe47a7786253055a4457efa04f891d74cdf680d3e8af3772f5a5d0995e5c3dc4296402980e0d963deca5505e83e8986 SHA512 40eda0697c367de406c26a3585de5c861759a3bf93ed67352f24d4f9eeb530e29d3477fa7b32bdf415dc1539787e0624684835e40c617205369b26c94c3d1663
+DIST firefox-68.9.0esr-et.xpi 488292 BLAKE2B f6855a71e5fac06f386551befae43f9e1fe9f5a01b17a85edca201ed618e6ebf5d9fc6909aceb05ea610704d36579eccbd1417ba9fd2be2ea81c306614a6d631 SHA512 0b0c59616bed3d1338244547b20abeacaf68d9de85656dd8988bab700e82846a9a9092685f5024d703edce9f4eddae5d76892159a4e184c41166c839c2f7eea9
+DIST firefox-68.9.0esr-eu.xpi 502329 BLAKE2B 2acb9f4a6e92e279e508cf4fa05ab7350f33a76f2f47dad224010fb47d5c7990ea893f0c16eb8216e9532a03fd5a2abc81be9541eafdcb2c9a1d24325111363f SHA512 d20934f3a4ea6e8ad102e714911dc5840dac8cfa64e4e021c16666dfcc041679f4ab50c1676cbf325e17cdce1d1efef7dfd70cc13c299752532a58a8c90c7938
+DIST firefox-68.9.0esr-fa.xpi 547567 BLAKE2B c099575e2a66a3b5c316e0a3fbeccaa053c05cf051ffd29eee5ddba659c62616387331d628667cc5f71d0789072384bb6d3722b88e715cf9e38892275ef08b1b SHA512 b458a668f8f7e4b314a7eb34910185530778696f262e530f5336c1b40a26b4dc74947e815a09ba50db843317b7b26a748356518f08e97c18a747848a06c5a20c
+DIST firefox-68.9.0esr-ff.xpi 483734 BLAKE2B 49b889917a21f3caf80ca37ce6c9e4ee653e04b26e9716363be9da3e26f241aae746f27eae2ec001192823f8ea8f380188e353919f227290e2d8b09d0deb2476 SHA512 54a9e30882611e1182f8cf5cd99a7f38e1feb2ee5dba585268b3a99586ab1c21b8ff4ddbcd8e6aae0ed001456d0510351b81a7f4cde074a224cdcda41a9d2253
+DIST firefox-68.9.0esr-fi.xpi 494105 BLAKE2B 3c5aaadb833b53bd142f4c17927e2ba009422b085a84082af5332e1b4a0a290df1a2f072553f2264773fd395c80337654ed4cde18eef56dfccabac4186be2a55 SHA512 ecc5d918caa81f09a7ae3c458b4e8696611cd8c96121685ffb2ee21871ca15acc228658f067a90a17db676a4fc8e6a0c0d69c445d195c9d44233e369120f5f9e
+DIST firefox-68.9.0esr-fr.xpi 522982 BLAKE2B 7294bef2dfb2d2d8a2c6e84b748dcb490c3e2b191e241068c91544c21dc06e755ecbae7030c92846ab14e9511d19d4cd72a54b7abca7a0cdbe6f1801f8f857f6 SHA512 2b28cb987fe49f1ae27b07dcc73214307ef171f4abe7af1c4fba01529c19745350196b4a00e26782221940f3f87fc9d332906b936c59289761def8822dc66f2d
+DIST firefox-68.9.0esr-fy-NL.xpi 510190 BLAKE2B f0f2e9596047e0b62842fc53c16a5b31a77633fc26ad02aa463eab9dec340dc36fac4436b1d6bba608a764c857727cb4cd4e895d2a0d90d083c29c7bc0e9dc84 SHA512 920473e39f86e60e4321aba83b8e255869912125da51f6a3add307123f3bd716a2d34f2e21ea33884aff9564a7024039ec534653259d1930e02d276f57669c59
+DIST firefox-68.9.0esr-ga-IE.xpi 489308 BLAKE2B a9d7eb80a97fe580d6dbc358c11d63bb5d197b436e37ae5b42f6c4602ba4512f3f58587afffbea274f50782b189718dbaac5216927ea2a1a1dfc18f7c6598388 SHA512 534e894e9a4a551713b2b49c33dcbff47df01be954528db6885683eca53e57bf8f1c0d539d87173c92e406725cc6298d6ff6ce4357104784dbf14a20913e012f
+DIST firefox-68.9.0esr-gd.xpi 506415 BLAKE2B c9e2c79e778dd713312a01a187165d55396fea3b95e43ca10ac4861cad63116b65a26944499fe5646855db113bc7d959a1599d13b789d8788870bfd2c5500dd1 SHA512 6c71f762072d1b4db063f95b6a2321e2911f7f87b84fe8c1207ff33196288b9af2da680ccbf0b83960fa24bc85ad97a75a84a2f39cf97bd4ef90fe4647c3af1f
+DIST firefox-68.9.0esr-gl.xpi 483660 BLAKE2B ced10cbf37d2acc15da4e31e7d19d7c994ff1af90941176fec98f6570fd24050d61f449a115258d7e8296b1ebc1a183cfa39bada7c481e30b31869a0efe86cd5 SHA512 0ae97c0186c068b351b189604fa2cd8ca3f67b2ee27e8234a6f4df71e71a9c144a0867ce0d23ba688f0c1e97f3866f96ad322d9d07d217a9e87aacda6c904dbe
+DIST firefox-68.9.0esr-gn.xpi 521840 BLAKE2B 16c507ce649da403be1d764928c31a3565efd4cf4fa9d3a4a991641dcbca1d4793809b4ee5c22ce2a1c91fe046faf4f3c70016fa5d091500e35b9ade03ad80c0 SHA512 8085432859e34c64adc9d7f3fcd8c7e870816f87830b2add69305656125603959e78f45e42a4b31c2b2baf2e194d2c2406582a00eabb16dbebc6cad1059e3fae
+DIST firefox-68.9.0esr-gu-IN.xpi 571578 BLAKE2B 10da7528fd5113dcd15aabe3b231536ff7f8a1ae1e959f6e31e01ce8b244a2bdcbc62b178ac524accc8dbb7bb128741f294ccdb952e42f0d242d971d00abe917 SHA512 9f4de3247b4c32d18c77fd28e92f86ce67defb2def6c5cfe1b9fea8ce45ae6aa9b3bdebbd1e2c46f9a742b38a4b41fdcdbac6670ef7df24776acfa20a79d27d1
+DIST firefox-68.9.0esr-he.xpi 513835 BLAKE2B 17aa9abd7832d06065912ad8c1f0dfdbd7f570889f0aa3828c4e8ea54081607548ae505f6dfbeca1e41df02a0f14dea523517208b1548fbcad4a88c5ad59ac99 SHA512 8339bc8ac5bfa1a62fce041c6c2f35debc6ded191a106f9a68911958660a69bb1c744face8201751aa293b494492cfa25e9f232516e21c0a5ff79f57b131b0b8
+DIST firefox-68.9.0esr-hi-IN.xpi 555187 BLAKE2B 6d7541769e091625ef905de501e71186795a8100fca6931198eb9f6e0e9ada2b0110402b0560d20ce77b02d93b8cecc98e1bf4ec96413c2e2529037520abd413 SHA512 6403f546427888688db51f7dfdba985930bac8fd75f333a6067d11fe2a0247b07dd0526b775317cdb2a74ebd7b60d026b72ebe859a1cc1f9984551ec29cd82a2
+DIST firefox-68.9.0esr-hr.xpi 491116 BLAKE2B 206d5d2b0049424c1a8db8ec4a6e9e96e731aef4f8c8fa648975e60f3670d059b9d2dada310e2132fca16d58a7cc4419b9cd549ebd4f8168ee799f197512b5e7 SHA512 105f1f5f723185572a6f6cb248b3f4930dc8846659d15da1d7a6a9268a78ddc1e4b7e3d202f08efc53429f5947be14d6c47f53eab800123aed36edeb469e3cfa
+DIST firefox-68.9.0esr-hsb.xpi 527747 BLAKE2B e5db03b09b86f08b599f9f44de2c1d7d8afc2687bad8c33cfebd8fc0d802e444168e6eeb519c808a6a043d4fb8c5a2bfcbcbbcc995521bc3169567ddfa6ca79c SHA512 4db3e1d5c9878301cd028245c230d084d26efbcfe74a9979e411c9c86a046137b6fb21826f2576e10b5088b07b65085f5329982f8068c320db514c5bc70e38e2
+DIST firefox-68.9.0esr-hu.xpi 526050 BLAKE2B 15c1ebfde4cb42246d114960035feb3da615d457060810c3a9f9a54522710d874238ed1c9f8097f414751042d8a9aa621925156644ef0a4150cb1a4741264d7f SHA512 1ab242399d70cbaa488d3547e107a0b8dd93df16fca92adf2ea53e5edb5ea03ad04da82bec9f43d057033bccfbf392573789cc5eba4b266d096dc0667fef353c
+DIST firefox-68.9.0esr-hy-AM.xpi 542289 BLAKE2B 8a66eca292ab8745ed08b4f229f42518908dfef515d107068fd85f40b19b8e559b16948f7e9b10787bfce62d272d3c61bc1a7f67036dc731a6ca5ff8491830ea SHA512 b1947d039e8725930eabc6d21313239d98c20605013c1314924040cb151c8b81e55274872f3b8e60279f3ea42d9ba52c32ac47492e15c578ccec767f2ff9b9e2
+DIST firefox-68.9.0esr-ia.xpi 496302 BLAKE2B a0a5f6f23c3d58a22a6025a40e0d80e16dc92c7f9cf10b3ef997c070eb6fc4dc82d942e636b33cfd5f16defdefab32f9a4445536ff8b4aa172722975d01f5d84 SHA512 b3b42948b88c60eee49c767267a9d5b95ae54b5d02c7d5cebefdb629acda40606ceaccad21a36266321a3326ae4fe014f2d9eea2177b6f87dcbfb0f45583fed2
+DIST firefox-68.9.0esr-id.xpi 491731 BLAKE2B aa3704e7fc5608075b7575d654feb31c1f6ae1c932801f87114a6618f64ec95a90458d1e132255520f4873fd68d319dcc6fbbe4c25140bf62da65703bcee0eaa SHA512 91d1e656ad8fa37313945cb4ac4397a7d5f521aecbe28095a2d1be0fcf5cc8b9c34b4a9780f4ee31024be3e4823d26cbdd34a230b6095bae3f30753c7ead7325
+DIST firefox-68.9.0esr-is.xpi 499778 BLAKE2B 4d4956f566d0ab61bb29f156064e785fd35da3bea68b7609d5200fe7b7c5833a67c83a87195714866f86ac10f9b8087fba30924c08e561e315d67f7a0ffca8c9 SHA512 867fe4e68f6352de1a7305385d953af4125be5f8e675cf94a19f94dcc181bcc52e03c66b7400056774f03f4128178b371ce39a03b6ade549ac14a4be9d93d12d
+DIST firefox-68.9.0esr-it.xpi 383623 BLAKE2B 22eaaf8ab8fbfc7b26e297f73f747f7f910ed9443186a35e977c900c7b341dd50837de6f2f5ba5be2f8a02c9e975b70e17480242b1768d761cace086203bbb99 SHA512 11d913ee12a52a88e96011a5426f68ef6fb97d260a02e18db0809761ec2484e1716dd14a85db705d62fac44ee3d5b51c1574099ee571e48f3e8b3478f2ef0ae5
+DIST firefox-68.9.0esr-ja.xpi 536928 BLAKE2B 2785d5999f51656fab86c0ebbe784e84d5702866299b8c0648bc762f7470a0d596ed386dc951b98bdbe7bf5f0fb1a53213d6210b933ceb008021d6a62d064590 SHA512 a8fcf4b458abc4ffa69c1a6c181b8ed1a97f8dbe372635c9935f97e9da08512fb562a7b54d71a0c94bce622066d9a6dea0fa4f6b4e7e43da85de1ed66406da07
+DIST firefox-68.9.0esr-ka.xpi 544467 BLAKE2B 1fed179dc7cc5fda31d99478c49aa2abec4d6814e2bb22c2b866560bb5463278a23b4eead45e4cad9e931b2c83b7ae79a98f2a54d89ff51ef5299bdeee64397e SHA512 ecf931ecc2c220eff31d69d04985cab1585d961633d22bbb4e6a6306143985614eeffccb66490b6f39cbf1059109a0c14b7aa508920a60cdbd04e6483967229b
+DIST firefox-68.9.0esr-kab.xpi 508425 BLAKE2B 5923a381f9ba79f0aca458faf61bdb9ef1483e7c4301759d9b113dccac9c0ebf20b3e1f3804922c3dd92648c91d279608bcb32bb25a09d3927aeaf1e44109241 SHA512 97ca3c8610ae394eb0be0ac03a5e0ea391eef240831023fe52f904efdff06672aeb10f5325b557b3fb23ef1dc6e0ef7af9b8370bb61de34cf9bd89326e3e92d0
+DIST firefox-68.9.0esr-kk.xpi 578761 BLAKE2B 0b3945a49e3971508706266d2c2123d0832c75e62155be252ea2069d628988d6259c50e2e116140e6cf4ea85ab503b28450c9048a97be9b0ba57823d03260340 SHA512 c322d69413f31300c09ab83e36d27fcf707a0228d38ca8994b38defca5b22b2a13df20fd44a486405d66b08756178468a6589adc76c92c3ab595959b924b6a30
+DIST firefox-68.9.0esr-km.xpi 551172 BLAKE2B aa731558559e53290dfa4ac0616a04f2f3beea67cc293bfe1bedb6d95d20bacc9c2033db7ec127cbe035ea4e30149f6fac2a95d2e36034f50040a6656ee5932a SHA512 e3b0e3d0d88d57d2fc36d1739422bc92e0f5e9355d4902939000f5d2be828a1aabac430d74f3521be58a30fe3dd28ce1613c7c4b7ded7e1aeda787233a011b80
+DIST firefox-68.9.0esr-kn.xpi 547371 BLAKE2B 4f039ec853ac98b08a96a38f31ce78f55398153ad6c9d78c3dddd24432f253e873d8f20f4cae67d8750b7c713dfa9fbeb73dad835f74c8c9eced6f8972f20b4f SHA512 78a5a799e047c1b2d8a25fa87846eae9e36675663b7de816dbe76e85e920665bdfe530a162e145a6542cebe61b865f766842e63ed7b8d3ef90ed0189679096a3
+DIST firefox-68.9.0esr-ko.xpi 535780 BLAKE2B e1014c9f34c807e478ba6817b752ca6c5cff1d6014949aa9dd2021d53e28b376b7fc9c5e7febc7c79328084f7f3bce7fc47129e6ffa7de59fa375dfc8a8a09ce SHA512 6f29ca15eba8d665bdbe6aec4a5dc9d54c4c5db3a83ab2f367507d91f056e119b30316a559e29b9ac592206b759335f64e4b520587979f8825efd0322c23a1ef
+DIST firefox-68.9.0esr-lij.xpi 481738 BLAKE2B 443d1678fcae2dda62a9448ca9f1d3d19ebe093920434cd8c6df73a9e99bf9c5fa929d1d0886bf26ecaea13401a936549e7711f5147b8a898b5dc68448ba9723 SHA512 d7afe291863680d433f0d6f0ea53a55474130a9ae7ee65d3c8b2b732de8121bdde648e82f61e3cb5a2e8deb1c8bccc7c8e5df7105d420c22ebd6aedaf5f947c3
+DIST firefox-68.9.0esr-lt.xpi 527443 BLAKE2B 81ea7b05406ed941e1c8ca80c60254ef7613b39c7f16392b9b4b462f3ccc815b94fba6a7c077a54abe6e374ff5c5923357cbf9b49d756b9e27f1d3a61d6ba44a SHA512 07c7e02d9470f8ed9a860490faa295767379e1b4bfdd3fd7ce8b1edbe87e538f581f37074c8426cb1956133ddaf8ff63e0c0170d576cf90e4cee4eabad2c1f70
+DIST firefox-68.9.0esr-lv.xpi 500107 BLAKE2B 78d6d24ae3a5fa189e65471c97c31e809e5ee3d965d8a921b151e8904a684d95043bcc7581273dd84df5d45df6a04d3e1e40dfa070659640a5f235ce985000eb SHA512 e47248137713b4a1a9f8a2047c1684a94f199ca6acb72e8ced8d516e7766a20db58a4c37c5b119b9ee6cd91b29403c04b1049b5b2500159de36f0c82c49b40f6
+DIST firefox-68.9.0esr-mk.xpi 484991 BLAKE2B 69439ddcc62ed8bfe4742e8fa5deb663f5983fc5e4dfe5b95326d3b4ccbf801d156467ae7ce29e3a55acc865b2b8bbb5a0485fd625282d4fdf31003da163f979 SHA512 b22b1521731316171ae950e55c9ca93a6175963740e9dc977a2f477c7a1c1cfe9e0066b5f176a567548d68aaa26da51f998aee85ecf3c771b34417376858bbd4
+DIST firefox-68.9.0esr-mr.xpi 558964 BLAKE2B ceaa0474e763e6191961330a527cdeb42d630319d73afda3f74b25af84b2170566b21dc09509789df0fea24a240cb65877005ef887a23262b9909ff3d10073cc SHA512 b7d63a95739a97b065303a18e26cb2f664f8df70ec5cd800a3488e863b56b1821b1370bf32b2a8baba60937347de3a12cec1d7a8c5d99890f1cd58652d08fdcc
+DIST firefox-68.9.0esr-ms.xpi 480108 BLAKE2B 8dfc46607f3d606ac26166496af5ae2cd586760e8c31da4f4a1e4c41a5f66f05e8785a381fe7b2b346a410f5e8a7018ea01080795f6aea82292a25fb455c84ce SHA512 16a9823b56b1f7ad803b671594854ff55e85983b39f513b687bbe519339ce31438ae0ff4e7d39cdc7c8fcf9378b3106a529bffb490d3d2add41606eae83cf8c0
+DIST firefox-68.9.0esr-my.xpi 551919 BLAKE2B ce53432d3a78da6ad0d54b17f493d46f38d888dd6882da563359c6576746f84bc30279ca0f83a04a0e5e4b6c8d6837ba9a2dd09fc5128c555565988e6fa53ecd SHA512 8934b3eb67b0a980b7991f269ff1cf8f0651b77a48549cd11517f165a6a5f7cce6e42e84ca04b879f393f6497ddea87b0d40b9d3abd77da7be3387f7e66205b1
+DIST firefox-68.9.0esr-nb-NO.xpi 495876 BLAKE2B a249c0c9a085923296bfb6e2530b69087262be57aeee84c547ed902a7b6b33bea03175905513ba501d71f30f3603f85ba72bfb7f9f03435ce96ad1f15d61c66a SHA512 12381a5432d2b953af33d72c83fb37c67b12f278cdb1f996f824c2a8f9db3188efcabd9070cd41a9a91787cd0bbd8daa48aa81138dee514ea40e64f97e94c475
+DIST firefox-68.9.0esr-nl.xpi 491976 BLAKE2B 7faa4cb1fa5ac0c4fc594ea81b2d4ccc61454e6a42c6adfaaaef8d4d1c357306e78eb015e1b1e970c56dbd14097d39e43ae27e3553978f91c1479946a1899654 SHA512 1efb3c390371c031dc367c1ff71d370ee8462e06aaaba77906b38f7fa92140cf5404afc42e1adc58b6646b0b71906432e1a9bf26fd855b995df0653348338c26
+DIST firefox-68.9.0esr-nn-NO.xpi 494527 BLAKE2B e709f6c59f3c15d7b886d721c2ed3b028b14d1e7cf0eb5b321a4a672cd6c20fb857c5abfab6c7207f2bdc5bea875d4f9339b03fb4b19882d40e03f3fdfac448d SHA512 5c0dd5dc7eb8f66b5f0d642a8cfd03c003fafea0d77b2dfbed6116109611362cb5381dac1cbd889eb41ff9da4e083b500541e2066b8ec525ba5d9f0d84083fe2
+DIST firefox-68.9.0esr-oc.xpi 498526 BLAKE2B 327b200d6fff6ec8ce138d30f94cfa256684d097389a2bbf073e1d535f9ebedc7f161d10c9ca34b554e11ab46ebd4fd6193fe876c71b2d62e93371c569a1f125 SHA512 ddcf6eaf5be37e0649c76a002704657f793fa06478bb91c03d2c278a5b47d71cf76c4b45da630c7a29826eb13f2d348aa7a3c3a62a42d0b1e4f1106bc7d875ab
+DIST firefox-68.9.0esr-pa-IN.xpi 542374 BLAKE2B 480620568c5ede4709bde103839c0da9e9f0996ece515a6921c376da7b9b25d7269895408ae27ae00ad666b4ad6c2502daece1a68f44ed5600eae8e39a1b82d8 SHA512 0b9f6914ab9005fd239444507c2b3b51c053d770a4b66debf10420904fcad3486ccf0b24ff02eb7837f619262364850bcc0345e98bc70fca3e64d16595a9a900
+DIST firefox-68.9.0esr-pl.xpi 495645 BLAKE2B df61f75cd447930e6d48858e5209641977c03bc8ea2d9247015b9648ce30eb3c6cf7a071f4d72d6f96c6f3f9b9940adb95ea966995f487e5e32004065f7065da SHA512 d4bdfc7bc56be7095e5aa05e1ae662de509f1dde11808ddcc1df977062202c6f6e9f14c40cfb07000e92de5565976e04b70267067f055657ea27c8441c103462
+DIST firefox-68.9.0esr-pt-BR.xpi 497965 BLAKE2B e2655d9ad8cc884938fec46af7d9ce9e21ad0f68db6db774f9aa0ca88b42f20b75135c9067084de90cff87a88bcb3327c1b1bd945531fd2ce2cfa44a29deb2bd SHA512 bb842d43c528287b43bb4fd6d7dbee1583e4523839574acf811ac7aea084fec6e667b871a77ba37485cdab62f0a912feb62a2714813345322e33956799193698
+DIST firefox-68.9.0esr-pt-PT.xpi 507635 BLAKE2B 32502a132e7cb000cc954285dcd7397cf9dd057e8bb65c4994a31f7f5def7c529c4ca472a23c9d3b691f56f4cd3fdf6492aabc0963e1de863f7f4dc0808a0d0a SHA512 c7cb9ee6c067d0ab0bc3566d72b3ddd8980f493151b33758a2224485f9d7eaac003d3c2be4d9983e60f07b58b9b02834df2d31b96556fed7d5f9ee422dee1cef
+DIST firefox-68.9.0esr-rm.xpi 495310 BLAKE2B 0a13bac2fc2b0f11bf16fecbb2578c62704e67cc45f5ffe280660e1525197a12d3bfc6f172745c07ebcc4d64ba8de2f0b9d86e3edea4e1017730b1b0a6800a5c SHA512 13184b2e865dade5a0be2f85890fe4b56364c115e84a2ef17d0faec226653c61536d1b6cc49391add66e50b5b827834826daf717110529b1a66a2e675bb7c4cc
+DIST firefox-68.9.0esr-ro.xpi 508609 BLAKE2B f02719978237dcb1cd30a9500584b2bdf2a738378aa926658e6f0fe69b2a48b2d677d7544d51f94fba9914eba125169187436c9de70353d55dc5b5dd4299f930 SHA512 71dde7af2e3ab96120c48685b030642fd453bffccd5695794fa5ce8802e6ad910ae59f72c3329e280ea5fe6b2acea61dd0a96dcf7a3cf46d23a0fdd522e4b652
+DIST firefox-68.9.0esr-ru.xpi 583731 BLAKE2B 5ba0c22151253ed5b30220ee28544c85aa8f462717171aa4c2338d9e83e1c4b913158fa0b485d54420f5e1ea5f300b5f9aafb5e5f8536540b13e9468db945ae1 SHA512 4e2511bbc9cf99c2ee0e10f4520d0a956a200d69b9333bd43519ff20c4e442a56bece90ae1bc13ecec2dacb49eccdb483d3e5698aca2a7dd168f1b486bef89f7
+DIST firefox-68.9.0esr-si.xpi 527968 BLAKE2B cac1d6cec3941051115068888df91528c0fe2a27a0e0c48e32d17ed0d405f89aca1f7ff9376fa9cc74a8716c7cbba308328a9514eaf2f1631b746c3ba830d30a SHA512 05dbc700dabfb4bc29911e11dd15dc1a43d27c3726d662d754dffb885e10f612b054ca6ab8eacd1eb77b1f2245de414bd9a5e79177fe2b7bcf51a510baa3767d
+DIST firefox-68.9.0esr-sk.xpi 525093 BLAKE2B 5cd3e26d3ba3de398d43f0ab9e26b9b77873f1629951a2cbc74b9b889a1e53d12f8ddbb76ed24feb3b9e32f543dd07ca5ebb97d02736fdf1eac5fe96921c9783 SHA512 0ad3d790e48b6e3da31edb54e727c420218b1db342e7172b3ff60422751e6fd85c89e3a036bb8180af5893f0504df4fca13b3c732ba408bbe1fadac422c30ca4
+DIST firefox-68.9.0esr-sl.xpi 502148 BLAKE2B 5cf6b41f76a94722ef3d34feeeffaf7acc2ed785e713a32bd0203141637d18340ecf6d2c8aaabfb96e85f54ce011f22480d257e58625fa542c3fd5cfdfe25f5d SHA512 1818e558b6c70e3affd09530149776b0d0d338826abc1e5be179b2d75085eaaba7b30fd4f63e60fb091d6fe6daa1925eb9e06c043c0df2f62a759bbbecbad5ad
+DIST firefox-68.9.0esr-son.xpi 458714 BLAKE2B cffafd90531a4bad2da6c536338e2949bedf5319eb5d0f430d717aa5e7f7614df244a393a6887bdb5333c31a02f8fd62895eb98f486900a52d4e077c5aaa0704 SHA512 744190139709c7a4deda62618eb97a692666618a443a8e898eb0c5a1cef872365785cf90d2590d2881c5d278a84c989a359bf95dc108e749e842c5bfb43edcee
+DIST firefox-68.9.0esr-sq.xpi 521478 BLAKE2B 4a0e28a1ad24a0ad5ae66a303e986e896203d7e518190c9a69e1d29ba1bd5a887ac0f0801252c75ad7f1a1473a17d9d46cd6c7a2e44cf74696db7008a2f350eb SHA512 7184498e3108c858108322dab9c610e5f616ebc59403ba35514fb16d1a571ec7597cafa699e36b488033a04f894f41e8b2c39531306a6d35388fa80b2db0d82b
+DIST firefox-68.9.0esr-sr.xpi 527354 BLAKE2B c08c62d9f9c15903eb9c02d7014723bf695dba34ddd791a46729c1e71bd8e2ff7f216e738ac6634a7c0c6203e777e99f8279c68216c3044e5b1ab76cb80a23b1 SHA512 a15a117deef62f3e5cc167b84326b6282de82f1becf892b654b044f185004a295fa259802170e116db3d389d9051f73b65abec665f894d2f4c56237c3849c156
+DIST firefox-68.9.0esr-sv-SE.xpi 506628 BLAKE2B 61108197f76818c89c74b04ad149440277e89a1462ebb5d65a9be323bce69d903032406e40bff617cb7947b15348c2116cc31bbe9daee864a0a3c769641432c0 SHA512 6441fcd2d8e882b4d0fd0662f3676dec1261385dfc22a2b8e0060ef73979707958ba8ca7361462bba3c6fc15b1189a56d7273c99fbfc85588677d9721dc3daec
+DIST firefox-68.9.0esr-ta.xpi 548954 BLAKE2B d0a68f3554ace83f1c17cb9ae0b318b624b4309310d06019ee94de3c8ae48bb2041dc91ca9eeca19f9b87d8fddf65ec83ee6fac6ae72c1013f2d12091849df36 SHA512 40558b1fd46d704722ea499e679fa99599ed9edfd294e4f41ddd531b88371835aa1db2e51c3feb25d52c0b2763f84b251cdb75826eb1b2810b3ab71640a651ff
+DIST firefox-68.9.0esr-te.xpi 561505 BLAKE2B 905dad08fe14a8a20ecc62f609554bee9d5b5f1219b5efd04314c1377da960863cc5d633ed1a2e843fdff9af1bea8f4d631475e8879ebc1b36d0558b1148e6b7 SHA512 58e1bc8737f1ba625d9589868f03b4f110c57433de6df88a68b7e6da01a80a6e9795ed629422ad5d3d3e5298f9a81896d4b9cd56b5c6f4823eb370f4064ffe48
+DIST firefox-68.9.0esr-th.xpi 550754 BLAKE2B 1244296452f9c965b62c6f3a08c791c6ccc20007be1393031a9393ec4e498e9a9c0dd9716cd671f82b5bc7e71f5c395cc129cafe2e924e4ffb148bf12002e744 SHA512 3ea6b678673c66097c592cfd215262881349d51ef918faa3f2f1f8098e64d74559547b7e696e1fdfdb5c30d5bb4a9f7c47b2238e795ea020b8d445fae88838e9
+DIST firefox-68.9.0esr-tr.xpi 515126 BLAKE2B 51396158fcf791df79d19995bee08b77e084ce962374e72ee4c3bdd5c98b5b9c23e8ec9275530948d555482666460b7b3ba96ceb3e6b96d6cb2c2cf42e0484f6 SHA512 232bc246627cb4aae36939ae06dcf060774102c5d02d6f3545da3560f3be39b7bc66ad90ebfc82192423b6e20257c337893f6de3b4f845fd7a4b24e7f5626845
+DIST firefox-68.9.0esr-uk.xpi 568872 BLAKE2B d416a83e2f506eabdcefe0f5467b6a154eecac35f73563b66dc9b327a598760c33386df4fde4a6e638a573bd066cefa0f83a3debf28f577bdd0e2d1bded38600 SHA512 83f24f18f5dd45f9c58602d2ad1be32fd2dcc57a873e7ba4ee3c601e4059594926b32d25323f40204ac947dc0ae985083bf197fe4620054bf8f430cdc07ad83b
+DIST firefox-68.9.0esr-ur.xpi 542336 BLAKE2B 49126464ab5c8ba65625e55c55703c5a2664140859f59120860dd12a117d35ed2c4250600e6a636a18f8c401c0a201cee48e3c8e29ca5b7c18d396eaae003f31 SHA512 fbce6b86ebafc3f2e43a75ba6a5c2d7a3c5967a4bdbb8628ae7327766d8844e95173ca839ee1f9630e22a73bf3d132f62609435157f6611737ef197df8a35251
+DIST firefox-68.9.0esr-uz.xpi 482282 BLAKE2B 5444e8f2a9eb0d8312195bdaa6922b900f2ee340bb907ecaf457275744423b2f01c8b20615a4f259da4f474888a289b05c22c1094dbb7ac41955e8bf1b774e3d SHA512 30c086d8f6d8223dd62af45380c126b10cd3fb06ad448aa2b8594090a4b936ae89eb3030e24b02983a5d2e8ec5fb5fcb417b3705b7b4981194d2364f0eb42a4f
+DIST firefox-68.9.0esr-vi.xpi 529128 BLAKE2B a639e5dfa743439a7935c6e15cd08135dd2e0e570a3ec4376e6fbef9ffc21f4db530292e1a2a1c8c53e8502ec4c0c4ffba684f18604ee9028dc302b7cbe2b183 SHA512 f6224b711a04f37c7a10e915a1eaedfae9a1c0d90fbd8ffe0015d41c532b24504d4acacb1d3a72f8c262df11b36c59a407fe0002ddfa1d7483125d2e096e573b
+DIST firefox-68.9.0esr-xh.xpi 470235 BLAKE2B 6c1c93fa7eabc74e1f2b72171f22f02e61fef341a2cb92d4f87cef85aae7111bf77ba959b95e70272bb9d93ecfa60a9b46e41401a6858ab92b724f7400ac3eae SHA512 1d1f2430e3b4e6a138017041311c9138ab672cdbb8d5023c2a561671bc711ab71effe3d7d3b0b2dd33a428355abab11a519d372a5efd5accf52669c2ade08492
+DIST firefox-68.9.0esr-zh-CN.xpi 536442 BLAKE2B 01203bdacbe3486d21a272f6421c520c338674b4e334839bfd4d31c8945d5d9f976643eb22f9972eeba3663217a66c755644490948a2450940846e08b80162f4 SHA512 80f0328780e9318bfe4d9e73692ad91644343d6f713e4a2bb8e176bb365e14046cf891db03686f6004ab39da68d7b2fd01739aecbefcb1fd26a5fbc129583623
+DIST firefox-68.9.0esr-zh-TW.xpi 535859 BLAKE2B c6090a11752131689a4d8d81d9d5ac32c2af89985d763ec3c124aa0817b5e165234e1af019e3c84f452679a6358591dd3657418ad1c186607ef02ed51ed780d6 SHA512 1aec08e7c4d1a8d49163966ce916f2d7f5a714b66890a6a1d8d349c594d98f65ce863a739736c9d50964cfcd656a24fcfd6c4da20756be9dead62bee1f2c90d2
+DIST firefox-68.9.0esr.source.tar.xz 317469120 BLAKE2B f04f8ca1abe802edb6d37c0de5f8024d513331fd80c9b701c93de74cbafc0650b1c0f58e54a2dbe6bee0457698dc386093aab7749c9b0738bf146bfbae6bf4e2 SHA512 98431800d80f7c680aef9eede29df8217810912a319a7f7f8c2e637c43ecd4f4e29223a417afb2a6315e825f979453ff6e6b5a575649aba5cc63ce5956375bb8
 DIST firefox-76.0-ach.xpi 508335 BLAKE2B dc951b6da4382a2778fc01fd90fa610a71626ddbd89b6c42abd37eeda35d9ef5611b1c0f7277fb10d3f4f80b7a8370a72262c508c3f71dec87a457c087239070 SHA512 9a543b888ac026c5d5a201a595897d6ff4b2ff29107b6eb87be9d0d07830d3c83b6ca45505729497cd23f7d094f9f5c10779bb1f301ef35859a23f18516f828f
 DIST firefox-76.0-af.xpi 462166 BLAKE2B b1ecddbc083f2845f8ae0f8b198b17f19f3fda8f196acb6dd7aa36a4ad92938a4dd63de6073c93fff62b2fa80bf11e6dbeb3437496ddc16428a079194fc1640e SHA512 9b91278c854cbe4c65e5bc6080e7942c0ebbfc984d0a6fbe191aee83311e29f60786649049d108f179db72925d7d6d0e219333face0b622325cea746ff834cdb
 DIST firefox-76.0-an.xpi 520893 BLAKE2B 5c967ae1d907ad721c702f387c4d4d5647502f6b656e14a4b5144813f1aaa78209fd08e27f14b550a0d0f51c459de85e1627e89c5d2ad74834a51f9a75788889 SHA512 4c4e43fc4f3bd04af90a3b0817c5734d5da5db3826174602df56e55169ec497f17b6c57f533f71f85a9d45f9a2561a85255fcea126cf62bae723d43dd99fad69
@@ -379,8 +471,103 @@ DIST firefox-76.0.1-zh-CN.xpi 595481 BLAKE2B 593d929e6af40f814cbea9b6799dcfa5347
 DIST firefox-76.0.1-zh-TW.xpi 593884 BLAKE2B 7077379bac353dae92b962e9dd209d80670b7eff466a3fa98bc171e8e679c96f1f6bd96eb33bc28761ea062dd915aa783bf48a026574a771e1dace93e32125b9 SHA512 dd93fd2960bbd724f3a2dde4a38491a5571c3051adc933088c18db2fe1e53e9b3ba88b40d391d3843ed44b957066447ef06a964610f97dad6f903547f9bb4ede
 DIST firefox-76.0.1.source.tar.xz 323251680 BLAKE2B d8b53e43e6f6a84387129099e50d4cfecb02269407f1fa4babf9e8c75118c244029a68dd772333f34b2fc3e77ad1bde0087b2d91e16fb4b28f9ce7f556389431 SHA512 188d7dc51200662048f808e32eced55979a69059bf88eac8386307f9371adad4ca524819d99a001b6d900147b8f216d5d330430f15f11eae0b01cccf8f39681f
 DIST firefox-76.0.source.tar.xz 323886744 BLAKE2B 6efc4bb891300918f1ff9fad7b68dc9fc7e923778e62e44784d5992ba902d92c77d1235aa5f82c8934fb356830bfabf68bda4200b19df1f6160a4426f17777f4 SHA512 1f023861aaed0468f62135d3ef1098f599111df4e8f231e19baaa54e4bad0e3ddf8575895467ffc9f72bd91a2f6ed5b55096fe4932685e4bb58871e004c184db
+DIST firefox-77.0-patches-01_pre7.tar.xz 20312 BLAKE2B 99f7c36488ca0aedaac788dc2f2d76b33cf3df2bbcc4fb41d99152732bd66674dfddb0fd8c75713e4fde3d4a1fe813ddbfb4c1819b1867e04a60bfeb1f1f096a SHA512 c13b27307634e33f51ea354ea88ded3aad61f2a58600ab0800a333b2919680f732d6c38634b935d9438513361a0227a820122d2233dd1f120acac699a225532e
+DIST firefox-77.0.1-ach.xpi 494093 BLAKE2B 780cc3ea7ca743058e1f1105c0fd2c8ad4ad5a78075bc3e7813864face18f1620126c9b059d1723f240654b5bc974d4b53669f58f79f5cce2e52377436117228 SHA512 2e3da0476e6c70540d18ab94c27860d72906081ca38858dc07f033150a9ce67894aa8449b1a2757e4a566ca690dcda17726728e69d37f51deed9b938f7e7f538
+DIST firefox-77.0.1-af.xpi 442418 BLAKE2B 829b6de967e5e9298d9dd29e9d93ac60e9f91e1cbe38cd07c6cebd057e0f6678e8a0b1f926df5f1c94bc4b4ac0f68609e42d285b8612fd5c2a9c836ba1aa08a8 SHA512 9959d1ec14faa04743bb4d496ddf32eef910e768c8bf78471e645f465be8e6a5a14d721bdb770b1249f36c13e58220b70906268c56bb3f126c0e02a6de649e9a
+DIST firefox-77.0.1-an.xpi 516658 BLAKE2B 54c50392f4f0627c42503b2b10c1c306cf383de52af176683a7a706c74738c804c2ff45cd09e68e6ae792bddaeacc605596d073470e1c9f7deceed9f77730007 SHA512 84ceb15f1d8e41b8fa2444e54d01c22767e777d170b17ab2876716b2c81bc041909bd7367b80b19e465347e93036fa70f21c7e399f721124906a5663d3fcd100
+DIST firefox-77.0.1-ar.xpi 594310 BLAKE2B 545a8880e6f26fe16a241811652692efb52d35206eea163b5d8f8ab7ec7e00de692811b1ef0f5a7b33949e6219dbc7ddfb8bd065c3a2a1edd0776e8cf1c63cbe SHA512 46f0df8c8919d1d183c8e2f2de7cce3bcbe78a118cdff28858d5941f6925d07d00b995028480fe8357139b4aba23780f670763b78d7e821150858f8faa5334fd
+DIST firefox-77.0.1-ast.xpi 505455 BLAKE2B 565d4f9c90234860681b285b158248a2aa3b6eca48959f8520ef80f7252d08ed9b15c50d18c9e5d2d07beebfe57f3d5fe695add0090b54e7ead00ab6dab2f555 SHA512 922b4cf638ca6f12e2e10de22ab1608de127a932967d993ac0e69ca35ddeddaca9b91c167a281835dc386f48e1826ab0eaefb9d4c53e58486997c64b583af4de
+DIST firefox-77.0.1-az.xpi 541956 BLAKE2B 9afe6f68710744e221bb513a87bcebe7d78811715efba7b28f8cffb1e9af90f085056ddd3301554a801b7111ed7c46dbbe957a963bff8feef1b1c45bf59e0ec8 SHA512 a368a9e99813eebf2fd1d8f016506fbc733ee4e0f80e858b278ae40b5baec47dda38db24cfa8e99e858a370fc76b9fd2cb59afe1db08f95d15736a1769f10794
+DIST firefox-77.0.1-be.xpi 645154 BLAKE2B 52c47578b3ac0500aa8dc32547666f121483d48bbc2a3e41e6bf6b7c7d77cc7be416bfa11011b2b0b71b28d20d0ef49b490709db6fd4ac2f463ebe7906ff5b97 SHA512 0e2c9ac5d1de879b554f3b25c4af871b8ff8a0f308bd3be71996c4897e3fc18f4bf565e287b680550257a913c7b96a90beed909ffbb1b0e5368886fbf126e3d4
+DIST firefox-77.0.1-bg.xpi 614850 BLAKE2B 032c3b67535f26c496eaa08c34fa0593921a6503ec95fd3f22d709cacd46b3927e48e7c58bdc5eb6db5faf9899c04dce64e1e3f4a7156690b30f0f01fa4438d3 SHA512 50716a6b9229654208c4f528ad6f839f06090eaef6c0ba22bcbaa1666e3ca98472ccb846d86300cb8d1b379b05bd5e9ea9c7fdf965730410545fdd3c02184562
+DIST firefox-77.0.1-bn.xpi 637289 BLAKE2B c3465f189735aa9d838475ed01bcf56132f6cf1ee030905174e0c21835dff149e275ab4be3180e5e1364418229d9c59c7a9d12be68c4a56841f3f4539175eeee SHA512 335028c461c75c49debb8316fbc6df10a96d157ba52632bddf07b168a93ed7d9c17745ca78dae17fbaac5556ad176b6e3139fbeafebbbf5bebd41742ab55b7a5
+DIST firefox-77.0.1-br.xpi 554370 BLAKE2B ace55184be1feeffd68c31118cf813b56ee93f89624d75dc5442701b24f85954a49182b0bf3f507575d30470f1a8dd6df0e375955a2294c45ac347d178ba87f2 SHA512 b8139083d2bab32fff4cd64233a3a22cab5acdd9e24878cf22210622114eed693b7823b4aa5ff5220fc45de44385412d3710f1c7385fc180cc5b51e9d37404a5
+DIST firefox-77.0.1-bs.xpi 513717 BLAKE2B 49040a98400e9c7d9ba798642c76a2ddc147ea27ed1abebc0ddc8ded5ae3a960947b686ceea4a6b3aab36f9ff11133f27833d7cbef510c8301e996e67fa435dd SHA512 684c468e768c4edf773075ba70d5debbb2071d32ec1c71a8c733a85ceb876b466a36bbc8b5d1caceb0b0746319bbdfd7f462fb89981fa6fda91fb722d4c1888a
+DIST firefox-77.0.1-ca.xpi 552827 BLAKE2B 37968fd930ccb2365a7ebc5efa3e919c109cf940b484846266b4810342c2449557aaa17b2fc7fd3c1944067d5d77d7c5f20d6952637ec8d5b72ab9b7832b754c SHA512 97b881808e0b7d9488ba0c94e8d129caff48b7fad7d6ad42c231ffd17332955171df76d4db558d2aa3824b3ae592edfd063e8f866f463f90c53e93f6c96cd752
+DIST firefox-77.0.1-cak.xpi 584404 BLAKE2B 4ea946cae91641f51837863d0e6ff59773575ab42f3575197efc81d89d603f53ea6b4c8da1f75099ebe6ae126839b7a56828b1698f74f6e44c85837cabbea3b3 SHA512 4f59a72b2588c29a668a3718099e88bd5345955357783dddfcbfa632e74d4018b57cc361775171da4347478906ed0e037ecdf2d0dddd564ab23ed561a938089c
+DIST firefox-77.0.1-cs.xpi 581154 BLAKE2B 3111bbba4c712df8a2aa5bf64e170422cbc3db26d857e439d056ea9cdf65f4d54134f17d61e3e9bde397b15763fd0e37a950334641fa6779238af7f739cd7344 SHA512 395018b711853ef882cd1ff0954c7b0e23a6aef994e08286bdbe083c1c98e8adfcc562d410c5a8b8fb0613eccbc444a20f2b14bb891015bcdd1cd41313110941
+DIST firefox-77.0.1-cy.xpi 560588 BLAKE2B e98e6c658e3cd332aaa83829487cd1d97b9984a9488a7367655b6bbab5b47347f7de27ab1918d98a4767423c99d993c8b0a905bfe5aff4c6f8b90c084c9f90b6 SHA512 bf69d3b3d27b5c2ba6200afdf9bb351f0113501748f87af8c50784bc6e1df2d5fcc64baf9b517cf810bff31f1c5de25d95a88e5bfdd5ea952b5bce62b54ddae7
+DIST firefox-77.0.1-da.xpi 544223 BLAKE2B d79029ed5046016bba7133a37bae14cabd596c46456719318c54e7bd810153816e0508beacc3dd5fa1130035c0c27f003990d08203aaa6a7a1a663266f1642bc SHA512 e54dd07c42bff718f3ee0c6dbdd4b49b7826b294a852a44863b1d6560570c17a68af27306e23509f6c74b79c010aa4efc0ebd643bf939dd01b3a614c29f551d5
+DIST firefox-77.0.1-de.xpi 576074 BLAKE2B 9dfa044d4e53f551aecfa731f2d9b4b4a6290c406381e780f20b516ad52e51d5750703c13113f97a6f94c98953591198400e393f8772ab3bcd57ec0d571b6450 SHA512 366f0929e3269c0e49756ab2c7d6ba61d3f4662abd562305e6d4d994873805013696901dac411063aef32d3ab6372688fe01b15597b308d81904fe56d5edcd8c
+DIST firefox-77.0.1-dsb.xpi 584589 BLAKE2B a1e9c55e9e7ec3d80a7db8c6788626fd5efa19a47afdfabf36550e86a94e151e3b7b8b83cb4905d72a2944261ccdc44dfc368561e04afe77cc5c126b318113d6 SHA512 9cc8c5ca10e5f7df989104ee6aeeb22650637129d68d7d756165d4142d6909a8081a0019c081c27815f0909f7c0638a35b2b388ed008ae5a9f12483d32e258e8
+DIST firefox-77.0.1-el.xpi 647875 BLAKE2B 7f8ec79fbe206f7180be2413a701fb5b88d7965404ea71f65e5acf39f242da07dd67a2efc4d0415206002a0334376b0fc7a5aad28356c1a02ee6fd019fa428c6 SHA512 bc20cdc43ca1f83d400543fb9be0cfea797513164eea46b853893f551ad33a22f61b6768f76fa589b4730636c8dcd2b1a81c154fe9e67e5b9f4a82f454bc4c68
+DIST firefox-77.0.1-en-CA.xpi 528214 BLAKE2B d1eec4119098efbd1823ffeabf250dff41cc314a9550a5e7b71bba1ef107b54c6afe7ef86a1f0cc3b16abbfe05fe8f14badef98a06c691d71ff26b40dfc0ad6b SHA512 1c3865796c0f8d05596c39b04355f74f4faa49dcf6d8c75b2b5eb21a6e5fc008d08dfc594580d0d199515ee3552cd70534d69cafe79c3c76ecb04410d083b7f4
+DIST firefox-77.0.1-en-GB.xpi 527777 BLAKE2B 1418d8225a3ce67623c453a08ac2f0217dfd697b9215a7c7d3041762cd958f6e427487dd991a5ddb19377526765bbef837df84e47091c3614a557d53ca665a47 SHA512 66ae394010ec2bfd71fc58967d3426b6bf4fa6abb8f72557f78d51dc3014965b515688b99bbdc4e8854aa154a998d39a387be433bdb4f4d03544410df1a465c7
+DIST firefox-77.0.1-eo.xpi 556412 BLAKE2B cd75b0212682f5047f093cdbed733e6df4f27436e53f660779ea5ca381405f7e7f3b65c5825d7beda5a5f7d03b2857919b3ea992944b9071469e2327fddaeb41 SHA512 fc38c693a5ce10641c6a8c1006f925af60819e3bb86c3bc74a2eba50da6b0fdd3d872ba8ca91bef7913287e15462285f483a5b9d8baeb8108e48dcd99d7cbd00
+DIST firefox-77.0.1-es-AR.xpi 565581 BLAKE2B 51639b4a7756ed79c87f19a213bd2077cd3037bfef4dad5599df04e37312c540bd0423585e09ed6907396c47e3c998b3a4847adfc298903974dbf7a93a76f82a SHA512 73bb18262df4fe761abdde77037a3f29417eebe80a64881f45fee384e419e16ec5df3c7c041db75dbe43ec350690d446e81291fedefa823677459bd2e3f26f3b
+DIST firefox-77.0.1-es-CL.xpi 565176 BLAKE2B 31e829906529ab9b46d74bb4b7d859983f8cd4db2a90e49d8120c62314527ac7d33ddba3a354630bef8cbb76f8138b9eb0219069a4348bd456d730f6d8f3174a SHA512 4d483e1e6ba69ec48fad723dda32438f8039d3004bef23108e1d09fa1b0a318066de1128e43ec9ab938157ffec119e441aaccf998b04f4045d02360964f69d28
+DIST firefox-77.0.1-es-ES.xpi 544053 BLAKE2B 970b260e5c14ecfc4524f213b8545a65730598796a1c8cfdf6f6864e1fbe9d9b9df439dabf8793d0a65915a0163ca5ca9928e68c3a8fdd807e92e87d046d3c8d SHA512 f6c10d7884a830c024799c7dbbe094de3642b0f788aa0b1d498af3695218bb96c01efb3ac67b77de481609e37f984183d86e3a8224c218418f4dfb0f506d2dee
+DIST firefox-77.0.1-es-MX.xpi 569215 BLAKE2B 06bf9aebb992262600350847a48f772516c0ff3bf794e88aec776170f7173d28496889e9992c80f090d7c6e2450fbe31a6cb1d68968bb9bbf3048df0838b2b2a SHA512 845eaa89b940c7d7fccead49a2ccf2e61ca4b229b6af40d8903f5a368751901e5fcc74861c631f1d29a41cf41b55a1835559c98a85f69bfb947a7ff7cbccb0df
+DIST firefox-77.0.1-et.xpi 540401 BLAKE2B 0b77179c092b3dd715d82c2406b38497d0e7adf7f1179a412cd03be6abaf99b97e45e8b7dca4704fdcd1600e3a049b0794b99640fe822c1df7b96b71e9bfa6d1 SHA512 169c4935f2c0b07b898935cb7b77b2922f6307ee497f27593e035a486c50b4da5edd2fd3cbd27c5f3b2b06540d8d8f15da28e78ccee0b3294329b78226b29c6d
+DIST firefox-77.0.1-eu.xpi 555938 BLAKE2B 7e6f14d32bd82e3e64fab6f9e69cc627ca86dd6e366721c595b87cfa6f695426724a2f70019110ccd07e19cd649bb8bf2d3f82d8edad81a72e2b630560c259b9 SHA512 7d2e634147ad9e9711c63d8985eeed2b65d2dc65ebf4f5bcd7281e775ddaae8179eea7c457a760a93569c29882d10723693a6cf9ab779c27225c79bde0cad576
+DIST firefox-77.0.1-fa.xpi 601077 BLAKE2B 8244945903f954770ed8ae423c241a323a8040d42fb8c2c60a919a124656b3bb92e32a7a6de70f81e316f29aef08474d5b61927eadbf4a16d141a2d65c693b2a SHA512 d49d22ec0276c42da0b97405cb35cf147db566e3610bf4c73365297a3351598fb1afa99c61ef518f16ea7a1c9941989c6ff680c723fac30237bfd54af38488b4
+DIST firefox-77.0.1-ff.xpi 542653 BLAKE2B d5be582f4326aec4a2660f0417eeabf67705e9e9060d6982d9c448eadde887183857f655e6b690b16e2fc4be7f343f3587e4bdd07f4526496df6ad26a533ca96 SHA512 d7c1b65050873d03b7e0f07531d01edfcc3c81d7e8294b9fd945423794d58f45589156ec0471788ef63bae61630bcc58d00fe2591392a3c99f98ca35927f0517
+DIST firefox-77.0.1-fi.xpi 551812 BLAKE2B 20a3bdcbe56a6846edfc4f61f9448bcb5eb575292726f59fd8530591bbebf769f437efca4349fe1f5b70c8041ee055633b4309d20c0e7657fd92a78cf77c01fd SHA512 2bc1ea7c1131ab4bc0e31df6de990cb8ac6da221513817e5877fe869ac8a11c8b890a6abfb8afc391332eab872afab7201697fb7f09f62cfda47e8c4dbbcdc33
+DIST firefox-77.0.1-fr.xpi 575987 BLAKE2B 9b65a02b91884a492a7e7adec4aed0d510ea97a1270588971f1a882f1ebf4d307127f50390991a66b405206f7c7c5125bd9498dffe80b0961544ea08fb9a45c7 SHA512 8f4ccdf67108af0c2d592cbb54450410570802f7b80775c911063133842565d168e2530c64b529cb28fc37add5b73901a78b54aa6d4457e28b656e6802e7f422
+DIST firefox-77.0.1-fy-NL.xpi 560909 BLAKE2B 2202c60d4785e73b3241b2b46649d996bc57cbe4e7d4045e8365f2fd2b046d96c07cbe4601ee15f3e563668680333919b518e03a6ca69a2de9bd43a2c67c1574 SHA512 c78846e05627b2dfdd92749ee0e659f2474198babac9114a13bc567d7abb53a1ccd480e8b4a7378877f2866293c849475ba22a63ccab41cec77ff9f3892e4f76
+DIST firefox-77.0.1-ga-IE.xpi 507069 BLAKE2B a93c547c07212147f21a7906d5223c492565b541087235badda59535044e8f3f824bfa622ed04b7c50c481a073160963c23eb193ee06d04619ba7fdc3fd14879 SHA512 b591dad3cb7f842b273486e2049dbbfd479df4b5e96b99dfcf2faffafb28a85ba034daaa215756e64da7882822b5802afa6fa5feb53903bf53252909279dc7c0
+DIST firefox-77.0.1-gd.xpi 547687 BLAKE2B 41700654553df6ae9bfe6a74316230ce8303a812fc52bc8791046ea80ea4ed9560cbbb8fdf1c814694dd69574ab54e5283c735906d400c2c10c516c76abbc8f5 SHA512 b8f7e1c402fc76642e9fbe12481b3ac514e4eda23df53ea65e024e85acf85e967b33394893e57085c8765c1c13c8661fc6aba654394362f008f85323c65ba57e
+DIST firefox-77.0.1-gl.xpi 515346 BLAKE2B c3d39ad8bd7f65d90982a2e8e369ecca2efc2106b20af1b207b1261557d7a88be6301dfde12e94853f6eb68a3c073efe7950c14a56537777faf5bfb039271dd5 SHA512 453330c49ab364ce53d10ae03e48bc5a15b4364a3e32c659889af76d31d023ec37642fb8f15ac0ad3395eab871a196be9ee5a379ca958bf5715e186de09dcc8e
+DIST firefox-77.0.1-gn.xpi 578470 BLAKE2B d0d9a32f9693b857c03dd62148ab4a5e045ba0727c72b859ffef9e7703331ce3b7e051e1019f523b30965b30ececeb9be84266af846b239fa83cbfc0c2529aaa SHA512 49c2a8b3d528562e1406155b792a8c63c9135b6b1d69f8c02cb5dad10cf1b01582d34de630c9424da1afef066cab48c321bdfe1b3e40224c9cdb24e554c96c1b
+DIST firefox-77.0.1-gu-IN.xpi 611848 BLAKE2B fd33fa59a22e6aeec837d6979b6e7d96239b729a3bc5160c4efccfb1474e85cc043d502b52f0d13c6564a85a21ca393709ef7a9fd1d8b4d9ac2b3b5b3fec3042 SHA512 080c5ee6a5486786c52b08e24877a0633fce2535765c413688719c2fd064e8561bb3503e6402bbcbd48083586aa68e427d89b406095052ee11fe06c2ebdbb5e0
+DIST firefox-77.0.1-he.xpi 575499 BLAKE2B 3fb4f14a0cc1f0c108b78bed8d4a48ed202ddd3c1ec5c0f03c82017e379c7013e0a9343ac9112f63dd94fa8ef0e14262ce71dcb50f2c42d296a52f3fe39a3336 SHA512 87997619c5ec10a608a92113895d5a057074e2f4281ece1bbce58c19d002b9fb9de678e396ac4e5122aace66492a483b9b2ce1d8ddf77c692c3d59f27f445907
+DIST firefox-77.0.1-hi-IN.xpi 622018 BLAKE2B fc605a043fbae70499355923d55273665cc710c4aeb76fcec1df1cab3a0dbecc638f886c3b7108c1295aa6694a785dd1b70ca6477f3f886b05b3798c82d208e1 SHA512 7f3799e6bbb34c3427377362a6f450a4eba7f6d6fa02098ee8386427e20af8fea97ee1f17624fac0b53be10e1bce66c100fd5e3c03b2060f1026e5e8ba3b184f
+DIST firefox-77.0.1-hr.xpi 557588 BLAKE2B 10bb64ef2fb6c17d6fdb0f91b12da8462eed255f086ea2ee6034d1aa784e0385b9a149bbbe8cca5d31e29155885dc67809ed58c4b38c42a7d4de8babbd881e33 SHA512 041e971dd70551f3b7a295e5cb7b9c90da4f807cf66842218fa34dd04745c43cb208722c5f862cac67913eb64b3517030be629b764dc821632eb1fcf2b4daa83
+DIST firefox-77.0.1-hsb.xpi 580071 BLAKE2B 7dca1adae8525232c7eb765bf64efa9a159d72c1af9cdf8c115c21e1830105f7c10cc32493366e4b74287e64accf5a4e81c733c67da181968d482ece73933f90 SHA512 b9ab4c74d51d17dfd8ff7b954d076b9667717ae35a69403bd549aac5a444a619d2683571a8d3b72161b27e4bc131904bbe4b1f5928e408dfa5276f522d12b809
+DIST firefox-77.0.1-hu.xpi 586295 BLAKE2B 0f535e3cb212a56650c0e3858e6f6cb25ba5e943e09fa1a728b3bcfc381aec215cab24acd1684cca12c916ace5728ce4b6b6ca4978f7c7bbd4aae745c4502c50 SHA512 a2cbbb9d0117a3ae937a1a43ede681418cd765ae8aadeca2fcb7e64c35e85c783987b533f353b38585f025639a8150dc6b917c6a117f70c7995b654dc48e7344
+DIST firefox-77.0.1-hy-AM.xpi 637656 BLAKE2B a86f58eff71aaa4b99dfb97cc8df70818b445193531d4470b88ea66cba75753a31d93cd69e57a11cac4977841cefbd18fd32bc8e57449fe4afd8af6a98d054c3 SHA512 15e29147be0dac2845ab4101e69bc891ccc7132770d89e4ddb960388dbcb3c1fcae64532e648bb6ad8c8121237c58aec4378c4a77db8c0504e2df1fddafad769
+DIST firefox-77.0.1-ia.xpi 544137 BLAKE2B 91038012f5fcb49a01e148598ce6605d9ca805240b3cca53c11cede8dedc4f2c4db43e1b563fc77ca9a98025b3651303c4d8a716e3338759e576c1f4e9283fb2 SHA512 bee0db33a9e3bd876947c38cf99c213adaa53de73aa22ce5660cb14c54333166fe21990709c2cff34c024a963ed3d449901f09b57bdc620f9a91ba923d50fc8a
+DIST firefox-77.0.1-id.xpi 547523 BLAKE2B ad64f16554d5a039f655e36bc75e184f6da9aa8637b34f9e73e9e29ab53c3410e4a9cfa6df082d39ec1db249c5c7b14200632b0a9d049260f25fbaf17e2f4472 SHA512 1be447a5da4dc3e363eaf3eae5768db49b05ef9bf667084f01e8f7e8dec4a69912468e27447311fc954cc82270fa38751b313c0917f4f7386d19fb46f8a9af17
+DIST firefox-77.0.1-is.xpi 531101 BLAKE2B de4fc280fd526b5d00675ac4ee47c8b496ad7b41ae454f05ce7955dfc8e79d84f94141eade363df898f01e7ea2c013b2c5dacce092843a50d8b6140bd014e8e6 SHA512 25709563743e0a96c88f5979b7d0f7cfa8142161359f155da267ebf1619c1505b3a61fbfb1e56250ae334e4ae8158dff47972611c88353fbbd61a966a96fe325
+DIST firefox-77.0.1-it.xpi 446609 BLAKE2B 8eb6b668cfbfae87cf1f6b6b275c2bdee450619c73e78ef2e8fa1c83b6862a5ac49f8fa8ae4eef04a1d755756ce1ecd601c5b25a2235d7b0e143be99312e4873 SHA512 18249c67b036eb26ffc63a64298d90ea737e55ab623b4a96d747a036408b5a6691fc5da5db0ea15602218cfa7bcea87607da7c7e49036276619461faab62a3e7
+DIST firefox-77.0.1-ja.xpi 606874 BLAKE2B add0a8bdfc3f39dcef3ce334fc2db3887f22c744871f3af07a4c73aca16fca386103ab1a9a33a69d22f806011590ff825cfce2751a29d8fd969a1092ed66e6b7 SHA512 1dbf98b334573b38086e27dd6dc774a28af054f252ee93441e46518afcd2d0923903f73cf13e7cfbe748bef5efa765126732df46871264343e6a41f7ed35f583
+DIST firefox-77.0.1-ka.xpi 608081 BLAKE2B 358f5542b2e2b1d81150ff400873eb7872310942b9458085ad4aca0858ab954d330f105b982a587058c7f5f198f3c8f140065bc7a06cc559ead047bf00d574b5 SHA512 08eb02789ccae91bdefb290b8b7380aeb79f01438fb788803c7ff33e38b92ae70fac031cb93ac7fd9a490daaa1c132b3b46575bff9b126933a4077145e6a3c7e
+DIST firefox-77.0.1-kab.xpi 567984 BLAKE2B 67f053545d1a25ce63ed0a155fbd9170ae4dd31d763a5a36013599ad735433034d446fc21ff7832539446b8b6d5dcb00f36b7c7f16c5c2c77437e2bef67d825d SHA512 20745bcdb429ea8b046a165ebd786660b08c71234fdb5af167206aca4cd426e7bf1cb334fb7a6ebb29d199b2a1f06c5b449325fe87b0785324afcdf77d826344
+DIST firefox-77.0.1-kk.xpi 636209 BLAKE2B a2bb0dfc5fb3d81eaab7ad4d8b2d7f8a627d2022850b243001b45aa4805315bc27a6568128784841722551972b5b552db3d6d9ea826dca6660deac93165369fe SHA512 f691dbdef1fc58507ff479ce9f53022b93a4a369beae489de01739538661fff9a85a992a7e5909b4145877af7a71335eda03cd37b9c7caf793bcec0f88163e6d
+DIST firefox-77.0.1-km.xpi 581217 BLAKE2B be7f74e3b411be503b5a772251cab15b999e987654f17f68b77a4575add89494f9ace230f89dc93de4a16746611d95afba3260ab87a183a7146b5e4f3d8c2998 SHA512 9144d8bbc3478402338d5c0722f0574d803ac163f4d8dfa574a1bedaff275045accd39cd55de133190140973038be280a0cc8f47504c8ff188a29f4eb08b6851
+DIST firefox-77.0.1-kn.xpi 571488 BLAKE2B 1415d10f95ac5ba465bd02bbed222c5f35eed793ab9f81e4c326f4ccca0fdac26b25c5c4a138b51022b26285a22c26be506310519e87da77a5c8bdb1fd43a699 SHA512 8e386d4877bcb772fc55dd165fa9dad619f5d83de0ae61c29a4abace3938ea88d7a63a5e522d54e860c434112b0368cddef4c59458212a062a6059e24ffa2fcc
+DIST firefox-77.0.1-ko.xpi 593681 BLAKE2B b2f1c7dde75b7de22a0d78ebb076fac79f93f2ed1cdda1c8b44e669dc7e289a8ced5d606ce3bf65ba7628b745cf4ff03412070cf61575da333cdefa448bed9a3 SHA512 528f13bb0a3bc8806a2f7308e756bfbefed108a63cf1b22027e258db5e204f9eb58468eb0469a8e640772fee200773603684a40b6ed327d83917c5760152a1ac
+DIST firefox-77.0.1-lij.xpi 522984 BLAKE2B 0688d1d042090552af12552feafb97f41a73400024c40a2bdf8d185945c94d62d86fb2ae21973829dd0125d15e93292d6978fa33cd30f115166ed8714c4eab31 SHA512 b3e11bf633a213f19d18dc12f0a9e0f4778522b7e2cab1ce3e1dcde5d42d9228d51101c06c9ac37a76942270dab3b2efebfe77277b76e484e498801a599c75a4
+DIST firefox-77.0.1-lt.xpi 582708 BLAKE2B 37e7420bc4e2257f1426c317dd2c9d121993a4b035bfd20a3e700260c00bd567ff0b988279d92011ba952b29f19d8f88dc6aeaa5cdc269a19c9028cff79c5744 SHA512 020851b9bfc76b7abd891f00ec9e603650a3f2354cc2ed442203a55597501e231a8c599a19d0b416a88995d1b498a7d1bbeb1260ae455143d4affe5cab6d4ef0
+DIST firefox-77.0.1-lv.xpi 530450 BLAKE2B e39e632ed5f031d2dad03d7f34eeec6482b17b43ec4a3e76331c00d8c5f77b6f8c24f4484f801926339fbd93e0e378fb369e293dc195d3d9a2a6e526401113de SHA512 b6989d3e07304cf4bdde7a1662235b2039d4b9ca3c6bab16bbaee0b2660e788d1e9a77d40739efed500308cbab453ebbc63446dce9042ab65461f1b7b3d2d4ed
+DIST firefox-77.0.1-mk.xpi 497021 BLAKE2B 0f239124244e5dfa1735bb0e395a9b27431b8f28d47053bbe25f31e00445b3448a1590a224f0c660fa2269f4dd9ea77d9fd3f9b5758f603ed1e91a76efe3626b SHA512 1d6737218a86aa20d43d64be2b36f5923f739b80c9e3c36285065d918cedb818343df96289722cb04bd8404005cd0a335a76a057acf1b8b4e3ae237ee336ca60
+DIST firefox-77.0.1-mr.xpi 609594 BLAKE2B 75493e8664b69f6116b8a936e45a87e3b1b42d9c3ed93422eaebc03035894f502b7ce2f435d0e67943590f53be54f996ccbd84c9eaad47e40241d6475295a6cb SHA512 afa65cba80621b5b437dff3e9925328c3b6928bfa48350e68af52dcfcf9cc7ea11506a7f06506f041256efc9b9c76515a26bacc5d8e44451dd57ab9a89f07f82
+DIST firefox-77.0.1-ms.xpi 510292 BLAKE2B e630c402b781a531a46420d7209d145d6eeb4cfedcd37482aa1007de82849720162abbfc1653693c22710a62744b3392e3b99e0e5cc80af7955347454f06b31e SHA512 08fe18bfe3b24696b48f3483b200fdd3ec6a1600ac908dbc827a8c290d28a555f951e324280e5126e66328b7ac0abf0bb461f7715ef1f8d6beabf1cc7698423c
+DIST firefox-77.0.1-my.xpi 573507 BLAKE2B 1c33ac6dd569e018b8d9b7af4a177cd322ab1363401d4e02a6511b561691fd88d35003bfeabeaea79583c496e1f62281bd3e652cca21197ec66415b1724ccc61 SHA512 5493ef7d5c43e22d50b8864b7b947e22b97a0dd34cb4b693f01f70475a05235622b462278eccf1e4f69db2931e3ed6b33cf17744857b8e9ac0722ad611bde103
+DIST firefox-77.0.1-nb-NO.xpi 547037 BLAKE2B 1a0cccd2a6234775b34bf23ce4d15c00daaf7152e2567996adddd04da0e5d973d3f7a4b15af570965012c5900c7af36b0dae1c02bb6926e5f3c8d5d0f40656e6 SHA512 867be418fc82c9a9b34a9f03d59378155b465f57d3f1279ce1b7f553fc28064122dc623aceeeac27d56c8a68947c545eb10c41f60bde1ecc674a753d77c4e9de
+DIST firefox-77.0.1-nl.xpi 550244 BLAKE2B 57739646c8d5306dc020c2c916134aa33e86083c4611783c11ade62c26090d1615c9756fc8d20c492b55f4f4bf46f0c77aa9f80233c25f3a93c4375499ee00ee SHA512 a7ec20579365e890fae52bb5063d031461db090f246ff8085dbb61b546e7c1c3d7502f5479d218a12546bda388326ce1adfc52d09b45df72ea982d76260ae7b0
+DIST firefox-77.0.1-nn-NO.xpi 548967 BLAKE2B a3a6db4eb44999e8044b0f62974e9af278ac18e6692930ed80807bb57743bd47225ff3ebcb2c48b0d7d910c2ad26e37202e55b1de94b67fcf0e152915bffb5ca SHA512 ffe2b8d82a40bf7a6832d5f2fb44213530fa481c8a28d430ff5dd5135754e6a5d26718cafdee742e293e61cc53bd540daa63c763c20c3962651f71980599a7ea
+DIST firefox-77.0.1-oc.xpi 567665 BLAKE2B bc3bddaaad3924a0e222732c36c233eedb3ed6d14c790b0f055ec1f4b41f749b9e3bf70254897aa799c64c05611987fccf6e2bad92360eb2493fd5c6ec132bca SHA512 e127c20a3c7fa2369633df185d8229b3fe511ee92afd3f0a05f34053f56a058f48dbe1072d3332ddb7ffdb3f8391d0c33c1c9b9a92ee49c5997ecded7c967638
+DIST firefox-77.0.1-pa-IN.xpi 603404 BLAKE2B 8cb486862452598e160f8974f1fb74a6cbf0d0524e6ad943bffa881ad8babdaa235f5df72ed9c73a704acafdea528e95a0857781894ab6a0a7be846d9d85d3d2 SHA512 c85857af3483356f25645bba385668c3b986575b564f3d1d47e88401c9311ec7290e6def9e3d4b6c79e6f9480e658b0326f34b61480424fa63da07e166abf3ed
+DIST firefox-77.0.1-pl.xpi 565658 BLAKE2B e25cd7b582af69463acb321666cb23f955f8839370b1294171d80fa5aae76ba75903ded235bb447e8ddd90bcf5503c9d9964b86bf662637f9d81c2631f9c0ca5 SHA512 69447a4381b9bbcab9007076d04de5938b4d092687b40189ca62a1c138b83f5e9f6e6cd735b0c29036144dfdca34ea2ad0debeb06424fc5a8414927082c3a1a4
+DIST firefox-77.0.1-pt-BR.xpi 550569 BLAKE2B 20800241b6995d6486e122c0f1f3da126a3083245d682c731cbb217a028fa70f25ca884a15610fcf0141315ffb076cde5730d27ef1113af526d96e314fb846cb SHA512 7d7d32b220f51f146a54d4a3652306e8e551e2d426e5b7f3e22d5f4aa81985b62fed2e1503ff76038fbaa0a5249e93be4062521ca4525f6efc981eb5f3405736
+DIST firefox-77.0.1-pt-PT.xpi 561743 BLAKE2B 6523e2e84790a23283fb9708cff74500978e6428dd1843281b285326ba7f9ef5cc205023922c131cd43842483ac3ec402c31e7b9b55544a79bf9720c94da4bea SHA512 0446f255af2db0475383279a3bd48f4ce9b84743161daf783bbb3e4e4720cdaff781603137e0cdd95249a2ddea6d4b1d7270bc75c44a7ddf0339983336345eca
+DIST firefox-77.0.1-rm.xpi 553786 BLAKE2B 7f469d94e00d7b8c3043ce3cb24e1e57667e3916a33da068c225a2f75f9d6710ac91bd55d9767d321e71c90060388de6a77f9617a50a730bdcdd21b310796a27 SHA512 f12d9d7d6a4bdfc9650c340597e249ca843cf5f509aea44c1fa09979d9af6aebb9c452cd4441260c8ed6ab32dcf144ba7ea220540ad46d8db71e58cb5c803b1d
+DIST firefox-77.0.1-ro.xpi 567574 BLAKE2B f62c153236fa072464517e09c0628df2d834b005bd7598cbedc52be6ddb48b2af8f6343b9bf47bf7cd64b40950a68e41f2b5b64dbcd1731078b39e064f47fe94 SHA512 dd89ddcd98a10eab280ed3f2ac8505dca534a201c54e47f1667f9dfa4c2720e3dd0885641257b4d00e6f30f2715cdcb552747280cc31a58c6d772444c92c1396
+DIST firefox-77.0.1-ru.xpi 647078 BLAKE2B ce076c8ff16bb9c17b1cb3c0e0f8e6ba8403d0797df547e55c25a9147ba96e3b607d8def09aa0cc2b12944bec3afa25215d7c23363f58e61736a0c25de539488 SHA512 f9e91e54af02a9c227f3f5a3e58e6d0cd3959e18172414fadd5d01cb62b7a8bd129d197eb2e4243224e59b2d2216ec1a4b6f926f0fbc8c49d48381259ab037e4
+DIST firefox-77.0.1-si.xpi 549952 BLAKE2B ad01489eb43f0aa65634bde207333c27af3f6bd53dc2b26d21c4e15840ff229f78c65c2b6e507889b98c98e6d8af0dc0f0997d2361d653202305b80a12b7d617 SHA512 8038b3f74282918c1d531c867d885938626803565e373fa32a3907e91c7fd7db52f691406b2004ef415b7812335bd6ec25a04a773ed8c41bbd551b953a3c0288
+DIST firefox-77.0.1-sk.xpi 580412 BLAKE2B b5afd0c8b65836c1901597bc6903c618caf2b4da871279cd9a0288071d18f18a43501ab388420d7babbfd5933ba46b65a546351ac69de3710b59fb99b68af281 SHA512 65fa08a791552ab733b94be03b49907fc10f57af22b2fcefca3d32d107d13df7a6bf4bc16bf49090e9d5f4b3c10722eaddbf8216dd47093ace73bfcc8308e5a9
+DIST firefox-77.0.1-sl.xpi 561268 BLAKE2B fa6b291f6daee9b18bf097bce3b0ba0680d61286b30cdc10cd3b7515245ef6452822da860cf088351d2f545193f55e17fc47c033ca13706eb86495490962175c SHA512 3f6ecc9d06a5c6caef7f9652a98592b558eef8b899c72ff4a9c046a92444cd94bfc4bd376691c89395da7054d0422384c016e419b703e374d3552a2e9d2348cb
+DIST firefox-77.0.1-son.xpi 473463 BLAKE2B 42339e880ebd731c3d73024516b12c96f3f49122a445000a290960fd0bcb9a63bfef92665364a174b4104591882b67c7e30c1118fbe5aacdf0e86b65877d8ad5 SHA512 b14db793687ad1c74c5a4c61531084759dff0aa4c00b4ba7e32593e6dc94170f794fec2791d5013bc35bf044afeb361b96e72ef0a3b20a6b059ae678ec2d65d5
+DIST firefox-77.0.1-sq.xpi 575019 BLAKE2B be39faa8b9be9a2ebfc6dd022970abeed7d0b0b97902382359b68e6e484da1848638667d1b7aa30c1b1b509f0ef484a6a560d48a17113c626affa893dd5cec61 SHA512 43e8c48954cbdd7578e5ab364a7acf93fc813ffd1342b22abec6d8844f721e5dee43f5638e4397a5d3771576e0f5d624474a639a4c260e8c358c7a545738b872
+DIST firefox-77.0.1-sr.xpi 602834 BLAKE2B 173550094e9262a72b3fefe84e4f454cb3da6dc6fef586e9a072ae40f7554e98eb1b22ee58a20d312951d9aa7da3f389bab0ab02c0e5f7dacfc54291fd35ff43 SHA512 3737b8bc0e9ab1f1d2a60b2b5314867aebd3df0e462a835fb0b16480ceeb99a6fc8443832611544a62d5e583e43c5db295685a7d485033fe0e1b38ed3059e13b
+DIST firefox-77.0.1-sv-SE.xpi 559177 BLAKE2B 42de70c428c6bef3808d49ab0fa282aebd403171fa90c6d42358a5a2d45167eaa3f114bda80090b9f25363732ba1bbfe1b3fa7ed54181ec31ea28bb79a26f7f0 SHA512 9c61b401d79be19852dcc0eff9f3ad0acd2777fee048b66da921ea14dec6dc06803ea5194857c5b44da8634fe7763e267932b07b491447c64c3066e15b9ca80f
+DIST firefox-77.0.1-ta.xpi 579186 BLAKE2B 7b7679ddfb97eb9d31012f5e3df4a456bd81946b40ee5a73863031af76bd67999ebc54e41bbd24cc8ffcc9562934acbcc9065de5375d8e1406e3b92e2fe7ca0d SHA512 cb62b9d28ee27c551c931d2973e2c7f1ae1e3c23dd6b283be5dfbee3fa71c9d80732a0147d3fc773f8b937587bea8d05818d6384bf9a6e159704c0ef76ee542e
+DIST firefox-77.0.1-te.xpi 599741 BLAKE2B 064c2a662dd11849d52e43bda8f63e3f8b13ec3a0a0c1ec4365f382435026fae9165e2ebaff433be8c928d5e4f9ea502b4d5f47511f0419db249d1e2c8965605 SHA512 5afd95976a2b553e27ae5e39161012b1238320d278e7fb12fb5f681b53a04b7e7ebeb65c7f61ee272381412d83e24ffea7d47865158dfffa6a38a98e41a5f0ea
+DIST firefox-77.0.1-th.xpi 624565 BLAKE2B 4a45220f23aa6aa6f3e0985a3c38c0f82bef27e02cf505c18a858b2d1cababab2eac3d3ad71236a089690cd24b0e91c6176c842a1ec16e68e629efa8bca54642 SHA512 129f5b675fb9d4a981d90f9a4887ff28b1c45823b6ece2bacefb0e49c27fa22443ac96f5cd7c9fb40a73d91095bf05bc92b2ea02ff9d74ba4884ea7674ee40e2
+DIST firefox-77.0.1-tr.xpi 573719 BLAKE2B 8567e8a9b719e4e727ea45073df4a7b3668f5bb1b6d51e5b03408bea30d798e22522f2f1d98bda0267dbbf986f582bb4a751bf7c3dfa3f311e76eaf506680d52 SHA512 0ac638a00ccbc8afebcc7f1d067d317060ff7cea2089bb5def59b0f0b1ad67f8f5bd2a0bb36faf1ed537527ba195748280ad4bed95086ddb0d3de60f1265f86d
+DIST firefox-77.0.1-uk.xpi 637128 BLAKE2B a074688c7e99078974c53e3bb1331d7567a07a2b05e7d113e7106bd4aedaa0be1f71bc11845d0afbd44563b1bb15698b94d6bdd08ca40a01ff40f15ebb33b717 SHA512 7fd03d79bfb43baad923f8b09d96f0ae867d59e9949467489901d7f5999ed79126d24fdb99545a5fbbd8d8ffb5906ddf08ea2912e272c52a90b7175af75c5d65
+DIST firefox-77.0.1-ur.xpi 610048 BLAKE2B e1953f125fe0d44b9f0fc5eab6b791f7a93022f74f30b27146876afc48b84c24177530f6b57570591919eb37fe84bdcfd1ec740f654d4921726325318a1ebcdb SHA512 9a9eeef68563e8d7dc050350d4dfec6a36c04d7916e1294e0c048b1ddebb9040d40cf6f2525c19b13760a12e9ab82e78266fdcb192b38c044eab8323a5dcc3be
+DIST firefox-77.0.1-uz.xpi 527675 BLAKE2B fc0f60453c05a2a5375daa941926e9f1730385d32662d2d817421fd0e9c1bb3e23f48a19138e4d05d9aabbe492ac4a2466a30d42c5f031b939b91972d2e66c1d SHA512 27688e62ecf0ce0fd162e29b3289d0af0c3b8bc8eaf9ab1d43ff8fceb949bba3a738ff605f951f8c70963e7694cb692a02c64c82c41bdaf90a019c42bd44fb04
+DIST firefox-77.0.1-vi.xpi 589973 BLAKE2B 2ca28aaafbff59a76ce8fdaced7c36da85f7747703d66668a81b3d4b22bb2d647cbc28a231be5a95b93484b16dabc794d76400d2461d440f93992813af08f098 SHA512 a884527951ace14ccaf0255a0d7c838e910450274a57261b1b60adb7099a6db79e90428c54fb6615bc1dbe862f9d2312046173f58d3bb39a88d2e9aa70e990f3
+DIST firefox-77.0.1-xh.xpi 478153 BLAKE2B dcd5c4e59100cd837b39e4203d4d46272653663530c07f7ce752abc9bc7cd5df1c6f7c74a6b2caa29c6e3f3520baccb0a2a876a65b4bc98064bd2454f2e1982c SHA512 7f79ad0298db406dd33be70760714ba7804a3c91a6252fb1f28b970800d4af54db7238e3dae6fc56437b90820a3cd8c0b1ce2beed62eeb2db99385ceeddd74d5
+DIST firefox-77.0.1-zh-CN.xpi 596100 BLAKE2B 440edc453f303cb4d90f9b665bd0ab421b3dd8849fe645ab02dff2111c7c1efe7c045f8c9febb68d536a51f10f4cbb496eafa39071af6431d11428d0638426fd SHA512 80aa55cc304cddd9fc299b1601ca20642129d23dac1807647fc7e14dcd868825b239baa239809ffb459c1685042e1433699bb3f9d86553eae83f8919fc1a32c2
+DIST firefox-77.0.1-zh-TW.xpi 595265 BLAKE2B 305b43f078a6696f63f721669180b502c2211a7a5d40682f4148e33015f921346865fb3df55a5b8a56fe92a6a86a3ab0ff0bd3f2cd0318e2299ab8dc17c70898 SHA512 5ab6fb6973146b47d5886c93481e010dc8dac0efe0f6ec4f8897cde2539a52a28850b460c27067657ef8a66ab555bce6201da6a3c1f27bc56214f1d9329674af
+DIST firefox-77.0.1.source.tar.xz 334037816 BLAKE2B 94aea1f4b39422333aeda71d296087f3309b595331488666641b20660607373d59f90d6840bafac6f83c3b5fb952f1a5d44a0972549ff9cf9a35a5036eb1565d SHA512 9e02e2842d18b9c94b24457788f117fad4730ca21d05ef8208eb85c6f58da3b0e75fcae8c8ebd38f69b86325b26684d0e5409b3d341898fe28b607e8bd949ef2
 EBUILD firefox-52.9.0-r1.ebuild 12968 BLAKE2B 4b6fe7e6fb4047b5c5fed6f29a3567ac5151491222b72286cf81520c3b190d4c03af03011bc9462389502d819a1eff0d01f60bfbfbaecc16339f66b43b71dd59 SHA512 dcedcf55cb579513c754cd305d2f6262b7331abc94f9846238c5163d232e02a420719146e5c27d073c48b38a4177a3654ae2686297034ef9c169857a5ab94e33
 EBUILD firefox-68.8.0.ebuild 28938 BLAKE2B e4235e70263a69440a40937878db5f93999cc011fce9518c6e5697100dee37282ef234721dc52c61c107ccbcd280ceff5354a6278c1e421ff133b499d9bb2f6e SHA512 c852cb1dc083cfb626a923ad9e641c30f289be8661b6d3bba761e30ab8e6be6dc3e6de941703260ac023dcc539b0c7d0a5bf9334888db49f0958e5f8faef0699
+EBUILD firefox-68.9.0.ebuild 28375 BLAKE2B 97eaa1906197e87afc6dc71a3112bba7ad2f05ee7f7d0ecce4b42092e0ff6d910d41dffb32f93482ad44ad41f40ee579b2ba21fb89278de2a883abbb7ac4ccfa SHA512 ac5a47fb988c2b60d2dba0e4ab6c396c605e373a1a8ef8a88f95e140730ca8b42f57021c34674539568fe795bdf80a007622b9ee001aea7f5551eea83466cb98
 EBUILD firefox-76.0-r1.ebuild 29276 BLAKE2B b5d5fea000fe59887331fe4f9b0effced9be2cdafbdf13a1e400f1ff39285f32897a40ade5a5a4c13b3a49b3c92767ae80f5d019ecb11849d525480d05eb8768 SHA512 5344e104e82403d2ee2271d9c9863b99a595a0034ca4f4d8d6f1e5f95a2250f91392505cc9285cef876082278c1da47f1507007b1278c6a4d0de004a3f078d00
 EBUILD firefox-76.0.1.ebuild 29276 BLAKE2B b5d5fea000fe59887331fe4f9b0effced9be2cdafbdf13a1e400f1ff39285f32897a40ade5a5a4c13b3a49b3c92767ae80f5d019ecb11849d525480d05eb8768 SHA512 5344e104e82403d2ee2271d9c9863b99a595a0034ca4f4d8d6f1e5f95a2250f91392505cc9285cef876082278c1da47f1507007b1278c6a4d0de004a3f078d00
+EBUILD firefox-77.0.1.ebuild 28931 BLAKE2B 6786ccb46d2dd07a491c60a79ffd62d6dedf666df67da5a4b2231b728614ee2afc184e70dfff39cd12362cb79cd9142f5b213fe65a869e50ad3eba57834042f4 SHA512 3f51058ee4fc7cf357e0224ede3439ead73a86c181cc2252b34c90f5d8bf62dc4bec6f2b5fa8f082f42ed5521d884464efe83b6db6fd94e2c0f8a98d32bd62a7
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/firefox-68.9.0.ebuild b/www-client/firefox/firefox-68.9.0.ebuild
new file mode 100644
index 000000000000..e700d55131d4
--- /dev/null
+++ b/www-client/firefox/firefox-68.9.0.ebuild
@@ -0,0 +1,898 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
+he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-68.0-patches-14"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=10
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 multiprocessing virtualx
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon
+	pgo pulseaudio +screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-sqlite +system-libvpx +system-webp test wayland wifi"
+
+REQUIRED_USE="pgo? ( lto )
+	wifi? ( dbus )"
+
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.44.3
+	>=dev-libs/nspr-4.21
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.8.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:10
+			!clang? ( sys-devel/llvm:10 )
+			clang? (
+				=sys-devel/lld-10*
+				sys-devel/llvm:10[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			!clang? ( sys-devel/llvm:9 )
+			clang? (
+				=sys-devel/lld-9*
+				sys-devel/llvm:9[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/rust-1.34.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+pkg_pretend() {
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			die "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	# Ensure we have enough disk space to compile
+	if use pgo || use lto || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Ensure we have enough disk space to compile
+	if use pgo || use lto || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_CACHE_HOME \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+
+	if has ccache ${FEATURES} ; then
+		if use clang && use pgo ; then
+			die "Using FEATURES=ccache with USE=clang and USE=pgo is currently known to be broken (bug #718632)."
+		fi
+	fi
+}
+
+src_unpack() {
+	default
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
+	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
+	eapply "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/toolchain.configure \
+		|| die "sed failed to set num_cores"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Bug 689358
+			append-cxxflags -flto
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened ; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang && ! use arm64; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot ; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist ; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes} ; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+
+	# Add StartupNotify=true bug 237317
+	local startup_notify="false"
+	if use startup-notification ; then
+		startup_notify="true"
+	fi
+
+	local display_protocols="auto X11" use_wayland="false"
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command='firefox-wayland --name firefox-wayland'
+				newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox'
+				;;
+		esac
+
+		newmenu "${FILESDIR}/icon/${PN}-r1.desktop" "${desktop_filename}"
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
+			"${ED%/}/usr/share/applications/${desktop_filename}" || die
+	done
+
+	rm "${ED%/}"/usr/bin/firefox || die
+	newbin "${FILESDIR}"/firefox.sh firefox
+
+	local wrapper
+	for wrapper in \
+		"${ED%/}"/usr/bin/firefox \
+		"${ED%/}"/usr/bin/firefox-x11 \
+		"${ED%/}"/usr/bin/firefox-wayland \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" || die
+	done
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 68.6.0-r3 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 68.6.0-r3 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/firefox/firefox-77.0.1.ebuild b/www-client/firefox/firefox-77.0.1.ebuild
new file mode 100644
index 000000000000..6cb866d4005d
--- /dev/null
+++ b/www-client/firefox/firefox-77.0.1.ebuild
@@ -0,0 +1,917 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
+he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-77.0-patches-01_pre7"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=10
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 multiprocessing \
+		pax-utils xdg-utils autotools mozlinguas-v2 virtualx \
+		eapi7-ver
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist +clang cpu_flags_x86_avx2 debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo
+	pulseaudio +screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx
+	+system-webp test wayland wifi"
+
+REQUIRED_USE="pgo? ( lto )"
+
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.52.1
+	>=dev-libs/nspr-4.25
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	sys-apps/dbus
+	dev-libs/dbus-glib
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.6.4:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-64.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.14.1
+	>=net-libs/nodejs-10.19.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:10
+			!clang? ( sys-devel/llvm:10 )
+			clang? (
+				=sys-devel/lld-10*
+				sys-devel/llvm:10[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			!clang? ( sys-devel/llvm:9 )
+			clang? (
+				=sys-devel/lld-9*
+				sys-devel/llvm:9[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+	)
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	>=virtual/rust-1.41.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+pkg_pretend() {
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			die "You must enable usersandbox as X server can not run as root!"
+		fi
+
+		if ! use clang ; then
+			# Force user decision so they don't find out firefox was build
+			# without pgo after spending some hours
+			eerror "USE=pgo when using GCC is currently known to be broken."
+			eerror "Either switch to USE=clang or temporarily set USE=-pgo."
+			die "USE=pgo without USE=clang is currently known to be broken."
+		fi
+	fi
+
+	if ! use clang && [[ $(gcc-major-version) -eq 10 ]] ; then
+		# bug 727028
+		use ppc64 || die "Using GCC 10 to compile firefox is currently known to be broken. Set USE=clang or select <gcc-10 to continue."
+	fi
+
+	# Ensure we have enough disk space to compile
+	if use pgo || use lto || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Ensure we have enough disk space to compile
+	if use pgo || use lto || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_CACHE_HOME \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+
+	if has ccache ${FEATURES} ; then
+		if use clang && use pgo ; then
+			die "Using FEATURES=ccache with USE=clang and USE=pgo is currently known to be broken (bug #718632)."
+		fi
+	fi
+}
+
+src_unpack() {
+	default
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/firefox"
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+
+	# Clear checksums that present a problem
+	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json || die
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# libclang.so is not properly detected work around issue
+	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,now"
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang && ! use arm64; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot ; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist ; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes} ; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+
+	# Add StartupNotify=true bug 237317
+	local startup_notify="false"
+	if use startup-notification ; then
+		startup_notify="true"
+	fi
+
+	local display_protocols="auto X11" use_wayland="false"
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command='firefox-wayland --name firefox-wayland'
+				newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox'
+				;;
+		esac
+
+		newmenu "${FILESDIR}/icon/${PN}-r1.desktop" "${desktop_filename}"
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			-e "s:@STARTUP_NOTIFY@:${startup_notify}:" \
+			"${ED%/}/usr/share/applications/${desktop_filename}" || die
+	done
+
+	rm "${ED%/}"/usr/bin/firefox || die
+	newbin "${FILESDIR}"/firefox.sh firefox
+
+	local wrapper
+	for wrapper in \
+		"${ED%/}"/usr/bin/firefox \
+		"${ED%/}"/usr/bin/firefox-x11 \
+		"${ED%/}"/usr/bin/firefox-wayland \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" || die
+	done
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 536894c04db0..8265a36194d2 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_83.0.4103.61-1_amd64.deb 68678632 BLAKE2B 3eaa8eadeacd05bff17ce5bb8c295df3d9f791113249328977e233e616bb993aa1aa7f9bb332de238099fb6f62c56646e02c58cb314c41d50bb778f5ac322017 SHA512 735a75aef147829158645d6e14744ab075331396f68cc4eb8565c17f0753e96066a26172badd7b847f5b570b7cb1c319a67ff299a4f7db77c33a90879aa87c69
-EBUILD google-chrome-83.0.4103.61.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-stable_83.0.4103.97-1_amd64.deb 68654544 BLAKE2B 0c8392c8504e5d5412a15540abfb73a1708f31f5626fd8870031cd1b2a3d49701018d2571d5a232399e1dcdeba39346883de411a46beba4c66b245cba4621359 SHA512 3106979ebeedd32405fa9205e5e2369bea0199b72d2d3238f5124e196791277c7fa7ce387c18460b5a220818f12c622981c21e3e4c3049beed02345a6255a828
+EBUILD google-chrome-83.0.4103.97.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.61.ebuild b/www-client/google-chrome/google-chrome-83.0.4103.97.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-83.0.4103.61.ebuild
rename to www-client/google-chrome/google-chrome-83.0.4103.97.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 42de56bbecd1..83e30758ec25 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,4 +1,5 @@
+AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
 DIST links-2.20.2.tar.bz2 6474383 BLAKE2B c69c421a85114b3dc0d7f2b37ce5454655b426ea9463c80e4a826f02374c0740d963251b4e9ed6c960dcad15403511c33f3a2e199a728e8f5425a359963bd102 SHA512 82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152
-EBUILD links-2.20.2-r1.ebuild 3469 BLAKE2B 9548283e6c931cae6c7a2649ddc577d2a0c495b01e1f993cd58505d6bd4e8fe6d4b32ffc766b3631aad426618dc5a8fed2bfdc6d5a947c0767859a1b40b7ac25 SHA512 ec62145f57ff094f5b494a9bea3dfed196e05550f60ca2ea49f7b8dbce06d38c8910ac4f8a83f7990d87b07424c6d5b6486e34c25ab8b3fa4f3085e74c33ae59
+EBUILD links-2.20.2-r1.ebuild 3523 BLAKE2B c274db743c6eb206a7576800b5a86d60568d456488b550b6b1977844fd4ec9768e423af9c2ecefca7c75508021289a6c948a819eae7766f5af30d75090d861b9 SHA512 1994bd36ddfa75cb55b093acb0bb3b36b282634c1f65842c4bcc9a64d76c295ae988fb714a5ea278661b898d2509f5b39f98c421c10c663c1b1db81c5e1eab5c
 EBUILD links-2.20.2.ebuild 3414 BLAKE2B 1cb7231e2c4b73d134f0e4109b57d340311e32196c3cefd8f2fd50bea8af94f18946bfb3bfbb510e05d94ec122bd06070b35ef38525645665bd29c9720dae013 SHA512 7c493d283ec1a272b8f85e8bfc60c68f1e501aac5507882626effa974904de8aa8bccc3f87d71516ebf202e29257ba6c0cfb7d95663fb13696d4a648a6c5234a
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/files/swap-echo-for-printf.patch b/www-client/links/files/swap-echo-for-printf.patch
new file mode 100644
index 000000000000..9681a624ed2b
--- /dev/null
+++ b/www-client/links/files/swap-echo-for-printf.patch
@@ -0,0 +1,26 @@
+"echo -n" is not POSIX compliant but printf is.
+See "man 1p echo" section "APPLICATION USAGE" or visit
+https://www.in-ulm.de/%7Emascheck/various/echo+printf/
+
+--- a/intl/synclang.orig	2020-06-03 19:13:38.082539276 -0000
++++ b/intl/synclang	2020-06-03 19:13:59.122352023 -0000
+@@ -6,7 +6,7 @@
+ if [ -n "$languages" ]; then
+ 	for i in $languages; do
+ 		if [ "$i" != english ]; then
+-			echo -n $i" " 1>&2
++			printf '%s ' "$i" 1>&2
+ 			awk -f synclang.awk <$i.lng | sed 's/
//g' >_sync.tmp
+ 			mv $i.lng ../intl-bak/$i.lng.bak
+ 			mv _sync.tmp $i.lng
+--- a/intl/gen-intl.orig	2020-06-03 19:14:37.258679373 -0000
++++ b/intl/gen-intl	2020-06-03 19:14:47.651920249 -0000
+@@ -10,7 +10,7 @@
+ n=0
+ echo '/* Automatically generated by gen-intl */'
+ for i in $languages; do
+-	echo -n $i" " 1>&2
++	printf '%s ' "$i" 1>&2
+ 	if test `cat $i.lng|wc -l` != `cat english.lng|wc -l`; then
+ 		echo 1>&2
+ 		echo 1>&2
diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild
index a36d03fe29a6..0c528094f163 100644
--- a/www-client/links/links-2.20.2-r1.ebuild
+++ b/www-client/links/links-2.20.2-r1.ebuild
@@ -83,6 +83,8 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
 
 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
 
+PATCHES=( "${FILESDIR}/swap-echo-for-printf.patch" )
+
 src_prepare() {
 	use X && xdg_environment_reset
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 5d935556ef5e..f5de8d78bc2a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-3.1.1921.3_p1-amd64.deb 70974412 BLAKE2B 2793582d4c367bb073502146ea1ca6a3cef22b6f342fda71802b88266eaca6e932791e22f8e4311be19788bd2b7912b677defaf68924f2773554f1bb7da9dece SHA512 2bc075e5e074b050a33e62901ec969032eb083b3485c4420f1f981336dc48c647b53711baca3cbc7bdf0de19b16cacde07a49c848b15c901fdecbbecf420dd26
-DIST vivaldi-snapshot-3.1.1921.3_p1-arm64.deb 63446744 BLAKE2B fe666a6c05a8116450aa9f8270bfda43b607425faf6957faf8324be68f381e897e9997ec85b1c592f29e52786073b7ec54f8cd810e64551816f895ece9154bf3 SHA512 84c0f05a06087d3a2d147b05c04e51dc75c2d1178abe05fc0380dacb9f9548d0565041f3e877dea43dcb11a2f16e339ea4b684b6282e91b1ab24ea34c09dd3df
-DIST vivaldi-snapshot-3.1.1921.3_p1-armhf.deb 62898684 BLAKE2B e26b4bfb073f30538c6c69718d9a1cb84ec7ff0a63dccabf801ec8927a0ea18c93dc5803e445d729f9b72377d4718203a15eef04c909fdf4f25e90ea55aae9f8 SHA512 29277d55a40ae6d734ec816f9005136a262e1544ae0d4f0a25a97260c64dc5a947c4cdd6e1c839af141cafbced4b08ca226a3d10d42dc6e3af2042251c310275
-DIST vivaldi-snapshot-3.1.1921.3_p1-i386.deb 69350036 BLAKE2B 1d64d63aff5f72a87f3b35e4db000216683d0d1bd5c5b8da37276de080b4d2ce5b6128fdebe04e94df95d4aeefb2cf885b5e0a4c8b5e2a850b420e4389061b74 SHA512 f338d808b35c96ce41411a6b9f27360f6a10eae1aaaee6572cada311589e55018e13eb13b085dad7b2744726dedafe1df27e6eb901d5f914f5901be0da1d5fa3
+DIST vivaldi-snapshot-3.1.1929.13_p1-amd64.deb 70993044 BLAKE2B a0ba2b7a7e6e2db8b35be5b2fa6ef13d5d2e041f163acb66145af1045323c9f0dd05e6ec16d7661ed0f48f63084b2b09e6451b197b994efb41b77b69c61e42b5 SHA512 20a5f6a52c600d0bdc3849eca96cea536125d159a4e3d53a56f0554e9ccd582fb8db6ab66924e85c1958d3db216050568dc6e41ff2619204a47b608f2564e22a
+DIST vivaldi-snapshot-3.1.1929.13_p1-arm64.deb 63464636 BLAKE2B c80ccf364e0e4d69238a65e152064856385942f11434876ffb4d14dd82397a8c02dd8dc17f769bca7b688f86d0738ae30252c2f014f32e7fbca0012c5cf561e8 SHA512 74579c45c827c0552fc4ddc7990587eaf4554c4a15cb7e0efe8a42df83e263ebc2f0e689e1ff1a62129234c3a39783ad30a4ee0496161338ad3e6b21afc3989c
+DIST vivaldi-snapshot-3.1.1929.13_p1-armhf.deb 62909032 BLAKE2B bde9d7550a58fa6ed5e70ddc8a8786f7266b2de4edef401724f47f79b36e61afd83d1943d45732bf596a653357a5b7126e5b7e816281281885e40efa75ec2ce7 SHA512 3ca51d8fc00b5beb83bb8e514b974c06f2e76bdf98fcfc119da0842b6176a448507fa6207e1709e5ed7d5be7971223007e91b2f367d2fe9bc2872c3c53e53737
+DIST vivaldi-snapshot-3.1.1929.13_p1-i386.deb 69371436 BLAKE2B c094b87507d1a9446a8e489f3231d69aa428e0682e2c1e3b7d49f8bb40b39d114eb1138ba98507a02f981e1a5e9b50349a3df1884926ba85253d278b05db69a8 SHA512 07843feb5082107291246464fe3fc4c0ccfb2bc5507abc10d0ac44c5478f84461e10698f29fee98d3854933507b7a588379b0c35a3614f79bd174d6bdac1287f
 DIST vivaldi-snapshot-3.1.1929.3_p1-amd64.deb 70973368 BLAKE2B 7388db75bd055294e5076d29e16538edb4ac2d7adae73b51c20e6d3f3f31b4e00c3325719275c750445e0be7f4413f7ef410667ffc725f488963175ba81cd0d5 SHA512 a2e7f99b411547811981c617f4c2f03a59ee9593878351a108f35128d98cedcc6e40a9336c7ddcce5d154801b6e1802d2e5ca15fadf8bea69d63433c3786a8ea
 DIST vivaldi-snapshot-3.1.1929.3_p1-arm64.deb 63495944 BLAKE2B 35ce0b07201861453bf5a91ab8dfb9496f260e456781de9803a159bf11fbff4420e64631fca429f5384d236900a2d85ac0348867ef866e4a1f09db0bec1add37 SHA512 e386716075ec98357a4db30a94860432aad25fa6a84fd90400f200ae3e21055831535140ad4a9ffb396367ad57c433e12a7d796a12d0ba4eb78e0cf58dc9b617
 DIST vivaldi-snapshot-3.1.1929.3_p1-armhf.deb 62885396 BLAKE2B 25f1a9cfbfddb16d8bd7641517de75dbe35b6a66e1b825bc90ee31d02c4808e8ea5ea864b141e1ff3260f503bcaaa2484a29b1dd175e265dd951f732c6740720 SHA512 d872227f3d591c0693edac08cd4d0b832c5b46dd0325f8c5719e3d305c71ae94c103196c01348551a0d93cc197da52bdddef82f2286113972a124a4ae604acea
 DIST vivaldi-snapshot-3.1.1929.3_p1-i386.deb 69366008 BLAKE2B 4248d95a411eef16acfff2ca762c7010c3215ee38ad1505b6689d9817c0054b5c5a11e1ed642e92068cb2644fdcad3ef8d4a54db81403eee9c50770dfd9b0341 SHA512 466283e2344ce371ef46e7fd47264c2dbfcaca0075c2dd072064b7fc37b5c087f0cfe4343ae8530999ecc67bd0036e7ed0c3a6df327191ebda9b3f808e037593
-EBUILD vivaldi-snapshot-3.1.1921.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.1.1929.13_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 EBUILD vivaldi-snapshot-3.1.1929.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.1.1921.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.1.1929.13_p1.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-3.1.1921.3_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-3.1.1929.13_p1.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index d0e9eafcea9f..f6922a1d4366 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index f956591e8476..2ef39f8cfdc2 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.30-1_amd64.deb 69636036 BLAKE2B 316b51e72a85154639b14302dc63295061aea1ff119216252e5538751574df6c9bf6fea38836105091b0922115b6c633d99f5c2724f995a2e6ba858389d530d7 SHA512 0adf8e38f71490d41690fd698de74edd5e161c2c9f9b666287d5b3e57f9a0099f518b3db2550eaa0e90138baab4f2ca07a24474d52b062149756b297f39afc3e
-DIST google-chrome-stable_83.0.4103.61-1_amd64.deb 68678632 BLAKE2B 3eaa8eadeacd05bff17ce5bb8c295df3d9f791113249328977e233e616bb993aa1aa7f9bb332de238099fb6f62c56646e02c58cb314c41d50bb778f5ac322017 SHA512 735a75aef147829158645d6e14744ab075331396f68cc4eb8565c17f0753e96066a26172badd7b847f5b570b7cb1c319a67ff299a4f7db77c33a90879aa87c69
+DIST google-chrome-stable_83.0.4103.97-1_amd64.deb 68654544 BLAKE2B 0c8392c8504e5d5412a15540abfb73a1708f31f5626fd8870031cd1b2a3d49701018d2571d5a232399e1dcdeba39346883de411a46beba4c66b245cba4621359 SHA512 3106979ebeedd32405fa9205e5e2369bea0199b72d2d3238f5124e196791277c7fa7ce387c18460b5a220818f12c622981c21e3e4c3049beed02345a6255a828
 DIST google-chrome-unstable_85.0.4158.4-1_amd64.deb 69912664 BLAKE2B f8a85afd12c6138b784e54ac7f48aff44ebfebed6edbd68ddf6916657a1577e85c9cf0ec9c4c88f0ff745994709928b175f50be5c6de27e336d3179535a6e3b5 SHA512 665e3fa8c2b1eab21ebb68ca6184af781e1b2b89cbef1f20d8cbf0f71eccbb46e32e47130f0d16c20450a817baf31c89e7d63a26c9f6dc92469515ba3e64cfb0
-EBUILD chrome-binary-plugins-83.0.4103.61.ebuild 1170 BLAKE2B 269453f5870654b3c127e92371b5de5a3d8f04d491aad18a823fbde9aeff8bab64c15ee11edc474f23c34715733bc38ad42888c7e2b42e5a1e00938a9daee640 SHA512 66aa14b8354b1d3909a8cdba157c8869e1eda230893cfcd9ff58b8a92fb45929076e6bdeee9fb8553735ede830d6966899bb6ab74e1e083f3523138b8044599b
+EBUILD chrome-binary-plugins-83.0.4103.97.ebuild 1170 BLAKE2B 269453f5870654b3c127e92371b5de5a3d8f04d491aad18a823fbde9aeff8bab64c15ee11edc474f23c34715733bc38ad42888c7e2b42e5a1e00938a9daee640 SHA512 66aa14b8354b1d3909a8cdba157c8869e1eda230893cfcd9ff58b8a92fb45929076e6bdeee9fb8553735ede830d6966899bb6ab74e1e083f3523138b8044599b
 EBUILD chrome-binary-plugins-84.0.4147.30_beta.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
 EBUILD chrome-binary-plugins-85.0.4158.4_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.61.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.97.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.61.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.97.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 6061fde02cf1..3e57b51b6da5 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index c76d01c2d5bd..fe2eb6559d69 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -27,7 +27,6 @@ DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B a1ed76cb31cd4f7a349bcbe63d75
 DIST ngx_http_geoip2_module-3.3.tar.gz 8509 BLAKE2B 4841e1bdd13b9b85f34732d1eb7447638f62bb09e1bd480da0fa8b0085d3b2d90a740732ef534c355feb71d7db613c73f68a4e6e3624b47a0937be046dfa1f8d SHA512 06963b598c54e22d75ce837fb222f5aa6c9494c29e558ff46f1205d7159fc305414bfac4ed3288c836dcbf7628d92f26458e1992d34fc2f4b73275a32847bdc0
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
 DIST ngx_http_lua-0.10.15.tar.gz 655110 BLAKE2B 73bf8e2f157c93f3d4e54b5aa63deb266731a10e3e48b2257756efee8d752e86440ca9c27bd27bc1d90075a5ffb58772eecb7c445db44cd055d2b9e0b4bac082 SHA512 1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7
-DIST ngx_http_lua-0.10.16rc5.tar.gz 646734 BLAKE2B a122bd16999fa45303dc9a860a992c22c31ad64f56df5ab9f90274b91a1c073cbb29e29a1befc347a11f1024926b51ee5f1cac154beff63359beeaafbc5b0fe3 SHA512 da98161be84a4f829cb105ee46e5c1e3c91d2d3b473b0bee26fb1c4dec00137c814f37996b83e52d898ec1ff43e3bd5178b1621cb6e3ec6bc1629896ac6e7110
 DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
 DIST ngx_http_push_stream-0.5.4.tar.gz 183493 BLAKE2B ccae3113071cee38fa6a7accd580922dc2fc9fa22af737f400c2c5f59352d93ca6cceb47f2aee70dfc111afdf98d27aeb64ddc5a4dbf617359ea4da09486ac7f SHA512 467ae49409adb675979ff591f98df8c96d71ab5ebc2ef9b3c9430e38e7e84d311b4a98c2b1cb1886d895735223dd2a43370aab61b57b34adb1427c184e6b8c86
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46b33374c57351c7f022eae0351d6961680abb03d896e7f058e67c43c4fee300253354feccb92d00e62bf91250e251e1860ec03 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d
@@ -40,5 +39,5 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.4.1.tar.gz 422917 BLAKE2B 8a6b9c06b74256289636e06437a8160a0e91767959cd2c4dde4f6769437b2654cd2aa6e65902251bd135429c87ef497f7137ffe0afee72c2723d147db8615810 SHA512 58ae280be37ac0402886281837b82a7038ea62d3bde5a0857d8008806937b2d11fe4984986b1e40bd9528ee8d2f5aac271346dc387f30930161cc2b41aa08998
 EBUILD nginx-1.18.0-r1.ebuild 40661 BLAKE2B cf9eb996481901b29b34fb5538f92fa85ef59baa5d7672dc9d9be90e350315ccee32f5c78e70d5697914873c8b383ec4d21531c6afe7b7149b114bcf9e1f9e14 SHA512 9b58768f7b0b2b214bebda3ee36c45478ad79aa0615ebe07478a37a72ec1c5e849afa9edf46df6c37eccc89dfde1dc73b8205df1ec556e6000f03ff4fe318cba
-EBUILD nginx-1.19.0.ebuild 40666 BLAKE2B ecfe54b153249daca1a53b545edc4f4119c52b4e96781372f92ac62d2ea71d5ddfd5d953ad42214d9624bdf3aa1f0090324e6e48d513a0508dcc043ab7c9947c SHA512 aab734b75f015dc82f9840d75353748beec5b84d543f0d27d789b2585d62e5482b75a5355809f82dcf5bceb325d7486d2a93baeeb745dc0c428b2c7acf9ee3b9
+EBUILD nginx-1.19.0-r1.ebuild 40663 BLAKE2B 6322ac6bfbe2801f41263a3757b673c24650b79bceef15fc8152dce753f9f248ad411e71239c24532597e1c7d3b3a1bd9f30baafd3d6f20ced87ed7b3a91c1c5 SHA512 03d9a202db43be165654a99f4f58521c6960fe5068c5f5eabbd4fcf4ecbc210a602df4ac27f665c32d9ff5d9386850aa8d39a499dae7ecab427db5a0e8988f49
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.19.0.ebuild b/www-servers/nginx/nginx-1.19.0-r1.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.19.0.ebuild
rename to www-servers/nginx/nginx-1.19.0-r1.ebuild
index ab215dc844a1..fafd960ce178 100644
--- a/www-servers/nginx/nginx-1.19.0.ebuild
+++ b/www-servers/nginx/nginx-1.19.0-r1.ebuild
@@ -59,7 +59,7 @@ HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v
 HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
 
 # http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.16rc5"
+HTTP_LUA_MODULE_PV="0.10.15"
 HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
 HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 56d72c84f987..3af4d9ef63cb 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -2,5 +2,5 @@ AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f5
 DIST puma-3.12.4.tar.gz 219148 BLAKE2B d9fcef62474a1522c29f13fb2572c99bd6d4217bc94febb9c4fe6e699808ad0002fcd88dfd16884a5a9c7296e4d6dd08bc50ce7278f41608678feb18e3a034b4 SHA512 302505512b04c68f9794461b0e7693cd3ff4dfb325b18e50f0f659649c7f504f55765437382557c65bce45d32a1710ab16a875d1fc6d143d4ca297d2b2333108
 DIST puma-4.3.3.tar.gz 241756 BLAKE2B a6ff66a449bf04110b4a6e9bdaa740f1144076290f1733922ecab45b5b7e6115ee1f7431b280401adb866838b539b943a35a5955f6d7cf51075941e05451e655 SHA512 1ee81c8d144466a75d5110fd3545527c36af51d2e191c171a985944206524c10a2b4e35fb535e2a1a0a3af5d460a7071ceb9233fae8dc81784643c6b9dc06e6e
 EBUILD puma-3.12.4.ebuild 2052 BLAKE2B e53818548f6ef533e350689273a7be372e383f21ffb1c1e20db9d3c6b50072e0220960f6295c911a442ca41af4a3c98ff27c3ca1b07f96514bdb54351886c8d7 SHA512 c858c379c926f513d2d81e4667d8626642e2e76a7afcb5b3506829a726bc7f57768315f58d88109a45516e9fc4cde879ad7384f5d1a45f347320529e9e596a42
-EBUILD puma-4.3.3.ebuild 2127 BLAKE2B 8a73ebcb22058b32d090e6e2eb6eb5b4a2b9234b2243458e5ae2ab11f43d47aa19d4399c37414ee726b56837c6e45db5e0b886a0827eedc9d109485738c6b1fa SHA512 b4623a2a576024d05b37ba0580a57cf9c7f09a125bcea57e67b9b373a1d195a51f93c7749d122a9add5e323f1d791280b82e84e33bfbfbc9d10ab0c51cdc5813
+EBUILD puma-4.3.3.ebuild 2134 BLAKE2B d3491e5a8f671267931b9b602936a60fff1341516c2f5ebf358c63f649788746d52e57d7842b14c35749c27d31f2c689d8c46f483c1baf28d588176512bfb5dc SHA512 bdb7b3afdff870d38c03d68fae15c112f50910f8b5bcfc8f8b5e9b961e12f6fe33e040edcbbacf816ba15d597bc457e7441fb74f7e72c53e12d673ed1ac603d5
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-4.3.3.ebuild b/www-servers/puma/puma-4.3.3.ebuild
index 184d12b0c48f..20e753cc834a 100644
--- a/www-servers/puma/puma-4.3.3.ebuild
+++ b/www-servers/puma/puma-4.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index d10724833579..6268b4d81541 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,5 +1,5 @@
 AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5500b81330c43b752aca8f3fce53cd08d4f007a69279668c7d212c74ff0682a3e37ae0ec545744836c8 SHA512 0b0d5754de17dd691ead380a93526aa7fbdd432359b248ce06f030daefb1ad96e4a81fe5319557fb66602baccb45a0febf6417ec7b79eee91e1e070d9a852b90
 AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
-EBUILD spawn-fcgi-1.6.4-r1.ebuild 742 BLAKE2B b77d2240cd938e6c86e9a200af40b07fcaf2cb76ed5a8b216188574f20c9d6421d1d366ef6a406f8f62db71722975b5cdfac342e7705c97d0210abf8a0018127 SHA512 cc09010c5c3d008051670e81661e9602a1d6edd358bb27fdc192a5202cc38306063e8fadc795a3b81aaca84fd0486e88e78c86edf2e0ac654c185c23532acc5c
+EBUILD spawn-fcgi-1.6.4-r1.ebuild 744 BLAKE2B 3d86297ab6aea367f10b9afa00ab670223e4c189a23503b136436e0be9269a41a242d1f26ce92f383b1b59a6d4f963262a4e9fe2caeef64333d42d3118767fd6 SHA512 d81f3b0d9e568485784e66a74163945e29b4c62df392966559a4f29623f695b6a0b339e2b808378f0e1e147e5c583aae32d4e94756f4e6b9609322203c513145
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
index 9c7665315626..3b19292350dd 100644
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
-HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.xz"
+HOMEPAGE="https://redmine.lighttpd.net/projects/spawn-fcgi"
+SRC_URI="https://www.lighttpd.net/download/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 8286b4ef1fc4..88a199c1b91d 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 0664ec52e1b3..a24c13b489ca 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,6 +1,6 @@
 DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
 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 2428 BLAKE2B 4892f54073a77fbe6e1fcb3cf803f7b681b9b4d3cf862e327dcd490b00513c8d815e1a872ba88bd5dc81cc3d85a1a37bee76da9e38349f600412d9c4f80308c5 SHA512 77ec10d17a40ffd70901914d4e67c286004432b7f71a5e368b46cd9d771d19ed82d1626aff8244b676a67550766c16f117d7be8f0c339d40c530271ac1c81100
-EBUILD igt-gpu-tools-9999.ebuild 2428 BLAKE2B 4892f54073a77fbe6e1fcb3cf803f7b681b9b4d3cf862e327dcd490b00513c8d815e1a872ba88bd5dc81cc3d85a1a37bee76da9e38349f600412d9c4f80308c5 SHA512 77ec10d17a40ffd70901914d4e67c286004432b7f71a5e368b46cd9d771d19ed82d1626aff8244b676a67550766c16f117d7be8f0c339d40c530271ac1c81100
-MISC metadata.xml 673 BLAKE2B 02cde7d4028a16cef77b898e88892e8d459f058c4894b8b738cd4e394562cb9ba529ad20d2d25e79f2f6ac8720ebba5d41ec1439abb7399dec9b743cb6460041 SHA512 881ce13108dbc798afd31e68fdbcd9d4cf7631f0be5776bc9eeb6c9948f9080fb098d05b96d193e26044e9435e8312c711e08fc9e0348e4a525a083c7527e036
+EBUILD igt-gpu-tools-1.25.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd
+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/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index e87a5ccf4a7a..b202d340de99 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
@@ -20,13 +20,14 @@ else
 fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+IUSE="chamelium doc man overlay runner tests 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 )
 	)
+	doc? ( tests )
 "
 RESTRICT="test"
 
@@ -93,7 +94,7 @@ src_configure() {
 		$(meson_feature man)
 		$(meson_feature overlay)
 		$(meson_feature runner)
-		$(meson_feature doc tests) # Test build is required for docs
+		$(meson_feature tests)
 		$(meson_feature valgrind)
 		$(meson_feature unwind libunwind)
 		-Doverlay_backends=${overlay_backends%?}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index e87a5ccf4a7a..b202d340de99 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -20,13 +20,14 @@ else
 fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+IUSE="chamelium doc man overlay runner tests 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 )
 	)
+	doc? ( tests )
 "
 RESTRICT="test"
 
@@ -93,7 +94,7 @@ src_configure() {
 		$(meson_feature man)
 		$(meson_feature overlay)
 		$(meson_feature runner)
-		$(meson_feature doc tests) # Test build is required for docs
+		$(meson_feature tests)
 		$(meson_feature valgrind)
 		$(meson_feature unwind libunwind)
 		-Doverlay_backends=${overlay_backends%?}
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index 887359bbc727..a8687797712f 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -10,6 +10,7 @@
  <flag name="man">Build and install man pages</flag>
  <flag name="overlay">Build the intel-gpu-overlay utility</flag>
  <flag name="runner">Build the test runner</flag>
+ <flag name="tests">Build and install tests</flag>
  <flag name="valgrind">Support valgrind annotations</flag>
  <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
  <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f0291b47ff00..85b0477cc3f0 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 6aac922bda5f..30a17c46a8a8 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 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
-EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2080 BLAKE2B c3c96fbc74ec7b2c203625b9e5deeed46b129f43f9fe43ea926a54114a8bd5c9dee3588a57658451c80543c464130a28633757d6e876b65ba4b8ca8e4efe3ed8 SHA512 2c41e34a76da2cf56d354eb6dbc57cc5ce921fde1371c3c00b6e3491021a391f1fbf986d685507b3b31c8ceecae8b31605b1b2a7389a355ff7cfac946287ad51
+EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2079 BLAKE2B 51414ab176cbf00bddeb9cfa30c7b641a57b40af27a834870b0de0e455116bfbd4180465e524b275316f466fe2c9c930a54b5481ef8c740d821af6f61129fa5c SHA512 4a42991c06f1a9dfef48bbbd3e60fb34c7522679a22985aed8a6c5d2f886b207e5a4581576c134a30d149aebf610e930253fa7e87807b70708a92f0c1d4abb7b
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
index c8eeed761446..9370f9727f2b 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+downloa
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="appindicator branding"
 
 COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index b024e883e61f..a42798d3b1d8 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,5 +6,5 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 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 4269 BLAKE2B 43615f719c69291e9e6dfc602ac6e093968e974c93c8f70fbdd77a08d835bc96f46a311fec518872cc7c4651af3244fffdb122579a353a56f4ad2a84ac4e1910 SHA512 077850b3f85078e822aed1e90148a6abdd59613d281de0b60eebaa6e6da4ca32dd1d8b069f0bda53fa3cf68b66f77605360b4cacef51c1364dae8e3d9a24d933
+EBUILD lightdm-1.30.0.ebuild 4268 BLAKE2B d7b769b288a667d147dbc90a285cdaeccb8feb242d4430a6fc977292948326ff3cbccf2d7d56e21a0e2f90ccc4759b948379c8f567e39d61d401c04b7a2ddef6 SHA512 823bbf8e20a1d7161d36740917e77d2f478fd016b75be2efd3cc3b2944d3fd609ba0e3e209a7d6fbe962dfa2495ffeff01d22bb76afe5ee54a1ebe841b581a2b
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
index 1d2ebf04158b..de2fd31a1c2b 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index c44452217bd1..8e5623c833a4 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -2,5 +2,5 @@ AUX qlipper-5.0.0-build.patch 1690 BLAKE2B 904b17740275aba865f5dc619a4dd95862f2c
 DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642
 DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
 EBUILD qlipper-5.0.0.ebuild 774 BLAKE2B d416c001338ac1b644282e4d2ab6c9153030a77c6d73d9ed27c55f98120f11d09a4bfbf6440b64c5352ae58f7b6d59b7d3fb0e9426d6b714d4d7308a8346ec4c SHA512 214ef740bea26e7646f77fee465aba7f25f566783503e5b66556e537cfb29cdca6588614a4de1645c01d84fb7fdfd6830d0285f77d1debf1c6c80e8f6dff0b51
-EBUILD qlipper-5.1.2.ebuild 670 BLAKE2B ecf92f459f85223e30131a5161c04b0ffe04bf8a3561deee0fd95b427d8981e922a40daa399f060a9926701a28635aa23cb5f11f44f2972e46fa85c0cb615e34 SHA512 faf2c1784c69bdbd5fd1aaca1ad90bd4f3e84ef6b4c00a23b82a2b0a9be7dd68609285cfb8b73dccd567b523ac3f5c405f5b8cd4914401fc03f45d2160bf0fbe
+EBUILD qlipper-5.1.2.ebuild 669 BLAKE2B d462649c3b3e35e636293da4d125d08e47b076b6909b01127c7b5a184e23efd2d728870e5713bb7d725b454ddcf21374f9701fe5b58e1ac650abc733a5471390 SHA512 1647756c69566c8b2a75602975a79ddee841f595ad4ce3705efa33d316bee3db73018ec57b1123bf305901103e749d4808a2c30e08274f9f9b421c958b5695bc
 MISC metadata.xml 326 BLAKE2B 345890725be13fba9c48c60bcdf1be0b14d41d803820fa1d7fa170d44c442a60c50454552697386ddd3732b3d5226f8c96e66fea9bd1b75a1a7c48a08d8e3520 SHA512 5a8bfb530bd363777d529b7b70eec99ba70e6ee41ad9f6fb5ba7fd4c9259ffd381d4343d7a1c6dce34fc1566f5cab4fd474bc3726bbee49edc92d78250d87775
diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild
index df5f55a1362f..746b675f1bdd 100644
--- a/x11-misc/qlipper/qlipper-5.1.2.ebuild
+++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pvanek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # bundles x11-libs/libqxt but no qt5 system version is available yet
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index b90b083957b9..e150df89a5cd 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 737 BLAKE2B 614c1d8d9efdf63d7ff78b80cb45ab25d417fbcc2f2139fc5035ed02459e2b4e17bb3dd8b7623b7397e34f59e5cf1b439ca058d6215e37b903467d7865f0d95f SHA512 e94d3e9b316c5c878e97c521d5c994412580c14f9dd3310a11899c25a54958661cde1ee2b0333dcab74c2189a47b51a4d8a4e804737754c53134f0c7aad6512b
+EBUILD xvfb-run-1.20.8_p2.ebuild 736 BLAKE2B e016ed38a269117a3ac32af70add252192bdbe94c7e305097119552d76a88e5c0b4baa2686261b73a2dd01366336e1494777fa1a51d9b686014c1138b054f9fd SHA512 8fc9c6c2f5eab50040ab95f79c8f34a43b59c9c56ad1308624c982725a33420afaa4860b2825477903c5456a6e6b9605a66407228d693b3573e0044ccef1f212
 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 abcfe943c509..1c1b5f678fce 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 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index e00c96fa8d49..8748a80952a5 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index c3bccb364471..c3e36a8ad24e 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -2,7 +2,7 @@ DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea438
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.9.crate 110785 BLAKE2B 69d067ea399b462f76bddd74e9dac0bd70e35189b1242e775957df84cba24d39699904aedaec6dca1398c05fc3e758ebc15ad49cc59cae2f345d2939facc57c6 SHA512 aaeac70a63967ccf40ce1de0e862406c46fbd8e4a1f6aa6e1f547ff8f076b572e29de58960e17a7b5266aa14566a2d99fcca1940158da82ff3a11ce5caf0cd27
 DIST alacritty-0.4.2.tar.gz 1486725 BLAKE2B 77ed5d12722c7a8cae819c10f11dc46a1d7c53c1e8800f927267401cdc819a70bfd518b728be1e275696095d06a6ebef4ca87d0c12813553a93d4fad0ea01694 SHA512 0cf23114f97242497da5232a660465855ffd7d65c976d5cdfa3b876bdddc8a590eb840d4fcf8841945a6325a3655b20c6e5f3991925667e1b7d441d07e5906c8
-DIST alacritty-0.4.3_rc1.tar.gz 1488605 BLAKE2B b1ac18b4cf0b7cb6a200df8088ac9f5ab806c1966acfbd2758b83de9e7815cb7ff518e5c5d9ced907616ca31c2e69d0f1d4b23bf9fbe7b1331bb55fc23aa6154 SHA512 2fb4932f9eec81bb85bda910dd40a8422bee1a0dd2748329300ff6f7c77c1a1ee17d2a2d78c8c105fe5f874d261fe2b4ba353bdc78df65a964414a87c1ca8c59
+DIST alacritty-0.4.3.tar.gz 1488401 BLAKE2B 0c4b622ec2dfbd45d4e3e99f6c83b0c0cc798cdac1b72d828e14f06242cdc796c29d78317c11e41126cad0e81677e1be8c7ae0ef911cfd3afe99445b4a1c73ce SHA512 1c1a50098fe7c2dfa5fc75e5fd2632de0c60d8ceba5316de15910a9ece7d5385ead765075b87c5154171a908e5d7c78f519d3a2991eccb313aae766208007402
 DIST andrew-0.2.1.crate 9595 BLAKE2B d2cf73285889aaf702fb994fd1d5a1011e0f78011a612937ad9f06f506ef75c86fb82ee1069a8f520b926325a4363d83863234e1fd2a2fcd08ead5ff66b638c5 SHA512 06ba5a756e0d84953dcb1cd1714d1639e67e836dcdd92f5f77c2b35a2afdf0b0babcdf598e2c5cf2dc8661c8326bc27b1ac3c9963a5fcbc2e0c753da6ac730ea
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST android_log-sys-0.1.2.crate 5806 BLAKE2B 354e1a8fd046a0a0931752876560bc7fa720524d20715f5ddb49b80589dc0cf6a23fb13a9cbfbb3a7a823de90f76f6bdc336304d028d8857da2a4348e8483cf7 SHA512 36bd43f2aa244ab085a8addc972753897c7dbc66a648981cd20301f3e67f097713f2397d3bb7011dfac1f60742804697ebab4070346351380fbd653b4b56cbce
@@ -326,6 +326,6 @@ DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa97462dd201e05877f60fd1bb6f88e9a219bf96063f0716d2246629dac15f802305ea9188d02e61634e5 SHA512 d7f32cba1de57b62546316f3ce81f24dcdf47287555294ca61470d14b61c11f1347c22f2d51df55d351e910720c0b12d1196164964232c9c5fb349ab2630a6ff
 EBUILD alacritty-0.4.2-r1.ebuild 6701 BLAKE2B df9c5ea72ce0dfc5364cfe8a70bffc29b721a54f66d481166689985039e51c0ce200d3f9fb31fb1432b116a6042e64c0ac23cde1acab5071d639db8cc0468512 SHA512 336f717471d752d717f0c048fc98386f822dfe3ab28623cc39e256a46da70f70f7d1b77fd0158a37d3e8e13de19372ba9ccc9c64fd094cbd4f55c1dc927ed9e6
-EBUILD alacritty-0.4.3_rc1.ebuild 6865 BLAKE2B 617310d98a9eabe627ad98c91118c502c80683ed6483dd00cd23db39183bff2034eb372340d054895d206936a80d1251d0a89664aff20f2025dc337b4c6e6a6f SHA512 95720b65c09f661b2b547d5cde5adfe60eeccaa4243a03c2071399d71c3af9888e292d2710849f9dbaf10584c270c112c2bd3229ba178b140ecfb6c9a75c357a
+EBUILD alacritty-0.4.3.ebuild 6865 BLAKE2B 617310d98a9eabe627ad98c91118c502c80683ed6483dd00cd23db39183bff2034eb372340d054895d206936a80d1251d0a89664aff20f2025dc337b4c6e6a6f SHA512 95720b65c09f661b2b547d5cde5adfe60eeccaa4243a03c2071399d71c3af9888e292d2710849f9dbaf10584c270c112c2bd3229ba178b140ecfb6c9a75c357a
 EBUILD alacritty-9999.ebuild 2424 BLAKE2B 6ecfbc6d41303e3e60f3c8a29a73675bbbfa8cf86cada1ad72b973fd93608fcaf40f5326e6b6c13ee64ca88291b142ef93f9453c5e5881f9a697550cff0f08fc SHA512 5e6e5ef8d5bb894f1266b73510662a63e272b8aa49160d27b4c6f7a820b25f62c7124303cb1889007ed91fef1b554edd17bd2c38e076d26cd25496ded1daa3a7
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.4.3_rc1.ebuild b/x11-terms/alacritty/alacritty-0.4.3.ebuild
similarity index 100%
rename from x11-terms/alacritty/alacritty-0.4.3_rc1.ebuild
rename to x11-terms/alacritty/alacritty-0.4.3.ebuild
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 5fd71f2f5b74..f65b6d7744f0 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/claws-mail-themes/Manifest b/x11-themes/claws-mail-themes/Manifest
index 5536a72294ae..9d81dc977805 100644
--- a/x11-themes/claws-mail-themes/Manifest
+++ b/x11-themes/claws-mail-themes/Manifest
@@ -1,3 +1,3 @@
 DIST claws-mail-themes-20140629.tar.gz 3611756 BLAKE2B e684108aff78ef7556e33cdc9d5a49e740c883bb05383fd045ecb6e091048fc3088b3f4638036a25c4c2a7d58c894e3185b04f2ba628a7e1da465bed6dd1402f SHA512 afde84c76185445f0a8ede874ee3a9b1d20cc2c390c4393aa07d1fc4aca3614d74885679cd3a296544e36d1dc8b08d623deca1616e984dc921c9ccf12f58bea9
-EBUILD claws-mail-themes-20140629.ebuild 558 BLAKE2B dfea303175a113ffbce13c646b58870c5100aa2c920a03a3f5146a29e2ee25e27d2cd80f26d4a59d639c49565e84103348106a02378c104c37b5ba85cb648eed SHA512 85a3ca09fe06c0b1f67fbb7eadde95ea8b760b3667ccbc9b1bce703f7408b87bf1863527a156f06efa804efdffd9889799cb8a723f9e393cb12f9a7dfa835d2a
+EBUILD claws-mail-themes-20140629.ebuild 560 BLAKE2B 4826b376a54306da21a4e812d70a55e3cc9c4bddec9b04a0d9f43519fe243571d72b9fd22998fbe32cb950126ffd22a4978fed26a77b5ae72498eb9b47f4b565 SHA512 16a3cb250506d8c82f7c689dd8232083cd0f1329a8d0fab79461a90b11df2e1c4829f4b7b41ca2cd4360f32517bdcb155331d181bf8f351820fc7e353824c697
 MISC metadata.xml 245 BLAKE2B a3d5ba138f8e57b72d2662b7524499fe3f79be8c63fc43b82c3c205949722f5dcbb7590c897be08918fce0b392f43d414611e97596783352b0d427031d3b8293 SHA512 090766484d8e5483aaebed471de6ad53d5cc56551507f67f00b40cd520dab9c437a1eaeea8f8b753497df78f7ee9ae077dbbf1f188fba2450021d28621ac1c00
diff --git a/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild b/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
index 4e365e8a8049..055e24d32b79 100644
--- a/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
+++ b/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
@@ -4,8 +4,8 @@
 EAPI=5
 
 DESCRIPTION="Iconsets for Claws Mail"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/themes/${P}.tar.gz"
+HOMEPAGE="https://www.claws-mail.org/"
+SRC_URI="https://www.claws-mail.org/themes/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 CC-BY-3.0 CC-BY-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-3.0 MPL-1.1 freedist public-domain all-rights-reserved"
 SLOT="0"
diff --git a/x11-themes/e-flat-theme/Manifest b/x11-themes/e-flat-theme/Manifest
index 463d10acc469..126c8f1827c0 100644
--- a/x11-themes/e-flat-theme/Manifest
+++ b/x11-themes/e-flat-theme/Manifest
@@ -1,3 +1,3 @@
-DIST e-flat-theme-0_pre20200427.edj 45737040 BLAKE2B 2cc6637da79452eb986d256c12037fec32ce86688e634268bf2c01f0507c2778b737fce2f6d92e13ba39a5a249004881f1a3171d2af8506774394459c0a38de6 SHA512 ad96572523c124db4093812eeac539ab2003c4d588b87ed037b52ba1894e47466005634dd3bdd9f2148d0f64f125a86ca5be66a671d03d7cf8829828cb8ee71c
-EBUILD e-flat-theme-0_pre20200427.ebuild 1030 BLAKE2B 2ca159a5e899f025df21fbf47ddc0baaf95405b3499f626e19d2207b12af6ee3d2583c54662ffd1e1d51f655e05c1adcc9193c5ce16e8cf0c5d5a2b9ccaaa6e4 SHA512 f1da95b5eafbc2933cbdf47c5705f353693a37019d2479cb51739983016aa699e79918ca5ef887415cac7aab5587ff67fd1e08eea68a5ac5928177d207c53ae5
+DIST e-flat-theme-0_pre20200602.edj 45765496 BLAKE2B 008560100983b3e00782d9cfa7e0b8fe329085245b98ff335b5a29520e2379cacfc5e3958c9d474605631dc7e79f114f4a6a2eb8d0729216ef657cbc06732e84 SHA512 84bc4b9e84de581090409836d7c057aac7d0af971733767cdf8f8d8584d7c8f4e35ddfc775616df757d9cced8f8ad408a07d7f0c6222207b4579e850cd5c505e
+EBUILD e-flat-theme-0_pre20200602.ebuild 1030 BLAKE2B 2ca159a5e899f025df21fbf47ddc0baaf95405b3499f626e19d2207b12af6ee3d2583c54662ffd1e1d51f655e05c1adcc9193c5ce16e8cf0c5d5a2b9ccaaa6e4 SHA512 f1da95b5eafbc2933cbdf47c5705f353693a37019d2479cb51739983016aa699e79918ca5ef887415cac7aab5587ff67fd1e08eea68a5ac5928177d207c53ae5
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-themes/e-flat-theme/e-flat-theme-0_pre20200427.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20200602.ebuild
similarity index 100%
rename from x11-themes/e-flat-theme/e-flat-theme-0_pre20200427.ebuild
rename to x11-themes/e-flat-theme/e-flat-theme-0_pre20200602.ebuild
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index d5221ef7b8c3..78196028b64e 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 77204d3d2543..c8640d99dff6 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -11,6 +11,6 @@ EBUILD i3-4.15-r1.ebuild 2323 BLAKE2B cc8f7d2d4565bcf7c8ddea111223fb357326e9012e
 EBUILD i3-4.16-r1.ebuild 2318 BLAKE2B cf613187d4105fbb66ab77ccf1d7dc7d6aff2171e0509b7cc99e72b5b93353583847bb07f994c432bc33f0cb38b3448367c4cb8f063daf5cdb0eaf0803bd2455 SHA512 335cc3cea82d35055c322bef7cdd141ddd51ea96ccacd27bf2ac431dd03691047711d6679aa7b74cb529ffa732a3e337e7d3f6676d899ef453faf24416514227
 EBUILD i3-4.16.1-r1.ebuild 2328 BLAKE2B ad26677f4353183174614bfa92361f4752c5e9acb4c0a6bf7328a65e8e63e3ccdc4afc1b7fa83eda96144a9bed72d6a62edf74da41300aba4639cf75dfbd54d5 SHA512 8078b647012fa62baccd4536c5b6e6925adbef228fcd0f274786a45820a1dcfa01402c2b58b3cb0b684114cc57a1bf4e049ca0ccdc23d60dcd047e954f104943
 EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 8f307ab43874156d97b3db51ac68fef7ca58f3f2381c495d815326076c1368473974143f00f0909ef66b1efb6e0ff2fda4ccfd7161d336e4d80ae6f6f9da5be0 SHA512 9405eaafba8cac4c6918cdd8343f61c558f58460c2a8dcda2321b1ad38e7318f8a7f6a51d4a3afcc450dcdc9a139d8baf158179c9bf6165c421288e1dc99b1e9
-EBUILD i3-4.18.ebuild 2127 BLAKE2B 76bf8b8a1b3f137aa42ef214db25e712b60c55be7d08caab0f7f4206e906a90ee2ab6b3cb37fc3652ae42e5681c86ec9332a034177f759ce4c18619545e976fa SHA512 172008449211f9344d6aff7cc8210b69edcbde3939c4b1c8d6e3ed296c60036d829d40de08da663c3a17d05d6bad5e4c525db3111af2f3369df9fe7f72a85518
+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.ebuild b/x11-wm/i3/i3-4.18.ebuild
index cce054536ce5..ca0d08cf24a6 100644
--- a/x11-wm/i3/i3-4.18.ebuild
+++ b/x11-wm/i3/i3-4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/sithwm/Manifest b/x11-wm/sithwm/Manifest
index a436188959f0..26a4251ac057 100644
--- a/x11-wm/sithwm/Manifest
+++ b/x11-wm/sithwm/Manifest
@@ -1,5 +1,5 @@
 AUX sithwm-1.2.3-install.patch 371 BLAKE2B f38d3b127e29fcb4a5cb2cecfe280001bc69a95b4e4c9265915d7676184060b329666008cf2d924c339d1c8cb3f980e686a03178f0298cd6512ae446924bccd9 SHA512 bcc6ba80515d0ce4f004058f73a7898d364c6a02d7dd4c4234c9c89ed8df2bc95da749145979cdc8cf0665d96d183de70e79a66989234849b40eb544d554f9b6
 AUX sithwm-1.2.3-warnings.patch 880 BLAKE2B 1ce24117a5642ceb7edf4700a5edea07acf844c972147efd160ed4532a4274a414f7cfc5ee196cdf8f770ef3a7887f13e2684960b1126740216e0dffbafc3a5b SHA512 1cd1ee4c6b6e71aacafdd10ada0c3f07c89cdf51a3b565408a440ad2fa1b40f5a266b73873a059be19fa232dec35817bc0aca2e58b6271ccce5753e7cdcddb89
 DIST sithwm-1.2.3.tgz 29976 BLAKE2B 23562cb338c6e1cb5f978ad04f49afe58cc16e73707ee3c893de88eb671ccee86bc29cc06a72e3912aabd0f894c55875a860c2d1fea472fd4971961e9ab6d4b7 SHA512 12b57d28da2a5b365b1c165ba6904d901990e69950986cc7be285060a58ccdc32edc4bd60a63d2eba3f6f7f695d461e424bce23542c18a13afd5aab2e91067dd
-EBUILD sithwm-1.2.3.ebuild 508 BLAKE2B 5de8eacc97c987d636cb8cb9b2e3eac7fbbfcf9f176362b305055fc1fdd8be9ef46db717cdef8dc991c341bf3d8c5eda6b647ecd3abba70cc1c3c5509429fa8d SHA512 8b179b683540f691c9c583e770072c1156fd2c39903e8cd0cdd1dc89c0612ce2ef937634fca70f53508097cb49f80848491b08899bea4a9bba97f74dda4c4110
+EBUILD sithwm-1.2.3.ebuild 510 BLAKE2B 9453d53465dd2a18c12d51feb2299f4f4526ea0650b3407f0cb84baca5e19b0532d96a4789a2e23eec60e0201a9407e054869ca043c4137b6dd490737d36316f SHA512 0f3164986b654c7cca6f654e28fb38ffc5632dfc857d5a1e58630b5a0160cd71a88743e246d3bf07b7f604d5a330b9ef66a2998f7bf2854295adadd79434568e
 MISC metadata.xml 298 BLAKE2B 07c5032c4ad4c8f3336f076162848d3008c34e1890497930bd9a0548039327ca0c0281d4f31f3e2816c44e7472918ae676d4c0157bb162edf2d4819d227c6a17 SHA512 330598be770732387d2229bef4d884ee22ec5330ba60784e026d6b24d9e9554778c9e8d4d6143df6475548c4a2033dc2f69a724f6e58f9fb94eb9fe4e4ecc289
diff --git a/x11-wm/sithwm/sithwm-1.2.3.ebuild b/x11-wm/sithwm/sithwm-1.2.3.ebuild
index caa3c5dbdb8c..4927d7be4bec 100644
--- a/x11-wm/sithwm/sithwm-1.2.3.ebuild
+++ b/x11-wm/sithwm/sithwm-1.2.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,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Minimalist Window Manager for X"
-HOMEPAGE="http://sithwm.darkside.no/"
-SRC_URI="http://sithwm.darkside.no/sn/sithwm-1.2.3.tgz"
+HOMEPAGE="https://sithwm.darkside.no/"
+SRC_URI="https://sithwm.darkside.no/sn/sithwm-1.2.3.tgz"
 
 LICENSE="GPL-2+ MIT 9wm"
 SLOT="0"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 5d500f6a26ed..06e1c2bc8c39 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 3489ff00f645..ae82657cefda 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,6 @@
+AUX exo-4.15.1-parallel-make.patch 1743 BLAKE2B 046512817d76698e2929b3a0f625eed486f07e3a46e161d9bcf7bfe0afa3d0f8cc083b955753281eba1c66d3b8c48cb39e3885173a2bb167b4190e48f53c04cd SHA512 1099b23a92904ca4a8df68c5d3f97fb877db9a50fe9bed4fe8951ac2ff7c7db4ea4326afea265e7c41796e01f3ec2b5ff4ec964dffac633cd1f42012e409f17f
 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
-EBUILD exo-4.15.1.ebuild 913 BLAKE2B 57b45cdb446893b1ad585cc913ce9a83d2f4b42b43d25453a55bef69b26fe39543dbb977dee559055689daa48d66ae8f3aeb57089e05c7b6d1e30496bc3be43f SHA512 0c3bb0944a147e3ffb906e8b696af17e83f15222ee3fb71289cad565591d00d9c2899598491093220a714cb92c39b6fbedf64b3d33eed4fb201086603eccf91d
+EBUILD exo-4.15.1.ebuild 972 BLAKE2B babdb727d906288d66f8b0f9cfd77f2a4cbebf578360e8c892c469d011f7ef587159a3282df9114d8b250dea09c6ea02d84375b86e7f3a05b4b31224f38d1d9d SHA512 4962d6d382b26ca8fe10477a4c34daec7d206f3ac1aeb2ba80e3b87fdbce9193f5b53057ee9710deaa51924bb0d772c49d32c092f550fc20eb4f31dd94c202fe
 MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
diff --git a/xfce-base/exo/exo-4.15.1.ebuild b/xfce-base/exo/exo-4.15.1.ebuild
index 5089b190c4c8..1f9eb2e523e7 100644
--- a/xfce-base/exo/exo-4.15.1.ebuild
+++ b/xfce-base/exo/exo-4.15.1.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/exo-4.15.1-parallel-make.patch
+)
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
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
new file mode 100644
index 000000000000..f18159442fea
--- /dev/null
+++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
@@ -0,0 +1,66 @@
+From d3f3232eb53a052711029d2fafc36e23da971b35 Mon Sep 17 00:00:00 2001
+From: Romain Bouvier <skunnyk@alteroot.org>
+Date: Fri, 29 May 2020 11:11:41 +0200
+Subject: [PATCH] exo-29: Fix race condition in make install
+
+- Since the exo drop of gtk2, HEADERS are declared twice, which can lead
+  to race conditions when using parallel make "make -j4 install"
+- Simplify Makefile to only have one HEADERS section
+- This fix #29
+---
+ exo/Makefile.am | 24 ++++--------------------
+ 1 file changed, 4 insertions(+), 20 deletions(-)
+
+diff --git a/exo/Makefile.am b/exo/Makefile.am
+index fc8845d4..358ae9cb 100644
+--- a/exo/Makefile.am
++++ b/exo/Makefile.am
+@@ -23,30 +23,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
+-
+-
+-##
+-## GTK+ 3 support library
+-##
+-
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ 
+ lib_LTLIBRARIES = libexo-2.la
+@@ -141,10 +125,10 @@ CLEANFILES =								\
+ DISTCLEANFILES =							\
+ 	stamp-exo-enum-types.h						\
+ 	stamp-exo-marshal.h						\
+-	$(libexo_built_sources)
++	$(libexo_2_built_sources)
+ 
+ BUILT_SOURCES =								\
+-	$(libexo_built_sources)
++	$(libexo_2_built_sources)
+ 
+ exo-alias.h: make-exo-alias.pl exo.symbols
+ 	$(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl < $(srcdir)/exo.symbols > exo-alias.h
+-- 
+2.26.2
+