diff --git a/Manifest b/Manifest
index 3f7d6b0fc153..109bee672fc1 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29439 BLAKE2B 2dbed25ff14013c93815be881c4638a1589ba111307d54a40b85e2b63ecdd35b36e3649ff79df94fdf190e48e09c1ebf7263c34e99ce4072ca1a28ba87a04727 SHA512 2b2bfd78139728cfbb77aad4c554c2328937221bc155f9afa3ff4959d8c41dd1ea4082193be619b69dc22d1ee9277c7de6a8df1f5eda4bb5135ff0793597f5bd
-TIMESTAMP 2020-07-01T09:38:26Z
+MANIFEST Manifest.files.gz 29433 BLAKE2B 759546d5c7400870e3eec202d2ea81e0dec68f385b832c1253f71073ff68c398dd31069d92f1b8434f0db4b625ab5e3ad3e5c500ca8775cff5d19ed9563065a6 SHA512 d2766e34356b5bb7033facf65a64b757958e48e9ed2ca076ce37c255c2eafc0dc01a805b9c08fccbf54f87617054471563aeb6fb10364a5a7ddb005ea8d44769
+TIMESTAMP 2020-07-02T05:38:27Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl78WZJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl79ctNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD+Mg/+IIDjMQtWQz1Y7c2LYZClls3G0Iw5YktS/Kqdgr5y/Eek/DFeiq9Rvdhp
-ZbkV8UGd8mGYb8gEG57GTMWBQx+zOOgsLxVvoPLs1o09lNZEQxUvgtY/V6Uw3YJi
-IbMTLv84szLUm5UKyL0ZtWCrZO/joe4srdqyakEjJTNHiaKVqBwFSq0oCKIBUI3x
-3CzzaWIau92H7PDhuGCaPo38xXLYvk+0MmgB38g1z78poTQloe1NR05H5p6aEtgJ
-IzFee77yieSKZC6RedfhWRWvN8YULuSexcyAPAaK2I31/1f5vNq3rNpE8HK8e7of
-oitGpr2qD/aDWeI+6B5FjlohYsqwYGbUF/6a6Cgi9uYMGSKsd+K0aL2ZVD34Yf2o
-td0j25pVF7YnEYaFYGPOeJAmUZ7rLm6lGUZq8blYywNvv7mfRF3LouVE/Vy7LLx4
-5JB5zP1UDOdXVOKvRnv+RTEA+TxZVdWQM4efMHcYsuUYsqCK2z6Ppa+fjW2bvjhH
-u2+auyWQZXYI93dzI7JQbI0kaTfQzdYMdJ5aJoIdM2HW01espseccf9563ziux1Y
-2AMFIjSvoetRSHhDrMqy351B+aiedTvyCI9eS9KtEV5FKYer1XkiSY6mC2GUTdMy
-Cmg8JaUOrlhbIs92Tzq9U5nm7u8F3Gg3G0gDsBd1MEtgYTdqKWY=
-=vRM9
+klCLvRAAnSEVvqyjkmP0e821d+wF6MUkA7DVEZJM0gcTGiXSjMKJoMtl5uUPvpQa
+OrUYqDLlds9B1EaPBeOjRx4guY3cPe/M9akWnB4X68Jyf96qabYLoYEbi97b00A5
+9iVHk1YtRDMeeTWYbEFc4P+kLZEVOF0F0Nec7ES7C5Ru9U8316dRnesTGMLDZlEp
+27DX6LKTXXuwOOlUwurI1HK87XNktrk80BTveDQPiUFoUSAnk24owKdP/oNx2ccP
+53oiLLGoizzoQJ3OF87eCqPSQJx86p94yocLdKh6c0etFsbuFrikYNWnovmuHExL
+iM3akY7jACrTAVhtmUEY6LzdKMTNlpQ2BQJBdDwIrcDl/29rf38UXDn1Bu423AUZ
+8V+Xk7qRqwvSSwbaH60R38E0bGg4weZt14ekTRtkL1ZtgFuWRb0UAa/k8YaXGxcJ
+OnPWoysaaQhXI+2dEYg6quHXpESQpK6WK1dF3URksxj2GtuN6roauLXwUAJLfyJh
+d3YEYOc7vctqh1+5H53L4UcSw6y69tcasrhXXfx6lIC4FYbW9+PGZR02mrd6B8QF
+VMSRMQt8IEm1TfviI0w85areUmvfb9QmpSnBmhJqj3L8eqDngUJzGu6alcJH06aN
+yy0mMIOlF6enZL08o9okVKV+Yn+h/CmahPLjInigzPExW3lQc7k=
+=fuY/
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8294d76733cc..08002545a55e 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 04b11764166a..d2b04194e4c4 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/maradns/Manifest b/acct-group/maradns/Manifest
new file mode 100644
index 000000000000..ccccc2348cb8
--- /dev/null
+++ b/acct-group/maradns/Manifest
@@ -0,0 +1,2 @@
+EBUILD maradns-0.ebuild 150 BLAKE2B ca34532d6f90cf93065638d4382ec1714f3601d52948950cfa0ea7359ae702c865d9e347ef9c77af103d5ebbf7516c8c70323547700c4e1cbf3c201d18a6a6ce SHA512 aeae32838648374f71b0c69c2ae516aea52aa8323921bf82269d2de050e709d97b8ac67e3ff2c943269ba79d9a8693debea4c2b5007b45c22d0ebce391afb0d7
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/acct-group/maradns/maradns-0.ebuild b/acct-group/maradns/maradns-0.ebuild
new file mode 100644
index 000000000000..95932e13cd11
--- /dev/null
+++ b/acct-group/maradns/maradns-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=99
diff --git a/app-misc/ignuit/metadata.xml b/acct-group/maradns/metadata.xml
similarity index 55%
rename from app-misc/ignuit/metadata.xml
rename to acct-group/maradns/metadata.xml
index 6f49eba8f496..8072ef2372e4 100644
--- a/app-misc/ignuit/metadata.xml
+++ b/acct-group/maradns/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 7fed0fd65de6..800338e95611 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/duende/Manifest b/acct-user/duende/Manifest
new file mode 100644
index 000000000000..f5fb52684991
--- /dev/null
+++ b/acct-user/duende/Manifest
@@ -0,0 +1,2 @@
+EBUILD duende-0.ebuild 263 BLAKE2B 4a3b9b4aeb7f2b3f9d4261ee3a42a78e2f566370ae45a7a419b74aaab4a648e66fd4d9e2c758c1998f35bcba4761f8f2e68466b2b518c102b0004f00f371d928 SHA512 d3f05b84bfe7a84bae17abea5bcdcce91d780c9442c94c00f3a7c08cb3f9d15daf40ad07e693193a65b67592d3e315b9940610ca42b2ddae8fb597fffa545788
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/acct-user/duende/duende-0.ebuild b/acct-user/duende/duende-0.ebuild
new file mode 100644
index 000000000000..b7ad1e5a6dbf
--- /dev/null
+++ b/acct-user/duende/duende-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=66
+ACCT_USER_GROUPS=( "maradns" )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/maradns "
+RDEPEND+=" acct-group/maradns "
diff --git a/app-misc/cbrpager/metadata.xml b/acct-user/duende/metadata.xml
similarity index 55%
rename from app-misc/cbrpager/metadata.xml
rename to acct-user/duende/metadata.xml
index ab75470f3ea1..8072ef2372e4 100644
--- a/app-misc/cbrpager/metadata.xml
+++ b/acct-user/duende/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cbrpager</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/maradns/Manifest b/acct-user/maradns/Manifest
new file mode 100644
index 000000000000..4e00f7adc3c9
--- /dev/null
+++ b/acct-user/maradns/Manifest
@@ -0,0 +1,2 @@
+EBUILD maradns-0.ebuild 197 BLAKE2B 13a500f10f5173c37759fbdc8011541a0b8df362cb16b1ff3d4539f6a17fad7f4f8de927c1e62efb24c88035cc9a0ae8b66cb8aa71bcbaea311f8e33b50aeb16 SHA512 1bf584d582cdcdab800f1b68c2b6c83f25e0291ed8ae76b76556b7ee1010b3eac670280bc93bef37f68df2e727c500b2399218cef1b7fb6a402566fa068675c1
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/acct-user/maradns/maradns-0.ebuild b/acct-user/maradns/maradns-0.ebuild
new file mode 100644
index 000000000000..c2a756d077b5
--- /dev/null
+++ b/acct-user/maradns/maradns-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=99
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/maradns/metadata.xml b/acct-user/maradns/metadata.xml
new file mode 100644
index 000000000000..8072ef2372e4
--- /dev/null
+++ b/acct-user/maradns/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>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 983f56a732da..7023f4e55f3a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index fb701fde55ee..7893af8146d9 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -2,5 +2,5 @@ AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
 AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
-EBUILD apg-2.3.0b-r7.ebuild 1237 BLAKE2B a66f321740778cd329def859753a723612c83764753164499865a1e2f2beb46fd8733a20e483a1d659444a6a2be2fc77dc1a24fe926a81fd0eb7d64a79877f03 SHA512 5eae8f6686faf21f319e3ffa9e30086d12a80e8efc434570af8e43bb03e5e6688af684cabcc18412c9ce2e3c0b338313dcee51dfdb64ec1bcca682c4e3738d26
+EBUILD apg-2.3.0b-r7.ebuild 1239 BLAKE2B 2a055b82dfe3a78baa04b03cbce4c9bc73c43373e54f52cb41e3b9f886c5d3e40cd687df0603193426b57cb0012336ff41bff0d9f22be25455fb884b2e4585f1 SHA512 ebc9adc8af01ebd0109ef693ca63c6a374fd458980c602cbb6556b913059708ae10dd2c78b9fcd8ffed2833d0da559ff7a0c88de6953662f287589ecb902f83d
 MISC metadata.xml 357 BLAKE2B 168ac61b9681a0f5c0697af69d05daf92d438808c944105bbd4cecedcae25c5710752197844862ec99c6193d8356930db5d4e8ed658e6d6b5d5b1c59e043cdd3 SHA512 b133aed60a72264fcca6e9f9e85a99e8c5ac08b2eee2f97ff985ae1610c14c6ed9ba3bc5553939c0dfefa91452e60255a9d127a60100f116688906de704e0fb5
diff --git a/app-admin/apg/apg-2.3.0b-r7.ebuild b/app-admin/apg/apg-2.3.0b-r7.ebuild
index a525c799fd57..77a760e1baf8 100644
--- a/app-admin/apg/apg-2.3.0b-r7.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index caac752cb223..6730ce28d3c7 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -4,5 +4,5 @@ DIST Rex-1.9.0.tar.gz 331106 BLAKE2B 74bdf06be9454bc41c444a7d2bf576740e8ecfd2dd5
 EBUILD rex-1.10.0.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
 EBUILD rex-1.11.0.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
 EBUILD rex-1.9.0.ebuild 5099 BLAKE2B 03c38fc711dd43055b32e4e29b9c8e095772d51e4e6c4e419da34e2b41b8d11fb469ef9b79ae94bcb85ac6472aea755c4d84bc9c702d72005e7f096f4c234c9e SHA512 99721ba1d4cd612aa6fe36af8d43e2ddd6087a999925676c3be4326a41092e0e92bd4b06bbcd3b064d9d3fc00ff450a2ecaecf37ca590d579f4eaf2cd9273f01
-EBUILD rex-9999.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
+EBUILD rex-9999.ebuild 5308 BLAKE2B bc08447e34059b62b505042c79fa977922a4dd08b0e7f0d0ed88ef48309e6344f3b85daf8173a8813d3bf7bc68dffd8d2a8f0056fc7d14e02e6bf4a2c1340645 SHA512 c2e2437dcb88693b1b06a494a5f853f23529ef4496ebfd9682b664d575c680640c48137f1c06af1f252dc89747fa17c81d938a3eecb90c221948cd643be1e813
 MISC metadata.xml 24205 BLAKE2B 76aa5370179f64adaaf79cb730a4cc53deb191a27e97b10cbb26efd804572eb79d67d9abdb09c5e62d08d73d969848286516a2176099237feba2a5c855cd263d SHA512 a6cae05b4f46b10502da5acc2905f622b61a30329c300483cea39348e92d182d190dd61433c551a1948d4ac6a281b9f91c47b759f425055970e8c5a6349b8693
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 5cc3866dba75..02f767b58c6f 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -18,7 +18,7 @@ else
 	DIST_NAME=Rex
 	KEYWORDS="~amd64 ~x86"
 fi
-inherit perl-module ${VCS_ECLASS}
+inherit bash-completion-r1 perl-module ${VCS_ECLASS}
 
 DESCRIPTION="(R)?ex, the friendly automation framework"
 
@@ -183,3 +183,12 @@ src_prepare() {
 	cd "${S}" || die "Can't enter build dir"
 	perl-module_src_prepare
 }
+
+src_install() {
+	newbashcomp "share/${PN}-tab-completion.bash" "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins "share/${PN}-tab-completion.zsh" "_${PN}"
+
+	perl-module_src_install
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index dd12c1b70a34..4b97f9dfd9f0 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index d1f0a31aec93..22a7ca4bd2fe 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,5 @@
 AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14e0d23b1dcba9eb92465fb6d6a57c3c97f1d574a987214475c40403c554066076a16432ee68ae1a58677c22c72612c08bf91e8cbfae98d941580c0a3598f SHA512 0840be27e1742d5999531cefbc20a661136e44d44728ee5b968d96a7d82baf1d14e5e4e671f8f34fdaf37a0214dc23bd5286c914f6f579e8f4d1dd959779a5a1
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
-EBUILD tpm2-tss-2.4.1.ebuild 1768 BLAKE2B ef53b8d76a557ffcea8af3a1cd07be977b21804b27faf22ba07f8cbdb01a348f2169efdee87644fdf349c047e362387b34c790690c3f15738b023c2f18884070 SHA512 aecec9b6f3e32de44853b329049112d9d1faebccf228f53865f3567e3169814bbf0de7a266a9858420abe57d804ac8d09ed0ebf19d1a03970dcf37e564327eed
+EBUILD tpm2-tss-2.4.1.ebuild 1773 BLAKE2B 0b8ad6d1eb92cae0c57fa37a28b3415427cf0a6310aa120e4224dce23c433e8f9dfd8b1005717d4c8e1672c3e59a8c1ce6119e67327cc23bdb999069eb464373 SHA512 a609ca5ff1c17ce961335d0eaabd53a11a7c9d9090f83004bfe336dfa2e85b04d09937e26336f26be044c258668adc8fbab568f2d3dd45670abaebd7b77b8ca7
 MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
index b67db0a54898..7133a5cfcb7c 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b9862f0db76d..61ff1def5a10 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index a376ad630ef8..c211a59a101c 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,6 @@
 AUX protontricks-1.4.1_no-setuptools-scm.patch 1291 BLAKE2B 8d97cc8ab7d7dcdba72a3245d7bbd6965d0e0da1f22e290babe6a967057c0ddd6ba85920799f3fa85de4e395f29ea6362472380d3888f2a59bd7c1c167151337 SHA512 730180ce050a81ad42680bb884e3b86b4cc7c2d0efadc07f3a0708f55ab0158b8257e3528ce748d4be830d728e9a238c6d5deef15bc2c926b13ce1c7a1f9a4f2
 DIST protontricks-1.4.1.gh.tar.gz 40029 BLAKE2B 3937f69ad1113c0a368117db38cf8bf1b66feea5cc7c509eaee2f7adabdeea724368baa15f51134a5a9749171a34f439878bfda3fc6b813caba11faf7be76373 SHA512 96d4b3aa5b1ca8f7f9bad0859f5984eb29a0bed01f420d108e537deef0436af314e73fcfaccfd58b5b1dc912698404bd4b0157e69ab6a055d65eb3701a60d00b
 DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
-EBUILD protontricks-1.4.1-r1.ebuild 1456 BLAKE2B 09599e44b0fb23daf393dcb82ca79183652610588daaa0487f3830c81511008c6ff90aec6ce533e4b3260c8b6a943c7f7d4497ed9943286ab9ae0e90ca28b43b SHA512 89d288f7bf374b68412a611562efb09c95ddc298e988f955f2361d1ad88f7c170e285fdf1857314c800c43f2d7912b99ff24075e379ab709582431c429608cb0
+EBUILD protontricks-1.4.1-r1.ebuild 1455 BLAKE2B 08cf533f9d3e45273b9450d16cd342683444deddeec242acd7d7122b55396ebf6b639a6a3219832b9dbbaad6aef24cfdcb25c73d3c04c594588481a479fa6872 SHA512 6e5bd0d386cb4848367c26422c94603b60a45003f6cb7f89d5c29bed88802b82b209ec65816cc391ef515d4b3f9d51681fc38c49b05a58d266f08d5556ce868a
 EBUILD protontricks-1.4.1.ebuild 1415 BLAKE2B fd3e09407cfac634bc86a26df6d107ecd07abbfd097ff74a2ea7baaeba40cd8db95460d7b37004b4e54a79ec99c46b3c1ccd162e7d40d4c8ff89b8370b28c3aa SHA512 74bc259a1c1ec202540a36a3d402c1dd71d3350ed9c2c048390c501e4e7c84fd83c7c259a2481d70f83d211821097a560460bb530b96fd0db1fd6b01427353ba
 MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
index d17ef1b45996..e8c4edf44be5 100644
--- a/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 81b1c081fc52..7169aad9a7e5 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 380a28fedb6b..0b173fd1f8ee 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,3 +1,3 @@
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
-EBUILD byobu-5.130-r1.ebuild 990 BLAKE2B 7ee65e526b9a7d20bd5634e4c5c54342821ceed51c28040759875a04192b1f0c6218d4a708dc0e667856e6059febcb5db18d68945209eabaeaf0c95a5dd9785c SHA512 2df7ad9733bc9f12a3e895581c4630e7610b5671c8fe3cf5073e6853e689e206809e5f80fb2373863c32f91dc363baec63502fa110427580770d76999e3d1b49
+EBUILD byobu-5.130-r1.ebuild 992 BLAKE2B 87f095dbecf5f1a47e21b583e38c31807f73f98f4db939d3f35053cb8ca623a3014927123a88b6302d9d2246035cab4c5977d9f682379b3ade1c244d6445fd51 SHA512 049f7a3e3c4ec7c6dfde3136e0f1a51e9cd3a94dc3a68fb3281c810e928f43d9301e94a997924e95f76ba23c305b00ee57b2878f6fee0aef3a4bd46aff69e401
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.130-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index 9b21e5cd6582..3d2ddef4731a 100644
--- a/app-misc/byobu/byobu-5.130-r1.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
+HOMEPAGE="https://byobu.org"
 SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-misc/cbrpager/Manifest b/app-misc/cbrpager/Manifest
deleted file mode 100644
index fd2252789437..000000000000
--- a/app-misc/cbrpager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cbrpager-0.9.22.tar.gz 146216 BLAKE2B 3396328ea7e017e0cf13722cc8545ce75ccf2cbc0446d1fcebefa02527dc32e3403ed29e456507495ebc3bcd94ce6a42b9b9f574b581952d94bee1efbc2a1ef9 SHA512 dc4bcf14528e6708a3ff0fc3b7e3163dfb9d6063f1cf40545b4f804915afedd9db4cd461834de7ee92fcd4b2f302b7f2ed0d9ae022e220dd8e6c95ccabea34d5
-EBUILD cbrpager-0.9.22.ebuild 580 BLAKE2B 61f96297dd8ff69b70398e19bf3821ead3b66769a68690bea7cf7ba1fb738b926e604f0e6de9acb0fbee10d83179af1cff7adb93031c6874fdf21e634252b045 SHA512 3c62931298b02360c2fc69d0603c45ad27acb99a82ad48b20d523ad895e4ce2d4a71e88c45abd42a7b5b8c6f88dcf8e4a2673314e7f4bf21db934a84a0baa519
-MISC metadata.xml 245 BLAKE2B 8cfa30b68f8de5dc22358be1f317c37cec9b3adaf5b6d833e8ba4b8471db7b2e37d3eccb1936f143bd4cc75719c08c8688ab6e7db79df97e36e27a055f92bdc2 SHA512 f28b0e7430d6e6aa7a27742bb4a3a237a6a7e5c9e2671fd6e2c454ca32e0dc70b94aef9165839a7fe2bb388ff5fe71fcb25d20ed29f881bf4acdaeee07ac78c5
diff --git a/app-misc/cbrpager/cbrpager-0.9.22.ebuild b/app-misc/cbrpager/cbrpager-0.9.22.ebuild
deleted file mode 100644
index 71d60c799200..000000000000
--- a/app-misc/cbrpager/cbrpager-0.9.22.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="a simple comic book pager"
-HOMEPAGE="http://cbrpager.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="|| ( app-arch/unrar app-arch/rar )
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	dodoc CONTRIBUTORS
-
-	make_desktop_entry ${PN} "CBR Pager" ${PN} "Graphics;Viewer;Amusement;GTK"
-}
diff --git a/app-misc/ignuit/Manifest b/app-misc/ignuit/Manifest
deleted file mode 100644
index 7c7b7684262c..000000000000
--- a/app-misc/ignuit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ignuit-2.24.3.testing.tar.gz 573592 BLAKE2B ae3fb9d5b0616a7305e00aeb54a55199ded1f518725342af39d6b79079589fecaa6bc3b3de541cc963f32972e79348a6fc824410cce975a9ea3ef9592f663852 SHA512 c52997745e905abfcdf8bfa8dfb04065fe05a34a9abdd0348bcb3c480d4bcb56ca279c9074d4659a237593a4697cb18ec7092fd79ee682a2b1a26749e8987d4d
-EBUILD ignuit-2.24.3.ebuild 1223 BLAKE2B 786982de2736d8d0162c71863f626a60ce3e6ad44578404369498065d127c288dd71e915f4484c1b52192e85cff63fe581877fca8ac6fd6f334c2a414c86a02d SHA512 17f0ae5174505773c08c7ecabffc1721cb6b1a228a55cdd9120b2c23abd29d4c258bc9534f64168b00f9e27495a44a4fb7156df7080bf508dbfa42ab7e890dd0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/ignuit/ignuit-2.24.3.ebuild b/app-misc/ignuit/ignuit-2.24.3.ebuild
deleted file mode 100644
index 764322cae997..000000000000
--- a/app-misc/ignuit/ignuit-2.24.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Memorization aid based on the Leitner flashcard system"
-HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit"
-#SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
-# Upstream has put this out as an "emergency release" onto Google Drive; mirror it..
-SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.testing.tar.gz"
-S="${WORKDIR}/${P}.testing"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="examples latex"
-
-RDEPEND="
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	>=dev-libs/libxslt-1.1.28
-	>=gnome-base/libgnomeui-2.24.5
-	>=gnome-base/gconf-3.2.6:2
-	gnome-base/libglade:2.0
-	>=media-libs/gstreamer-1.8.2:1.0
-	x11-libs/gtk+:2
-	x11-libs/pango
-	latex? (
-		app-text/dvipng
-		virtual/latex-base
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-"
-
-src_prepare() {
-	eautoreconf # Needed to fix bogus intltool rules
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 32d7d124c362..5fac2fb69f48 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/impressive/Manifest b/app-office/impressive/Manifest
index 380a92ee854f..8eb0798f47b9 100644
--- a/app-office/impressive/Manifest
+++ b/app-office/impressive/Manifest
@@ -1,5 +1,5 @@
-DIST Impressive-0.12.0.tar.gz 209514 BLAKE2B aef0c793c85c680c65399cfcef56488c558ec49a8246d55bacc05a2e1fa0de51d548ddcf67788d36a4de91d62495a623269976345f99d63d25f3ae8bc9efdbd8 SHA512 3425d9d53c8c3ff6d5de0a3466bbf5c94f257390b4929ba12547ba930099de67db4f4d77d4ef4e3e10f8f723478569a74042553f64cf95e236931c7aabb70f0a
 DIST Impressive-0.13.0-beta1a.tar.gz 213098 BLAKE2B c76ce023f9c44865db68d1d2049aba022581d5e62cf027cc4df63ae541a8471867e75749a2f72c8e1f9e2e7ca2640611e090080ac563cff54f521ea47a351304 SHA512 5484f9764848129150d03233a9b270d2c31ec5f5083100662dd3cca85d3c7ead0000bd23b7d531ad45667410e1a1ea5d97ca1a2f4e8a2449dc730273144e56e8
-EBUILD impressive-0.12.0.ebuild 1265 BLAKE2B baed9b95cc4d0a9682bdd31b549053ffa009c08114cdab0324c038927742f53921cfe671601728291f1211affbab946f49242b226ba7d518ca41031de5b53965 SHA512 6adecd2c3e2d1658f379739c0a715b2f5fc8d5b93a035d8a4ecfdcfcbecb582d6b77ee7ba7bc14cbc4a65d87b9c46daf4338bf7902aa2c44d49da890419ff78f
+DIST Impressive-0.13.0-beta2.tar.gz 311905 BLAKE2B fb912ada1f44b2af9bd1eed4c7e1d4bfae5ba42449a9b1a154500a9d892c1070c9da127c8c3cbd35ce033a768a00db359deb1a045996cfeb7253f92d289aed82 SHA512 45c094d30e898a1843869cdcd490315c8280bbe2f5cc58f7695be2f0876075718517a502af16e040981b3f3a8fd955000d9ff76e20850b4bedf52c0d2bbd098e
 EBUILD impressive-0.13.0_beta1.ebuild 1282 BLAKE2B 058ecb21e342d3fb13332c83c828e29f0f99d37ee06f4dc1bdae49f324317dae339d528e1168e139b2c1960f691692d6fa650a93be9d44c418bf3faae6559f08 SHA512 1204fd9c2b7879b86f401a1857bb2b3424ca9c4c6f99860b88922592052c0a3b215f364d3df0f1bc006b4cc2a9653da49339bea6c1b98c0d6ad660416e74b9c3
+EBUILD impressive-0.13.0_beta2.ebuild 1180 BLAKE2B 7c3a56dfc999efa0efdce7d9dfcacbe1e6d9d3cdbf1fc66648ec276c9428ad3abc093880382aac49c018dd9f296e135a8d7002b0f81ef71396932ea52fdd46d5 SHA512 49787deec55a0f32cd170b414d2d87325ad1b57555a1ed4a314e58a1401de9a727078f0bb950bffeee51948fd29c8603d148c6d29a741793e5cdfd7127854a15
 MISC metadata.xml 333 BLAKE2B 145c89f4cff6275c14079657c04fd3806149b7d24e497df4673a09e868b2deb9cd3fea9bd888765aa7a7301148d71db47dd1a4100695cc5fbf6e268dd72c81ac SHA512 2c4d3cf1dbcadd548b1999c81105be623a9347e0ec290f21be1333ecf64649d75e3a3f6ddcbf61cefbb80a5053897aa94abaf976bdf5a2d0a18135e760e70a23
diff --git a/app-office/impressive/impressive-0.12.0.ebuild b/app-office/impressive/impressive-0.13.0_beta2.ebuild
similarity index 63%
rename from app-office/impressive/impressive-0.12.0.ebuild
rename to app-office/impressive/impressive-0.13.0_beta2.ebuild
index 6f865b6ac5e2..fefa04453703 100644
--- a/app-office/impressive/impressive-0.12.0.ebuild
+++ b/app-office/impressive/impressive-0.13.0_beta2.ebuild
@@ -1,41 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit eutils python-r1
 
-MY_PN="Impressive"
-
 DESCRIPTION="Stylish way of giving presentations with Python"
 HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV%b}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN^}/${PV/_/-}/${PN^}-${PV/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="${PYTHON_DEPS}
+	app-text/mupdf
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-apps/xrandr
-	app-text/mupdf
-	|| ( media-fonts/dejavu media-fonts/corefonts )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	|| (
+		media-fonts/dejavu
+		media-fonts/corefonts
+	)
+"
 
-DOCS=(
-	changelog.txt
-	demo.pdf
-)
-HTML_DOCS=(
-	impressive.html
-)
+DOCS=( changelog.txt demo.pdf )
+HTML_DOCS=( impressive.html )
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${PN^}-${PV/_/-}"
 
 src_install() {
 	default
@@ -44,10 +39,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "The experience with ${PN} can be enhanced by folowing packages:"
+	elog "The experience with ${PN^} can be enhanced by folowing packages:"
 	optfeature "starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
 	optfeature "sound and video playback" media-video/ffmpeg
 	optfeature "sound and video playback" media-video/mplayer
-	optfeature "sound and video playback" media-video/mplayer2
 	optfeature "extraction of PDF page titles" app-text/pdftk
 }
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 9ef03870d1f4..d676b659a569 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -10,6 +10,8 @@ AUX scribus-1.5.5-qt-5.15.patch 695 BLAKE2B 040f9736e94bf5137c5e4f049095186c9383
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
+DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
 EBUILD scribus-1.5.5-r1.ebuild 4437 BLAKE2B bbdc4aca01970266c1f266609e4b7a43c760bcab70b05455f70e274a388d1e017330f387f1219b57f354a96f2c1493c4c6b41027d374f45f316c00ea277bf51b SHA512 d522010993b6805df278f55c62b876286d9cc700b46bbb3e1345a4a0cba23e0864c06f395f8c78a95731b2f7fc7c01df1ac0d613d6977b2864210b62c5805d95
-EBUILD scribus-9999.ebuild 3984 BLAKE2B 0998817295edfa90796eb89669efc9cee334415c77196e649088f2c92ffb15d3a103479263052e75d169e2f749f17fac3ea5d3ca54c2b52d9cf83cd3f3212506 SHA512 f645622279c8c1b2524ac48807aeeedbfccdebbef6fc5f8609921da427af40d8810c25a97449d6e2cd0177bea59607ebd57cc4ede109e959f75d78db8c736814
+EBUILD scribus-1.5.5_p20200626.ebuild 4082 BLAKE2B 50a7feb8b12cf20ad57182dde2119cc22b1eab12bf3cde70a1288baa9acbc7ecf428736843d60663f409caba87b749656547eff738f03ee235a4ef14c8421eb6 SHA512 24f5d2dae11f2691aa054ccc4af537a06af4617e8b4852a3cd1d5a4761139b3427ed58d73d306ca129fb3a7884f1c1b2186c069a8916a51276b32b43c12a007c
+EBUILD scribus-9999.ebuild 3986 BLAKE2B f856409e29e5d57bb527f463ddada1e7461f48d16c872fec92328e781ef5a9e130b1c8fc0d06ffac59262ad28f22f7a9fb4cd387b96c0172b4cf6eeed72b205b SHA512 31fa1efd6797d803f6e5db8703fe3d40f2978f87dc9229872f5313b01ebeb6febb98d4f15ebf5c5a9afaf60d4e7de90b80b0d48e91c7e55915e66a703dd6f186
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
new file mode 100644
index 000000000000..a017d67eb016
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="tk?"
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.0[X,svg]
+	boost? ( >=dev-libs/boost-1.67:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+
+PATCHES=(
+	# non(?)-upstreamable
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
+	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+	sed \
+		-e "/^\s*unzip\.[ch]/d" \
+		-e "/^\s*ioapi\.[ch]/d" \
+		-i scribus/CMakeLists.txt Scribus.pro || die
+	rm scribus/ioapi.[ch] || die
+
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus/scripts
+		python_optimize "${ED}"/usr/share/scribus/scripts
+	else
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index d532762422ed..944a609bb5c5 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
 
@@ -58,8 +58,8 @@ DEPEND="${PYTHON_DEPS}
 	virtual/jpeg:0=
 	>=x11-libs/cairo-1.10.0[X,svg]
 	boost? ( >=dev-libs/boost-1.67:= )
-	hunspell? ( app-text/hunspell:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
 	scripts? (
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 6fd0548ee480..e4f5d96a651d 100644
Binary files a/app-officeext/Manifest.gz and b/app-officeext/Manifest.gz differ
diff --git a/app-officeext/languagetool/Manifest b/app-officeext/languagetool/Manifest
index f425b1924823..a532dd4556e1 100644
--- a/app-officeext/languagetool/Manifest
+++ b/app-officeext/languagetool/Manifest
@@ -1,5 +1,3 @@
-DIST LanguageTool-3.4.oxt 58043690 BLAKE2B d381d0e426619182e8e5d7469dfb18e41c7a993f1850afd1a2720199618eaaadd093f3b7efafc23601a42221e991e71820d963326618f24be4889cf55b04f5f1 SHA512 29eda8c4a26eb4da4dce68db6f962c8a8828bb0eb76aef3e31a58607aea9a15705aaccc4a1bc5366760bdb00c9133ef225291941e5873cbcc384627464eb9a8f
-DIST LanguageTool-3.5.oxt 58210562 BLAKE2B 77a455a9a7950aed69c5b6ffd1bfca43b0821f6b84cfa96d5aea05b9a57995c4542e4d651e150d964173bdc1e3364b96ececeda07919db68ad04293673f02c9f SHA512 1a36c04117c473ccb812f3b216763d816ddc796869488bfcf2f36d8ab325ef1620edf148ebb8b1b1b2d62a043b5b45f738e27ff440f6f99067601828a49f0e0e
-EBUILD languagetool-3.4.ebuild 469 BLAKE2B 989837d26b982fd26508b9e55fb47e473d8b9f8368831688b0639fbafb6bef949db088b59545812110d40350ef036428e2c8b9fb1f986238f3dca6e4f3a7377d SHA512 c1df1c13175daa42c33b3f8a1347ce33578d345a90428f485477f88e9591995f1d65b33d9f24560272ff24f64588bc262aefe6bd53095fcdb3d0cc4b2774abf3
-EBUILD languagetool-3.5.ebuild 471 BLAKE2B 77fd207069a87824ebb6b34488c5e8745e190663554a301785a2f1bc5bd19593b93a2c5bb9adb5b930e0813012ba74ac1e092e8c321b712efa8b977b8cdcf040 SHA512 44281aba8e5dcf70012a14dd98e21da441c488b440834407313a2a838ca24594b3d25385be98670511bc7b556e53b7d1557cb3f3b9bc6b92e87d0e2c6ecaf362
+DIST LanguageTool-5.0.oxt 141552168 BLAKE2B 040cb817150dd1cf137feadf28ca00ce6316a529709c1255438d0fa2faac3b5a516d9a48e3e3ba6bf2fedc3650050970eae6179578c5fcf005c6484c30cf408e SHA512 8493100684598aaa7c422360e0f00b5cff0c1be22aca4bee6c7e0e12d509916bc3c7f8df052b86702f6177ffffc227d1a5dbe6b2592fa1cbdb79f4666dc22c16
+EBUILD languagetool-5.0.ebuild 462 BLAKE2B 9e413e39e37e058e3c02b6557ed709bfe18ea12bfbece8616d4605d7f33a62dd631384b1b48c7f411deace3743c1db5ed30be216e357b385a73b5357060dc5e6 SHA512 4577e297c869f4eda030c0e8eecb6d8921d323f8f6e1d4e3ef0a22423bf50624ffa0d9465557dee491d0ef1647f19276893aed518293ae44a39a9a92bba6061b
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-officeext/languagetool/languagetool-3.4.ebuild b/app-officeext/languagetool/languagetool-3.4.ebuild
deleted file mode 100644
index e000f3752945..000000000000
--- a/app-officeext/languagetool/languagetool-3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="LanguageTool-${PV}"
-
-OFFICE_REQ_USE="java"
-
-OFFICE_EXTENSIONS=(
-	"${MY_P}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Style and Grammar Checker for libreoffice"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8"
diff --git a/app-officeext/languagetool/languagetool-3.5.ebuild b/app-officeext/languagetool/languagetool-5.0.ebuild
similarity index 84%
rename from app-officeext/languagetool/languagetool-3.5.ebuild
rename to app-officeext/languagetool/languagetool-5.0.ebuild
index 14d714d60ce5..962894ba86e5 100644
--- a/app-officeext/languagetool/languagetool-3.5.ebuild
+++ b/app-officeext/languagetool/languagetool-5.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="LanguageTool-${PV}"
 
 OFFICE_REQ_USE="java"
-
 OFFICE_EXTENSIONS=(
 	"${MY_P}.oxt"
 )
@@ -17,9 +16,8 @@ DESCRIPTION="Style and Grammar Checker for libreoffice"
 HOMEPAGE="https://www.languagetool.org/"
 SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=virtual/jre-1.8"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2d5ede33fd4f..d66e33e4b07a 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/c2ps/Manifest b/app-text/c2ps/Manifest
index 9559b64107d5..229e73f7c0b2 100644
--- a/app-text/c2ps/Manifest
+++ b/app-text/c2ps/Manifest
@@ -1,4 +1,4 @@
 AUX c2ps-4.0-LDFLAGS.patch 252 BLAKE2B 19ce475e2b7e1eeb4f02059ecf70ebf829043b805a1273feaa096c624d0b6e65166335a1b88e602051dce38db0ecc6df584f3517247d1ec510d60f459b66265e SHA512 78a3993b6f41d129de9f922ec23dd3f07d3a7bf632a6e27aefdcdcb80fb4275aa95d2c87355502d3fddfe5b14800fedef0a58954ef68fdc8b8a07cc699d43b20
 DIST c2ps-4.0.tar.gz 48137 BLAKE2B b2d07f97e1eee0d7e32070d828ec2c06d9d98fd6a480768e6580f8a12bf0974983ed144a6e92a9860f13e6b9ec780f9aa1a28ee42cedaa70c7d4ab6ca5e6eca9 SHA512 dde931a201950412c8aad04a59f9ca0862b21a221bb7212ee64cbba0193421f1538804525361075be3ed601c5015a0c4e0c3592696f8b545f5a45524b2c5c619
-EBUILD c2ps-4.0.ebuild 679 BLAKE2B d3994d4f8e852fb9a984be335efd47460dd5e4400b8d0e1846de38d1f15828c8761b791dc8326d7b0cbe4a8be57cb566f7f85afcf8d7b683ae23c6084b66a680 SHA512 01ba21ce9af76387f3394802b728d53f834df36a8d7ebbc74a3820bb3790927460bcef1f85b0e83852c9c973a9840d0069eb527860a4a4b781996a4da48b92b3
+EBUILD c2ps-4.0.ebuild 679 BLAKE2B 2d245e316aff507e65db3988b1c5b4a01ebb0646456d03e4e74148cb43a4edbdada145da49c98560d36f089e719e4311847433efaa101e89bb02d79c9e2fbab5 SHA512 03012529314885feac80a6cbb43e124501e3b74afea343b9323a50bce5e7ba36ad5722624a288e0e989def8ed79b91de307c025fe78e2deecda411c87b0c2217
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
index 84c0be2694a3..b0b847069c74 100644
--- a/app-text/c2ps/c2ps-4.0.ebuild
+++ b/app-text/c2ps/c2ps-4.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=7
@@ -6,10 +6,10 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Generates a beautified ps document from a source file (c/c++)"
-HOMEPAGE="http://www.cs.technion.ac.il/users/c2ps"
-SRC_URI="http://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
+HOMEPAGE="https://www.cs.technion.ac.il/users/c2ps"
+SRC_URI="https://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 9d249528470d..fbb4946d2771 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,4 +1,3 @@
-AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/files/fix-CVE-2019-18804.patch b/app-text/djvu/files/fix-CVE-2019-18804.patch
deleted file mode 100644
index b5d790ba1b1c..000000000000
--- a/app-text/djvu/files/fix-CVE-2019-18804.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 17 Oct 2019 22:20:31 -0400
-Subject: [PATCH] Fixed bug 309
-
----
- libdjvu/IW44EncodeCodec.cpp | 2 +-
- tools/ddjvu.cpp             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
-index 00752a0..f81eaeb 100644
---- a/libdjvu/IW44EncodeCodec.cpp
-+++ b/libdjvu/IW44EncodeCodec.cpp
-@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale)
-   int y = 0;
-   int s = scale*rowsize;
-   int s3 = s+s+s;
--  h = ((h-1)/scale)+1;
-+  h = (h>0) ? ((h-1)/scale)+1 : 0;
-   y += 1;
-   p += s;
-   while (y-3 < h)
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 6d0df3b..7109952 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno)
-       prect.h = (ih * 100) / dpi;
-     }
-   /* Process aspect ratio */
--  if (flag_aspect <= 0)
-+  if (flag_aspect <= 0 && iw>0 && ih>0)
-     {
-       double dw = (double)iw / prect.w;
-       double dh = (double)ih / prect.h;
--- 
-2.23.0
-
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 29c722a1a018..b5ae215fd9d7 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1,7 +1,9 @@
 DIST nuspell-3.0.0.tar.gz 403043 BLAKE2B b437012e4fb327f13d9ff0944dadf7e865c670daf153be00dd48e9d2fc01c87d410ebd5aeaa094f6446d3035346738010cdba961cfaada3751bedce264beaa6a SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2
 DIST nuspell-3.1.0.tar.gz 407196 BLAKE2B 688f6f59ba2f7bceaafe9a7cc707c008be93341e855ca60f07d6de67a626539693048af6f5ca40246ccc51e2573b76ba2bd4439aa9c0acb66a212bebd9219617 SHA512 a9bedfd6e2d77fd34d249cf7aa1fcb6bde5bced26f02f8a2dd860416a61488c9b7016a0df6015052fcccb272b342e6205db601107f46efa44c9d78ce261a826c
 DIST nuspell-3.1.1.tar.gz 379636 BLAKE2B 952cbe6f15221c0050f108b9f95718cc1d1ca9a94a7b15e0b6f2a53a92a2c95cf54f317b110bfc4b297943b9128bae8968a735ce68e7c752ff159359f4562f4b SHA512 239855051d9f49ba16913283090c4214a8f6a6cc290d359ab54014ff76fc297c131b67c6748bd1d4cdcec43c00dccc7f0c1bf8b07e06c9c648bff52ff193e096
+DIST nuspell-3.1.2.tar.gz 379029 BLAKE2B 80f773ffdcbfbeee0dd13cd325bb4fec5efa5b54ece92ac1589c418aab46c925419e9e1bc7e257a8320e24399f49bb867600679e34a5e40070b01a660578c92c SHA512 ed5206cb9ffa7e4ec6843988a75627d4ae7d5170444b6e7bd3496c1bf61c25412c4e68864800f2ad238d014b4e50d25282f367de2900f8a230f3ecc9ae5772be
 EBUILD nuspell-3.0.0.ebuild 1091 BLAKE2B 07c8fa7a2b9c03c18821ccd35bc1d9fa5f72490c4a9ec4d52cd4f4f90cb2d295771e2110b6ab50ab8c0bb34db075349735993e61f3d5ddca1380d5cec4e467f8 SHA512 eceed5f031c930296ed451dad77718cd07e4b052598026b4c59219467eb26c7eb050239d1869339791bd9e4bf437af9e54cefa1981ffe939394331a5dde8adff
 EBUILD nuspell-3.1.0.ebuild 1152 BLAKE2B 0ab1b278f6423bcb16a3133fb7c2223bdd654e2757a15d606100794459c411e1703b0426f28edec6b32d767ad4c7071e6b4db5e0c6b1f2e0fab0085cb96cf671 SHA512 ef38093ed47b99964a263505cf3374e4390830b482464082154358c860e47988fb076da79304ad540121424e1f7345652f9f646ed595502fdea364fc833064e2
 EBUILD nuspell-3.1.1.ebuild 1166 BLAKE2B 7e6a0daafb668d060b12dc4484619776d4db960d22710af3aef2161e9f359ae0719103c0a501b3545f1045c31a03677a331efe99fc6585e953c83ac5819da66a SHA512 34406e14d7def8e0f8c92373318dc4e4d7d810108fc3bd040faa76f237e6fddeefceec977399f4649517658c0131f38cfb37f536cdfa5c38a351000951f14b1d
+EBUILD nuspell-3.1.2.ebuild 1166 BLAKE2B 7e6a0daafb668d060b12dc4484619776d4db960d22710af3aef2161e9f359ae0719103c0a501b3545f1045c31a03677a331efe99fc6585e953c83ac5819da66a SHA512 34406e14d7def8e0f8c92373318dc4e4d7d810108fc3bd040faa76f237e6fddeefceec977399f4649517658c0131f38cfb37f536cdfa5c38a351000951f14b1d
 MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/nuspell-3.1.2.ebuild b/app-text/nuspell/nuspell-3.1.2.ebuild
new file mode 100644
index 000000000000..d5c3f19e7d56
--- /dev/null
+++ b/app-text/nuspell/nuspell-3.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/3"  # due to libnuspell.so.3
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ronn )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	>=dev-libs/boost-1.62[icu]"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	rm -R external/Catch2/ || die
+	if ! use test ; then
+		rm -R external/hunspell/ || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .'
+	einfo
+}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index d0953e085bb5..713fa0753581 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index fed6cc6da945..6b04df9d9020 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1,7 +1,9 @@
 DIST cache_tab-1.0.20.tar.gz 22903 BLAKE2B a083812091fccf085170db96a542e30caf924c09e6d55a35882e956b8660e2bdad9b9f428953cbb21e12c2dacb965713e9f2dd1f2772924cfdb190a436b55455 SHA512 5f2945c68b77dbce77c1e96c26e5d0d91e9d43df0228b4b49cd00335e272c81cc134ce465027cb14e9da6d92708c628dd841e676df0e7104f968506b3209266a
 DIST cache_tab-1.0.22.tar.gz 23158 BLAKE2B 38b6e357cdbe54abd1534a1b05610d60cb1f923db7eefca119ee2d7fb5fba25dcbf6d9506c8804fd5de55215520fc296af011999a86b125b88d53b756339480d SHA512 10ddbc5319ed4b826c3527e22f47e261edd910a984d7fb386a039621f3aac7121398095e7dd0c4acde0cfc922e6b7a469bb4981742598853169b6e447ee7f659
+DIST cache_tab-1.0.23.tar.gz 23362 BLAKE2B 6cd92120340600a3bf2444c716162e47c673dc4f2284324aba138552bbc840d2d9b26a506a66736a4d215129818ba51e3a4e5a12b9df4952a691995adc9815c0 SHA512 86875ccccc9384421c9040754ece7726891204f5afdcfe6da3e9e9a4fb2af0a670ab48ecc83f5fb379d8980c4a76e36c63b356fe0f5283e6cb131c75271d5c01
 DIST cache_tab-1.0.7.tar.gz 12827 BLAKE2B 57d669e67a980550fb4d671b22e69ff2ebd0482aef9d6163ff831390135c7ee1e83e87ed50fdb8e331402398a7cae2b081ac2861125c92cff6e9570c564b2c40 SHA512 9727a0103f47d63e5a07d630ebf45b86d1f1ca7ab5006f127a749fb633a8a6b73b00ed5ddde6f420073a96542d0e073a420020947775bdadef5257675137787b
 EBUILD cache_tab-1.0.20.ebuild 511 BLAKE2B dbeda452932672fdc4c40305c6e9c2b8d4ac66a112fe473abb154bf20bfbba0b46aa12252a6ee58bd53681f7cacfa927b8eab42287f7a00a5e0199eaedaf924d SHA512 f821bcad6a8a368e06414a5a805f6c3bb1861b883ba2fd87cc5cda204d872983fcfb4db01f32af2da5345a53e6571394d8612b1dbd97f6298b5f656d9b1d4972
 EBUILD cache_tab-1.0.22.ebuild 511 BLAKE2B 29889f7d465f1ff54c30c37f65e89235ecf044fd48c60e1d803911fbc0892721ad01981e0df8ed9dbe34fcc88620d937e9ec43efa5f3867769a32f68fedbc9aa SHA512 db23970026a5e7c5268797829004d41273d53c658d09fc887f9f805a77c1c4da0eee64b1918f04edf7f5a1fb9cdefaba39e629bf9457c943b7815e40fdd1f95f
+EBUILD cache_tab-1.0.23.ebuild 511 BLAKE2B dc3bd2c09c225b0a41afd2c1f89f23eef3c5eae6d2b4bb347848f9518b27c8aa6c4eda0d28a2ec58612c653b55253744b59859445cd02a4b6c727e18e185f23e SHA512 f564b5aa400b1cf6088f3b16629f7a67449993cdcf773d80f9e5814f0b31485de6df9f1b1ece66d869f044847c120b43fb52b4b4f47f34086c92eb19e5d3d836
 EBUILD cache_tab-1.0.7.ebuild 511 BLAKE2B 15eef954f50ab6dac96f7ba74d5a0a925035fc64eca78e4947ca0e9076e1ae13f6fefb1b2efc297ee4fa010092a1ca4bbab2f1d17713de76b7fa5bac460f59a7 SHA512 f4b2f28083b53fe04da214f6a8c46892f9c7dd5b5fa92f263ac9a8a017a48d901431e386ba966ba7988be5ed67a6acb637e8134f08b87655d7733c0913896c3c
 MISC metadata.xml 765 BLAKE2B 56bf8c63819d57e55ce37087e1556a6c7005ae01c20611800338c51adc6570d5495adc43526e1767a97c8ecae90760b18ab16f9a6d9d62b3ffdcac396795ea90 SHA512 d4ff8add477f79c8aa715932200412de793915060065fa41a5e94c4f7ff2e97a929c094dee5b04ed815874c20bfaaa6b8fe1289469e0566f9b4f8e5f58ad796b
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.23.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.23.ebuild
new file mode 100644
index 000000000000..aea3e1a675dd
--- /dev/null
+++ b/dev-erlang/cache_tab/cache_tab-1.0.23.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.19"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index 7890c102889f..63489e929e30 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,7 +1,9 @@
 DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
 DIST epam-1.0.6.tar.gz 47494 BLAKE2B 8120e4f10222468ee2adf2f0ec9cffcaaea8c1fc92faf9889de0f970562631cb54cd9ba34d01994dcf657108c4232158d5617e4b9c884bc84e5eb383028b8e3f SHA512 2c316a46ac734be2c74a86e767b413fa8ff1b296622b85de4828fdd60c84e5b3962f8b76004fcb39ab43a345ec967e3f3db4ac6d0e7335dc982dbcf1edf02c4b
 DIST epam-1.0.7.tar.gz 47506 BLAKE2B 8ac8026623a653c4d0f897fb08044003c2426ca1309b1e57cbdb6f6ece4662fd15143293e1dae1f806cbc3d6cf028712701e2587750de15f44304ed7e28c17bd SHA512 ddfcb6a0ef955e6ef0fba2c98e25fbc8532c829b80c4150d0545bb9b5114773184af0adba49921cf6e2363a0224dedccd7bf81b5da292dda74f8966a8e73e1b2
+DIST epam-1.0.8.tar.gz 47334 BLAKE2B be914b0a5e4657e3ddb3e9bcb607448b14451e112c0b929159a962ca8bdc778e6d7d358fb4053b500e71fddc2fbd16ce6d5b543a5f592c9037d71b4ec09aacc7 SHA512 b09624b7d1650ae741bcfcdddceacf5bfd29bb3e00a4044498d6eaec328f8762423f71025fb89a8242c76934c56b8d60f1910fc390766382468f3d844723bef2
 EBUILD epam-1.0.2.ebuild 689 BLAKE2B d9bfcd8120700da95bcf49ad78be634bb007f842ebd142b11fd15204e63356884c78e88cee691460b226720f4d3a8d6292e0fc89695772837ded9c8406c78f91 SHA512 20d17e41ae689835560586e6bbc6df8f1410f7db8a343c2d0cb73ec971e2c9f423f63fae8e7889e36c1fe0eedfa9c58be80c8f132915a138602a74ff84cb9f23
 EBUILD epam-1.0.6.ebuild 707 BLAKE2B 682c2b6f1f4a7d076c6f1cd6d05a907d50523d170bb732275284dde8c30617697b95c73009895f0a6883f0a6e68252a82f9e06131bbdb019bafe1979e5ab9ece SHA512 7ec4cbdbb85122cfa0a5430d2405fa84601fb9e9f0629b91d050dc0bd26e6f1b48212aabe4efdab8f27c9244996ac10204558ae1a1d59ebb75f94da32279766a
 EBUILD epam-1.0.7.ebuild 707 BLAKE2B 39cd02393fe143571a69f9f891fd1871d20e2ba1d74fe1ced2926a40e549b894f355332b513ed2759191dff71d3873599c53eccd8312eaef2bd3bf5a6d4e266f SHA512 81c917c08d22c0c71751fe30ec1e13195ba26b20642ebd4d18919f617c9823bc01ab457d3364e51bbb8a0606e1367a678e47d847c2675c36da7c1e5052ff26a4
+EBUILD epam-1.0.8.ebuild 707 BLAKE2B 39cd02393fe143571a69f9f891fd1871d20e2ba1d74fe1ced2926a40e549b894f355332b513ed2759191dff71d3873599c53eccd8312eaef2bd3bf5a6d4e266f SHA512 81c917c08d22c0c71751fe30ec1e13195ba26b20642ebd4d18919f617c9823bc01ab457d3364e51bbb8a0606e1367a678e47d847c2675c36da7c1e5052ff26a4
 MISC metadata.xml 300 BLAKE2B a33450cf19659d35cebd7c2af55112772ab91d24fb791b995bf71a87de6b16b1aed627620640f3abca6d5f6adf672a02ac0352a12fa1542b35168ecf0b99bf47 SHA512 2aae6f30853e3a91c983ea72464c4a09c1d8c8e24080d78f91d1f77c3f62db62621ca7e9bb17d69ae3be9f42acb17dfb77f1448de43be8bf9b8545e601780ef6
diff --git a/dev-erlang/epam/epam-1.0.8.ebuild b/dev-erlang/epam/epam-1.0.8.ebuild
new file mode 100644
index 000000000000..bc3c599bafe4
--- /dev/null
+++ b/dev-erlang/epam/epam-1.0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
diff --git a/dev-erlang/jiffy/Manifest b/dev-erlang/jiffy/Manifest
index 8f198fa1ecbb..e13705f3722a 100644
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@@ -2,8 +2,10 @@ DIST jiffy-0.14.11.tar.gz 1878494 BLAKE2B e0240c0dcd81e1e505c41197772ecf659c76b7
 DIST jiffy-0.14.9.tar.gz 1878413 BLAKE2B 6df392a6849b012d6a635191fec90f116b729d2602342b85ff4e0585f5db7c1319bf2d622d74f1807476af879a117b8e7d7b45c1d834f81309d96f184cbe36dd SHA512 2c8e7b2ea95c69cb0c6a7d02e341591e6807d0d81577050bf6f884dc7af7335e909f01cf7017ea27fae922d9a50ca4709fe0603b5de282b58d71afe4e06f7813
 DIST jiffy-1.0.1.tar.gz 1820182 BLAKE2B f2a3482cd1a8c3b713237e6564493cc480caafb730a058c3be0b1bc71f30d24733b94deb0b895071f3ac5b63c6dff03a52440406362aacba271c5decd9eddcb8 SHA512 cbfa148833ceaab42a970a4894f781f02bb214fbb2d042ccd22c8e04b53e47b53be51abdcb30ed7b143f0b72deb6d20878ca23d518090707c43f2b36431f7087
 DIST jiffy-1.0.4.tar.gz 1819151 BLAKE2B 76486e228ca5e11b9f7828d0cfb34975d1a1f318187dc22b9497e4de0af906e3b88c86f43f82eb4e8963d33846a94e51d0762d2fa3eba78c9997942cdf3c7f7e SHA512 a1a09e625e99dd4c5e7812a03b390eec1ea90b444fe71ebfafd50ef07b36dc53d18cd01a970a6a102d89c2ddd68b2390ca4ab8eb9a296e4e7b87220422c7e127
+DIST jiffy-1.0.5.tar.gz 1896318 BLAKE2B 2ec82545b80d7cfae70a71a5bcb70be1f8c905bc2ab2ec5132d793cdb8050a7bf463eae99771afe9d80fc7911fc0e635c29d2bc236275ac1f564f99685b3fd1d SHA512 607dded2ccb5f27d6608e19a03fece847fc7bf5c7a1d92a7fafa95efcea157612c73807fd6d624445fa68f895ea4456bd851656b952d5e48b58b6fedf606a830
 EBUILD jiffy-0.14.11.ebuild 429 BLAKE2B a57d881e7f2fdb2486054307a61e4f6c78415df531e17678e9924a930bace7b3e1731f578031edd679bdbbf4d93ef72f0cb512954c9b90f24953a3602678f2ca SHA512 d6620816da5153529280e7d68acc8d4f5d0530f37cb46bcba5c2a22d3112b1daa457fbe27eec20d33391cd682180aa1a2b5b69a75094eb05c139a68359fef1b5
 EBUILD jiffy-0.14.9.ebuild 432 BLAKE2B 95dbfe69e155185616627ba6b24eb4159c656db10932beb1b2359f6167c7d129ca83b8c52971cdfdaa2fef4039858666bc5a6adb104b0f55f7e8c5e6aa08349f SHA512 4606d0c9e1175d32669dc400790cd395b52b77a4730d9b5ada03bbb5d0ee88c7b9049adc2d558bbbb2ad9e307e07d2e5f13a33484131abe483a7fb2860a5e167
 EBUILD jiffy-1.0.1.ebuild 432 BLAKE2B 38815c4aa9662e331c6ef3452f8a9c9f2780793df9a353dc19236f10924fc58ade4249d2d14ca3da2a0f943a4ebb22600f8f1d279e1408b7ea769b0da8b69a69 SHA512 1722c94fef3dbf4fe76a69b8898a299a60613d786b48b9ac731d53d73315373f7b0f5a8756dd3ddda2369dcddc4db294e0540c3b3ccc6a0877f522ca2860053d
 EBUILD jiffy-1.0.4.ebuild 432 BLAKE2B be5da8e042e2a99a83c485d5be75504196e39bf2175e764bd064fb7e97d50795732af3a3d34837e113688d4d5f20e650f7fd8679f61eca3cf0166163129defae SHA512 27c5a61b69d156ea0dd0a586da3d0e6327a1e60f3efa2ee321ee98138c23b6af9ba3765417625f23686310b247ab8c1712babadf796d9981f4f78fb1d8231d26
+EBUILD jiffy-1.0.5.ebuild 432 BLAKE2B be5da8e042e2a99a83c485d5be75504196e39bf2175e764bd064fb7e97d50795732af3a3d34837e113688d4d5f20e650f7fd8679f61eca3cf0166163129defae SHA512 27c5a61b69d156ea0dd0a586da3d0e6327a1e60f3efa2ee321ee98138c23b6af9ba3765417625f23686310b247ab8c1712babadf796d9981f4f78fb1d8231d26
 MISC metadata.xml 297 BLAKE2B e2c4eed3c56ce68b2c20e85ebab3d7c726f5cb8dd64d367137dd91298c372edad335d0a88b90da55092c0af8470c760d166f2f2611ef00cabc7fc75fdae1ae5f SHA512 0d276618e7023cefc54f3f0d87542a99dd65892b1d021c12719496245ec56a5aacd76fee2a92e35f19c3c5c36c15651605fb62f1ad78c0cf40e8149f013c4f6e
diff --git a/dev-erlang/jiffy/jiffy-1.0.5.ebuild b/dev-erlang/jiffy/jiffy-1.0.5.ebuild
new file mode 100644
index 000000000000..4de5857dab6c
--- /dev/null
+++ b/dev-erlang/jiffy/jiffy-1.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON NIFs for Erlang"
+HOMEPAGE="https://github.com/davisp/jiffy"
+SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index ab56a235e27e..57ba9c673b95 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -1,5 +1,5 @@
 DIST lager-3.2.4.tar.gz 245002 BLAKE2B 4d6197cbefed0f9d53d4ef522b2f0827e86e404e108710a0c615befb8d033b77cef3a2fd53a9c9b8a98fd0f708be95e7d0a6d5f64802cf061d5171f343971c7c SHA512 765e132c19c46593f79f73400d04801d27767192dfeb75c3d3aef5a20963dc6113e544db35dccee2a975476a5653954a79ac49eb923d84daade0dc64a8c1e6f7
 DIST lager-3.8.0.tar.gz 271830 BLAKE2B 13e84cfb561493d3fdec2d8fe9d585eed8716aa831425616b73e84cbca1c1951186bf7c378dcf21df0006a910e56458b9d9cdbf69eefd85e519fca2a1d98e8f3 SHA512 bcbd522bdc39e19466dc3e6fe8fc81ba10358cbcc167e278402e91164992fc0ee7c02e02a5bc223664c0d5974a1ba107756b073509453386003c9d02b3dc388b
 EBUILD lager-3.2.4.ebuild 620 BLAKE2B ee3115a7797801c911d810fa9bcbf5ce11d133203202f7a855135fe4a04401c98d48883757a7621c1b4b5281d683f0dd3d7341c9f2f1e2bdc1c0b9147bbc36d5 SHA512 b37681d6a2dd33988bf8eacd8fa14c31c052694d8cf2b5d50e2a7f231adc8d37524683046d088244c131ad5b013687d9b9270a82c46a25dbc6aebe4566541918
-EBUILD lager-3.8.0.ebuild 676 BLAKE2B 699135bd286b9feefa26432bd66725602d9fd60c7b8138d7fa45444c0da51875a977f693b2e91539030973ed3965ef47d6648cfd063866e6487842800cdb8295 SHA512 fd793aac2a08a7875f88d54034bc16604a30db5b10e447e2752610720316c013cf7f4c806b8d69dbe0552cb1d3aaf5370c1b9728c99acbd0fd7ed4e1e10f71e7
+EBUILD lager-3.8.0.ebuild 734 BLAKE2B 02029ef5d3da0f095874fa5deec7c6c3e095e952fb1d8674eb754c303c6911235700341564d66382c16fa01564fd22a5ce6b4519cfcb3602a475a1a522d7b48c SHA512 372d86be04896df430210bdb87549a9fa632b60f0ce8824ddef9d1ec5f54ce5b9d4be99979d73417ab8527754fce8566d944beb7d766df77856a0b38677feb1a
 MISC metadata.xml 643 BLAKE2B effda1c4112990b35bf6edde305448ca9426182d15e85442b049df4584eeb5c41c0d163a19996968335470bc10bc32c4143a034f92900c698dc04a7d8d7883bb SHA512 7d1ff8003cb6b55fff3df2f79441da072691c10cc810df247b03b82e995e4f7da5cea6a2cd6626ad84a133bd39f66d400fbfd22a86e3e322ef5546f769d9a3b6
diff --git a/dev-erlang/lager/lager-3.8.0.ebuild b/dev-erlang/lager/lager-3.8.0.ebuild
index 325c7b7710c6..47d0d88a34f5 100644
--- a/dev-erlang/lager/lager-3.8.0.ebuild
+++ b/dev-erlang/lager/lager-3.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=6
@@ -20,6 +20,9 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md TODO )
 
+# tests broken upstream with erlang 23.x
+RESTRICT="test"
+
 src_prepare() {
 	rebar_src_prepare
 	sed -i '/goldrush/d' rebar.config.script
diff --git a/dev-erlang/proper/Manifest b/dev-erlang/proper/Manifest
index eb2435d17df2..acd3c1952e28 100644
--- a/dev-erlang/proper/Manifest
+++ b/dev-erlang/proper/Manifest
@@ -1,5 +1,5 @@
 DIST proper-1.2.tar.gz 291892 BLAKE2B 6c69f449c8794c1a957c78e7c478385bb4590f13752856c8695fadcad5f25943da8939d028b21e8615042fccda20561479e1906e4e1c701c281d29123000bd65 SHA512 07030eaf63d7e28d5df168ab6b49bf1ad1850b962453079f8421ce4b682caa0e6bf166a71e7abebff3d61c3ada7da86fe3b6ffee3a8ddadb9686e75733cbf75e
 DIST proper-1.3.tar.gz 385139 BLAKE2B ff161c9ef694a039105a4ef863952b1a9377bcdfcecebe760de15bfe722291aaf2098a1e187357c6c30586024313f746abf52c89f6c337977deb6caeb448d404 SHA512 4d57ad4fb2a73aedbc9d839c953f0a844bc13acfbcc7e7ec2f0fcf3570a6b877589c1684a28e30dea93f469f6a7ab6db46bb95bb9b539721f6273eb6909dd2bf
 EBUILD proper-1.2.ebuild 517 BLAKE2B 76618a1cea25946ea2e1277d78c9133112142a7fd43b6483ff54b78a07e5379ef61a365bc8018b2cfeae746c5a0ffc02dd44a1d8609aec6a91fe0ba7130668de SHA512 d59107ab2f28890e4b9864fab694127ec88b83136bec0d6028bc07918610c9c5eaadacaf8d3de8675005f3d5ede0f2c6c7d29a8f19e42121ecd2565d011faea2
-EBUILD proper-1.3.ebuild 517 BLAKE2B 76618a1cea25946ea2e1277d78c9133112142a7fd43b6483ff54b78a07e5379ef61a365bc8018b2cfeae746c5a0ffc02dd44a1d8609aec6a91fe0ba7130668de SHA512 d59107ab2f28890e4b9864fab694127ec88b83136bec0d6028bc07918610c9c5eaadacaf8d3de8675005f3d5ede0f2c6c7d29a8f19e42121ecd2565d011faea2
+EBUILD proper-1.3.ebuild 574 BLAKE2B 8b34b68fa95b56d36ff41ca5128a1fbf1e660bfc77feade87c194ae8e2ea241357ff427c7edad69df647d47fd6c70a246f6092d5ddf2826a19eedbc1a6026586 SHA512 4f9a9ab6f2fe058b5bef17c8c0499a300d17012c125a20921a3f0d5421cbf2d8f2b50c0dbf9ff86505878da3b6d76cf9c21b7655df863e84241a388451a5b946
 MISC metadata.xml 301 BLAKE2B d8a8582e03629f16384ce3b163c6684bc204dad4e688a6e05c8f64985dc6c7aa8a9c0a4ccd5ed3786ba32f57d8a591f3a340dff099c022a2608a4bb86bf57063 SHA512 b5e1a00d235d45d780c5189c06496c3164b2cd8e0d9f37a2b1bee2191badc275a8bc9e1631c296cd52d71d000ee5adeb8f69c6c97e4d4bea1c2700f577886c22
diff --git a/dev-erlang/proper/proper-1.3.ebuild b/dev-erlang/proper/proper-1.3.ebuild
index 6e489aec399a..3886a00191cd 100644
--- a/dev-erlang/proper/proper-1.3.ebuild
+++ b/dev-erlang/proper/proper-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,9 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md THANKS )
 
+# tests broken with current erlang 23.x
+RESTRICT="test"
+
 src_configure() {
 	./configure
 }
diff --git a/dev-erlang/sqlite3/Manifest b/dev-erlang/sqlite3/Manifest
index ae5d8caffc5d..df6715359773 100644
--- a/dev-erlang/sqlite3/Manifest
+++ b/dev-erlang/sqlite3/Manifest
@@ -1,5 +1,7 @@
 DIST sqlite3-1.1.5.tar.gz 1833901 BLAKE2B 19b02655962e4f70b01826e1346c93119a2a9bc8474083b0cb7719cdf8096d7fe7e33c3e8f17bb1d1bf11e32f4f9707fc2bb15ba6bfa848d2318a9e6c517d85b SHA512 894f39ba0760d15c4adf396d277cc30414c28acbc62135395af6939f769cab9237e836d5c3dcb5250c41917bec3db577902c01dbad1d2600480b3647c3c61c30
 DIST sqlite3-1.1.6.tar.gz 1834834 BLAKE2B 43b8bb8c10888aebd8842ffe410c1aa2506606dd99c551778b08b2c70788c4bce201758a0bb950e949d25a1d49351c17e2d225c2ad165588378d166959b7485a SHA512 f3781c186f4f677340bf752884559e9afe745726b6e8dfeb8b701ab34a5e58af0e7dba8bd852443f44fac874a1af66970ea29b044ff2f0cfbbeafbb4996cdc8d
+DIST sqlite3-1.1.7.tar.gz 1834822 BLAKE2B 9a3f30a3a5f4e7ebe38aa1a808057767dd6d43ab93b352b44fc3aef4c2ed8c19b5f4ee258a4ff7a2c052fb4f480f1fb3629624a171b07eb5e661acbc97b165b2 SHA512 8e4bd7dff93f7629d648934c4ce29c318d62313aa10de35144e4f6a3d8c87d8a423ccbe1c810476f8e8048358be4cb8ef242daa6138957e0b0d9c65fadbf144c
 EBUILD sqlite3-1.1.5.ebuild 562 BLAKE2B d06a61c8ea8c5afdd99fbd141aef17bbd3f575b49811bbd881efef48ff186e8162584dbd4dd99247bcc4051bd569983e2399510cd7e5243f7d4667a98b4b9d30 SHA512 5385ec725fc763f672d4af06d926d2e9d0ebc8a06b1c460640f91fba3273a6977992bf0e667c28173d6fd3f2ea0347d5b8cf3bb2fd1044b17b2759eadc72d70a
 EBUILD sqlite3-1.1.6.ebuild 559 BLAKE2B c22f7a013c04791cdf8a284774dc111fcf5682b7842f11137bf339fa5822e0c92d286fe772cf2cf022ae73e4c2ca81c6b3cad2f8e94584308cadb2ab2a4ad309 SHA512 3ffe525f476ff07b234f1fdb5e8bb0d7fe3601a9d7d6001cb6c4895f9c220246d3b31bf1fa42794d2b2e7ce1901d4a5dfe5c55b8d71b87365ba801cbe31e9c73
+EBUILD sqlite3-1.1.7.ebuild 562 BLAKE2B 89b905dc2621c86ff10fbf97557136687c13a20398ea5b261dbd6307b9361dc7a99e91e5fdf1bdce1d7198a6a3b51b04d84d6879ecf2815bcad343beb50e386e SHA512 03e70f878d0fd2e8522cb17986cc9794d8d5de7a3e438f1f785e67253fa6c123c89b43e201967cec68761615ffc8d3f4c10d99753f39a19de9c56f521331b274
 MISC metadata.xml 310 BLAKE2B 9eb8a6f6e52d8b9e6f0cb38f374bdeb0d6973dd71b421808a2ff72e31b0e6890a4cb5d11566dfe7c523b691dbd858f8f2105ce269d85429bd69aa20929af95d6 SHA512 a9ca10f4266edf6ece231e2c50fe37b7eb6913815156c678b3d3d6911c0bcfd9b00315c1e81ff071a470492f7ea505a1601a1ffbcf88e4090c545f77e329f6cc
diff --git a/dev-erlang/sqlite3/sqlite3-1.1.7.ebuild b/dev-erlang/sqlite3/sqlite3-1.1.7.ebuild
new file mode 100644
index 000000000000..fad82199d9b9
--- /dev/null
+++ b/dev-erlang/sqlite3/sqlite3-1.1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+MY_PN="erlang-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLite gen_server port for Erlang"
+HOMEPAGE="https://github.com/processone/erlang-sqlite3"
+SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README.md )
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 748260b1a7b9..9f5c34f1ac29 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/cardpics/Manifest b/dev-games/cardpics/Manifest
index dce219fe8326..2bd4aa069a9c 100644
--- a/dev-games/cardpics/Manifest
+++ b/dev-games/cardpics/Manifest
@@ -1,4 +1,3 @@
 DIST cardpics-0.4.tar.bz2 151425 BLAKE2B 6288352ad22dcb38610791ed44be955c473c9ebfb1e31c2b290e41e062866b4843ffdff074ebeb1e485fadb4917381b09492566dd761bb578d88f515711a4061 SHA512 7451112f5b7954326e381563a3730c677b261481de79ede3def451591ce081e651a86a4c24ff3259ab979ac109446588bb1cacd0beed6892a5a288f190bf6382
-EBUILD cardpics-0.4-r1.ebuild 327 BLAKE2B 48a35b13fa2b2e764c2c4f55a84321f7543ca32689a8610ba90e3c0f73517162bbd88b9ba4491a80d5aad9b816649c426799d2ae6eb393f52fc590020c3aee98 SHA512 de790aa9b33589696ac4a443eca9a595a47185a79af51a6ff8a7923aedc5ca4770ab04c2a94c47b7d6e3f658ef771336cd1196948a1f964c42c44cc4d14d897c
-EBUILD cardpics-0.4.ebuild 384 BLAKE2B b1f4253af23a2256df9b2dac3f2d6d0db51162dd17c4af198e1bcfe77c04a224b9ea0f35e78f2afc8a80b6ad6093f906063ffabedc73dc5c20a2e53ce919e4d6 SHA512 7b9ad606eba08dea69d59c233bedad164a0dc3971ce818a4faae4c0a277ce82f6e0a4a3117cd6de720f3c94907ad4a71eb8b09a8629ca5379ecd5ddaeb0e9726
+EBUILD cardpics-0.4-r1.ebuild 319 BLAKE2B c1a76fd9ef253bc7c22e0c0902735dc371ed4a39aa9945e50b98619636b9cd99e572dde2e1c27b9d474bdfcfea77bdd4d72b8c336123e3b0ec7e1371e89c8b7c SHA512 ba6639697435891999156da12cdfc34fddd28205971623054f448751cc3e95f969abb3a305c5a7c1f74cf5d2568f07b34e7388f99a6cfbdbfe173cc91fd68581
 MISC metadata.xml 507 BLAKE2B 3c6055891c277cc7bcdb49bf0cdd1609ad86d87dd94cd7f06219aacb43f35de14a63a0b839c7714f7cf62e02468b88f9698356eb5dd23c77b33bdbb6d1b9c2bc SHA512 d460c3bb0906231f2dc1bcd65287aea962a9d88aa676ec87e313fa8057334976330b295cc9495cbd346af0b2f78c41454c9ef611be7aa815421ed037677644fc
diff --git a/dev-games/cardpics/cardpics-0.4-r1.ebuild b/dev-games/cardpics/cardpics-0.4-r1.ebuild
index 9042e9a0142d..4ba122862bce 100644
--- a/dev-games/cardpics/cardpics-0.4-r1.ebuild
+++ b/dev-games/cardpics/cardpics-0.4-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="set of free cards sets"
-HOMEPAGE="http://www.nongnu.org/cardpics/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.nongnu.org/cardpics/"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
-IUSE=""
diff --git a/dev-games/cardpics/cardpics-0.4.ebuild b/dev-games/cardpics/cardpics-0.4.ebuild
deleted file mode 100644
index e6044663c1d7..000000000000
--- a/dev-games/cardpics/cardpics-0.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="set of free cards sets"
-HOMEPAGE="http://www.nongnu.org/cardpics/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b2f735e789ec..3b0f1c59dbdf 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index a33878d1f3c9..ce29c758f8cb 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -19,8 +19,8 @@ DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c005291
 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
 DIST erlang_doc_man_22.3.tar.gz 1366911 BLAKE2B 89931e9ea4ef54526eb910d3b0a56711e447dffc0463d7583db8875b9be789fd369f701eb7b6fa5da7b63de3f41a8e4ba15db6db02d90642a8b322f3897d7a2b SHA512 b47c66ebd34d2f511a702e97acd67eff7c5d47045a80ffb17b21032a9b9725b015cd171b78c04e3169a95f0acdbdcab57647b31ace751c9019ce3f7c75d743b6
 DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d94bc60a86fa93b5332c8d1f3e12a0071d9e6d4759be73bf44bf35dd14723b9e6707a84ba834e1775bc28aeec1edbe168 SHA512 81575ce7b267f5bb48bd844808e8edd4e373640bbc481372b288602eb9d3c9917e6c7c040c035b63a2f6edf437c3d826d6afdf5801765b51d9edd4a3b2a5b16f
-EBUILD erlang-21.1.1.ebuild 4646 BLAKE2B 50adc94870a8efc3d0762bcfd3dd21e9edb746ec0313fd9dd5f30fdffbb4441fd1967a47937c3d23cd7e2b6b10554208448ac52b4a2302e9fa28149226678087 SHA512 66b7743c497112da8a4c56cd6f9279e3ea88c672d0a6d2b311e828e7e057f2ff2950816dc294bd87e98d3f589bb67c0c0c24633a34df183a10ef61967aea2f7e
-EBUILD erlang-22.3.2.ebuild 4592 BLAKE2B 5878bb1e07cec281ed45e69d548be922dba88245f86948c24740e93c4cf5ae810e7c251fdd6960420513dae09b20fa2ed1bb82556b21385761a788305145d70f SHA512 7b2e131cf48313dbc38692ff5f4bd671347db050d85de41b9b7312ea23495b2ac5d62144810ac7f95478bfc14a3b1aeb39413b91dac2dd032fc079c8897591da
-EBUILD erlang-22.3.4.ebuild 4597 BLAKE2B 8ec18ffdd47e90c2d85c77d8be0ac3102d44e9f58e4fa9f67832ce5a43d6a35f55d98116684b800ec904e4785201e6cd218ec46ccf1f1bc13a2f1f44801f62df SHA512 207fc0f0d45a5d84ec5b49f212b8d87df831650e3d426db9ce4cd84e40407c19e2574010ef09b62e8d150a4bdbf9f4ea6284be7aaf31319b155d2b4e912f303f
-EBUILD erlang-23.0.1.ebuild 4592 BLAKE2B 5878bb1e07cec281ed45e69d548be922dba88245f86948c24740e93c4cf5ae810e7c251fdd6960420513dae09b20fa2ed1bb82556b21385761a788305145d70f SHA512 7b2e131cf48313dbc38692ff5f4bd671347db050d85de41b9b7312ea23495b2ac5d62144810ac7f95478bfc14a3b1aeb39413b91dac2dd032fc079c8897591da
+EBUILD erlang-21.1.1.ebuild 4623 BLAKE2B 79bf14c9cde34623bbabc16d9cd47e299987d7f50f17d01445c375a6523a8c1bb5f0ef3ff01d8d3dcc3765b089c6572c8ad2d7429fa5a0019d928d9cb833316d SHA512 3bf71f12301afbf94920e504c72a53b194fe11930116a2986bbbb656ceff1e0b8ad2dbdd9ed616e20d1caa9f7363c94a3d4841c9430d6ff54d51e08cd02eecd5
+EBUILD erlang-22.3.2.ebuild 4569 BLAKE2B cd3901f37bb9156c4f4b234aefdfb02fea06c9cde15622e428c73b05f29c70c02c82415359d1ad68f665b88a0a13d6e0177c46ea1b992cbd2d01af2f3912d2ef SHA512 ee49c37719ab86d5f2335336cccd9b9264906f8d9af315fc5abf7a5ff4564d38d763eee1c3450489117aaa69697bb2948c1f5cc9fd8401c7866423a620ce5ea5
+EBUILD erlang-22.3.4.ebuild 4574 BLAKE2B b55208b5f2c15f62d6687f3ad44e54f958323cb7ae771d4f3313acf5a57edc30a51e0f0c2477765a591a1b9035029094894d8776567bc4996bfa9a5ace1a0b72 SHA512 0d17ac78b892861017bd245444e06eefc52761da19eeb663aaa26b8ad099cc4b1fcfa553353651670f1a575a00ef06805b6e7db97c789cd3dc2fcfd1a3c1f68e
+EBUILD erlang-23.0.1.ebuild 4569 BLAKE2B cd3901f37bb9156c4f4b234aefdfb02fea06c9cde15622e428c73b05f29c70c02c82415359d1ad68f665b88a0a13d6e0177c46ea1b992cbd2d01af2f3912d2ef SHA512 ee49c37719ab86d5f2335336cccd9b9264906f8d9af315fc5abf7a5ff4564d38d763eee1c3450489117aaa69697bb2948c1f5cc9fd8401c7866423a620ce5ea5
 MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461
diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
index 8eae33756bb8..b88fb159aca1 100644
--- a/dev-lang/erlang/erlang-21.1.1.ebuild
+++ b/dev-lang/erlang/erlang-21.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,6 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-lang/erlang/erlang-22.3.2.ebuild b/dev-lang/erlang/erlang-22.3.2.ebuild
index 10e018b031dd..eefe9fc3c904 100644
--- a/dev-lang/erlang/erlang-22.3.2.ebuild
+++ b/dev-lang/erlang/erlang-22.3.2.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-lang/erlang/erlang-22.3.4.ebuild b/dev-lang/erlang/erlang-22.3.4.ebuild
index 5a0f4f57d150..a35562ba4679 100644
--- a/dev-lang/erlang/erlang-22.3.4.ebuild
+++ b/dev-lang/erlang/erlang-22.3.4.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-lang/erlang/erlang-23.0.1.ebuild b/dev-lang/erlang/erlang-23.0.1.ebuild
index 10e018b031dd..eefe9fc3c904 100644
--- a/dev-lang/erlang/erlang-23.0.1.ebuild
+++ b/dev-lang/erlang/erlang-23.0.1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index b67ea875b3ae..a94aefe19a3a 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -18,5 +18,5 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 EBUILD julia-1.2.0.ebuild 5338 BLAKE2B 60f77129192f392a3abf31556de86df1bf16564e7c1597bacffe601edc231715db077903b32d244504e7672b9971d19cf22d735808e51983fa0793666aa4b6f4 SHA512 727270ae0b4c99c2da7cdf9f877f194bb2976be6b633aefde56381657bef6521dee6ca047bcdf9a7ebe736fe44871e23a45c7c81ad592759e604c58a20836744
 EBUILD julia-1.3.0.ebuild 5334 BLAKE2B 0b0f07c68075f5418348fc980ea810bad34f100c3c29414347f4c4b9d9f78c943e22bd677c3686deb8846f22c29b7cfcfee3f226550b3fc08827f208fd17c98a SHA512 ed1a6e6f9413e3eb5b7bd1f4d5381a4473fe5ddb2f6a275914e2ab070a03fc3e5cfda60d199cb9f14e5ccfc136ed91fac43ace8416e46692555836b1dd6c2f93
 EBUILD julia-1.4.0-r1.ebuild 5240 BLAKE2B ecf34fe8db9778f2b092ec1db23314ef24f8e3f209129a796bc74b665b3fbacddc0da942f25d26eaf422cfa4a4235d824d81a508ff5b58e56f89ba87d138cf2a SHA512 92722ea1d525b1ce6c92b8bafac1b2436915cbb24243b79f837c65671e4baf0ddfe9d02bc2fbc5567957e70d514b19471fdc80c0d5cc98dd320ea195caaaecc0
-EBUILD julia-1.4.0-r2.ebuild 5697 BLAKE2B 63622cc3928470a690e6780496fbf2c819456cf14006e23a1eae2b3017145be29b11c23bacde38e9e93c214bc551a8a9b80c67a024487cf8e6ef316b5176f4ea SHA512 77966db0e5db93e1bd74f1f5ad464157e20621e659d8a1b8eb63755813c049d5232d4410cff1d72407ca885748072d5ed71c692faa879bc269c645244d34836c
+EBUILD julia-1.4.0-r2.ebuild 5698 BLAKE2B 1ca4fb47787422c4931a4467ca45415075b11e8c8c12f1da781644e47969a70aa10451b915ae98579bf6cac2e450c3946b81815d73909c0c6276e0767a748d9d SHA512 efe8707f3cc6394670d20fd86b233f7b2c65c726d4a2ff3c43886e2531e751686d9064498d88e33b1e821738e410e5086e133142ec09bd398b5bae5a810334df
 MISC metadata.xml 1388 BLAKE2B b58f320281f3b56151e4f647b3124b2bd915c9194041c7aa3e228cceb56f1d4d6625b9b86394a39c1fb7c0bb524e792cd60576ec76a766dba41204297d792ddd SHA512 91835d230909a2d10ac26280e49d3538e57fc708f141ce366d55d21dc66b588e551aa4e054e76a44695c065a82e6aa09962b84e86eb1f4f12b87ecd90ca256b5
diff --git a/dev-lang/julia/julia-1.4.0-r2.ebuild b/dev-lang/julia/julia-1.4.0-r2.ebuild
index c55c6fab3a64..0755009420f0 100644
--- a/dev-lang/julia/julia-1.4.0-r2.ebuild
+++ b/dev-lang/julia/julia-1.4.0-r2.ebuild
@@ -79,7 +79,7 @@ PATCHES=(
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 pkg_setup() {
-	use system-llvm && llvm_pkg_setp
+	use system-llvm && llvm_pkg_setup
 }
 
 src_unpack() {
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 01801c0c217e..9014db2ad0bd 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -7,6 +7,7 @@ AUX spidermonkey-60.5.2-ia64-support.patch 1615 BLAKE2B bd2ae36194bdb6a17638ec50
 AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
 DIST firefox-68.0-patches-14.tar.xz 17488 BLAKE2B 697aecf97b04b45ea17ed1c1eaded95ca5064760cd0468968326f1683c10d91b76458c0f3e1ae7772b0d43c33632c03a69e5b09579284de19ecaaf7603dc2412 SHA512 9a601b80f747eb52ce772ec931d4f5ff0180ca1531c92d46ca116fb8218c829b9be496392e785d79106c76abef149e666cdc65204bdf1ebb7904b65264cfa6b6
+DIST firefox-68.10.0esr.source.tar.xz 314526224 BLAKE2B 698367314caa4d8e9fd64e5ec6fd26316a26470f94d095dd212932cb968ecabd492563d661df46be693c8deb16cdb45c6ba756d506a8211f184e4637c7d9e986 SHA512 c5c1833560364851e7cf8ea51659bc4fb60239b960125cdb20fe31f742d757ffdaef8f314f800dc91214ee8e358033dc2af971c08bbba474ef6158b101881653
 DIST firefox-68.7.0esr.source.tar.xz 312235932 BLAKE2B 17030bc74341ecae74d7dadcb0fc0212e61e3f01463671e57f73c90e534db1088d597d43bc362cd083ca26b056bce45684eda121b2cd91c7793c44a7c40efb7a SHA512 a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593
 DIST firefox-68.8.0esr.source.tar.xz 312602308 BLAKE2B 19be922cdadc705a267f35450e742cf9cf2f793a3e74dd9a397f898ff879cf9d7e59ccc148a9fa47f3c637c30887c205f01069e689f0586fb9ef82f4e6b160ce SHA512 139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3
 DIST firefox-68.9.0esr.source.tar.xz 317469120 BLAKE2B f04f8ca1abe802edb6d37c0de5f8024d513331fd80c9b701c93de74cbafc0650b1c0f58e54a2dbe6bee0457698dc386093aab7749c9b0738bf146bfbae6bf4e2 SHA512 98431800d80f7c680aef9eede29df8217810912a319a7f7f8c2e637c43ecd4f4e29223a417afb2a6315e825f979453ff6e6b5a575649aba5cc63ce5956375bb8
@@ -36,7 +37,8 @@ EBUILD spidermonkey-52.9.1_pre1-r1.ebuild 4464 BLAKE2B 087b47427dc3bfe0703ef5e57
 EBUILD spidermonkey-52.9.1_pre1.ebuild 4292 BLAKE2B 36bb6fb32b838f11a18ec536be7f09f45bb1d05cd18a3312eb38512c4c895a17bb2a92721b28eb2e8e937f6112531c3647de1d2dc62637291206367c26350757 SHA512 782df8fdff08dc0f6a984e46be564609fb189014353d18b0f0673000beaded9c5cdba1e63f484ae19f5f6571e66a70b55270adea8876cbcfb1e3d36e5cde285c
 EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3865 BLAKE2B 81729b277561984a49c27c16c099c105863a6a61198cebe65686787ad180c0b03684398f2f3df31e44edce3e8d35723cc12bb89494ca4f76f76367964af040d7 SHA512 c6dec2360c7faf810b0235f7017a306e9f5a6c935ba081f9646e8195ed3b4aed67d26e8445187c5c3889c858a0ef56abaeecace1894733e589eba11f4769df01
 EBUILD spidermonkey-60.5.2_p0-r3.ebuild 4045 BLAKE2B 23dcfb6f020e0b832fb8cb30455d6f2c9be52663961b7ffad74265064a09157dd6c39d2c8957ea57a937c94e3c9bc5623ba6e4d4d7a75073a482c357d4304a0f SHA512 6f7e821c23696220d67ae66a6e06f19b86eef30885909c0c7b6c817bfe412898825db7265b817d06b4d181c2ead503e710142728a1bc7fcdf741a073d94f2c2c
-EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4110 BLAKE2B 7879bfb9f0fa0b9da2f66cfdd9b4e889222aeb09ac1321f0d4e38053673f0aa9ef5117ff9656e0553107d9cfe73e061af6c18715195d24e9c95e364cb174a8d7 SHA512 c3adf491a01d6e2725efdef73371b8050b3b071f860ddc5a6e8d321727b18a54951ecbb5dd890cc28f528b23c521fe69ddc120a2988530b8aa1e4398c44fe62f
+EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4172 BLAKE2B 7222b262f9c7d52b28ad215e25c59c1e2d7ab689dbb553b34d2d20ce764de7398042730b1c6a1b74496213292c4e2818f85a9ca18f5e6d2362bd33779b9ab140 SHA512 77e3be2e461e4729596d56d1b84ea36964c65b0fa5708cc93025233a883cff462512a50a70b56bdf8be0fc36d8a1dfdb5cede457a99bcbd680936c979842cdaa
+EBUILD spidermonkey-68.10.0.ebuild 5907 BLAKE2B d52e027e02b1686a22c3978608d5b9f36c60d68904348323eb128c1388c7a27796973ded952e0b32cd0dbe9fd041e5e481583ec4aa781c5699eabdec07a2a677 SHA512 fdb602b7ad35660273e50f28e07a685c0dc1b2b19d2fb689e3cc19ad824d20ea0f0c1bc0d60b2ec0baefd91dcc2da2175318dc331c73ff9e4bff44f1f690aa92
 EBUILD spidermonkey-68.7.0.ebuild 5764 BLAKE2B 10992198135286158221c8c0c17b8247a9c21c26f5b1e4f8ee03f986ccd739186fa081d334bd5a9564e8e16c8d2bf829dbbb2674641c2fcdc0f92ccf72e28111 SHA512 d414774437072efd89fb70735ea5c6401ad16121ab2fa797948ee9e50b2bf3d22698a9105d47bb8a27454d8dd9d10327f906a1774c68954ce67fff90dd530e92
 EBUILD spidermonkey-68.8.0.ebuild 5764 BLAKE2B f2b33f2a8c1bb2a5087eee95f6f99b50cd58d21bd3230c29a1e4ce8b025a45b73c5e47d0387e952ff7f36486938601ca0776999cf38936e1f0cd6fb2661767dd SHA512 b901798f921e54897e8c462a4d9af376a40b8b038df3b1d60926d62bbed20e3371cb708ea902a29899f802386cd9576c6281be3aba8bf6dbe13aeeb7fb0d6992
 EBUILD spidermonkey-68.9.0.ebuild 5764 BLAKE2B f2b33f2a8c1bb2a5087eee95f6f99b50cd58d21bd3230c29a1e4ce8b025a45b73c5e47d0387e952ff7f36486938601ca0776999cf38936e1f0cd6fb2661767dd SHA512 b901798f921e54897e8c462a4d9af376a40b8b038df3b1d60926d62bbed20e3371cb708ea902a29899f802386cd9576c6281be3aba8bf6dbe13aeeb7fb0d6992
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
index 0ac7ab4cc443..663dcc95bf99 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
 src_configure() {
 	cd "${BUILDDIR}" || die
 
+	tc-export AR RANLIB
+
 	ECONF_SOURCE="${S}/js/src" \
 	econf \
 		--disable-jemalloc \
@@ -80,6 +82,7 @@ src_configure() {
 		--with-system-zlib \
 		--disable-optimize \
 		--with-intl-api \
+		--with-toolchain-prefix="${CHOST}-" \
 		$(use_with system-icu) \
 		$(use_enable debug) \
 		$(use_enable jit ion) \
diff --git a/dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild b/dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild
new file mode 100644
index 000000000000..816417287647
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs python-any-r1
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR="1"
+
+# Convert the ebuild version to the upstream mozilla version
+MOZ_PV="${MY_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
+FIREFOX_PATCHSET="firefox-68.0-patches-14"
+SPIDERMONKEY_PATCHSET="${PN}-68.6.0-patches-03"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/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/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{anarchy,whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}.tar.xz
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}.tar.xz
+)
+
+SRC_URI="${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+SLOT="68"
+LICENSE="MPL-2.0"
+IUSE="debug +jit test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-lang/python:2.7
+	test? ( ${PYTHON_DEPS} )"
+
+DEPEND=">=dev-libs/icu-63.1:=
+	>=dev-libs/nspr-4.21
+	sys-libs/readline:0=
+	>=sys-libs/zlib-1.2.3"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G"
+	else
+		CHECKREQS_DISK_BUILD="5G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G"
+	else
+		CHECKREQS_DISK_BUILD="5G"
+	fi
+
+	check-reqs_pkg_setup
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cd ../.. || die
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
+	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch
+	eapply "${WORKDIR}"/firefox
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	cd "${S}" || die
+	eautoconf
+}
+
+src_configure() {
+	tc-export CC CXX LD AR RANLIB
+
+	# backup current active Python version
+	local PYTHON_OLD=${PYTHON}
+
+	# build system will require Python2.7
+	export PYTHON=python2.7
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+	econf \
+		--target="${CHOST}" \
+		--disable-jemalloc \
+		--disable-optimize \
+		--disable-strip \
+		--enable-readline \
+		--enable-shared-js \
+		--with-intl-api \
+		--with-system-icu \
+		--with-system-nspr \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		$(use_enable debug) \
+		$(use_enable jit ion) \
+		$(use_enable test tests) \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+
+	# restore PYTHON
+	export PYTHON=${PYTHON_OLD}
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	local -a KNOWN_TESTFAILURES
+	KNOWN_TESTFAILURES+=( test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/RelativeTimeFormat/format.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+	KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+
+	echo "" > "${T}"/known_failures.list || die
+
+	local KNOWN_TESTFAILURE
+	for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+		echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+	done
+
+	PYTHONPATH="${S}/tests/lib" \
+		${PYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		KNOWN_TESTFAILURES=()
+
+		echo "" > "${T}"/known_failures.list || die
+
+		for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+			echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+		done
+
+		PYTHONPATH="${S}/tests/lib" \
+			${PYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-lang/whitespace/Manifest b/dev-lang/whitespace/Manifest
index ffc0c3b19f81..151d2f04ac7d 100644
--- a/dev-lang/whitespace/Manifest
+++ b/dev-lang/whitespace/Manifest
@@ -1,5 +1,4 @@
 AUX whitespace-0.4-ghc-7.10.patch 814 BLAKE2B f9746fd7bd9e51b7429a14b89d617c256ea76004384a1773b3ef35aeaa8518e96db9d53cf52dba025a96d44b3f97d11b42a3c0fa51bb40c15bfa2dfa65a66d22 SHA512 b0202b848539ef1d04974fce40facc8c0090d35da77d6fc98cb7da296efb89a8b81efda1f3dd045115417fc1471b4298be913992dd4a9772642c31ec5960fa90
-AUX whitespace-cabal.patch 948 BLAKE2B 89d35a4a65cbc9e85e652a16e7c3ed8eb01b77b4aeb1f498d97a5c7e0697540cae0aa351114b5abb001949994df7b7ed5e64dfbf911564b845f3cd9cb4956741 SHA512 5c160defe828f6a533a0faa91ef3db19c8cb0edccc421fbf387f28d7dc681a5f66b4c098108893fad41e22643ec74f265f7ce00119e70f0b98dc2d1a9f7aba46
 DIST whitespace-0.4.tar.gz 16428 BLAKE2B d5353b05b80a14ed0583513568d2889816c9e8b7fca8d5253bb5def584c5d43cb0ed8fa46943e7c6c0f82b6424dd01879b7beaaad813a5beb6fc3081f4dfd618 SHA512 2a1c932d650f6cfd55bb7c08b8882086143bc9ec2b0f639a7452116d86f12daff1a1268d7451003a6bf8635fbf1ad23e9203410fd423ce16d4239c1b552d7046
 EBUILD whitespace-0.4.ebuild 604 BLAKE2B 4ccb2c26db55366652837e711a44dd559467438dccd82de1482e25673311f7d7723d4cf874f229270e1f7ce75a583100f33974dc82b36a82d5c8ee5f1e298901 SHA512 12062df7bafcb906af123c13a86c6e6810645c1fea32c6db7747e714ed7a188a732a29985143d2a16ef1e49339620b6a6b9566de72104b6b318f7a78f6ed3a16
 MISC metadata.xml 335 BLAKE2B aed6ce9148bbca7ce32faf271998e85b612514fd59accd2010735b4971664479b2ce4fd16673a2a1e534ea92cf5d1df7774038937e7d428d649171bde27937f5 SHA512 eea77baf66a4e0d4bd5a703a6cf31258f47bd2f9f2f6975fa7b4ee401db4fdd6a27e6f0698313d71a059f2ae14b05f5148d2e844f4b7a05d7e5e49b4302a803a
diff --git a/dev-lang/whitespace/files/whitespace-cabal.patch b/dev-lang/whitespace/files/whitespace-cabal.patch
deleted file mode 100644
index f686d8c4851d..000000000000
--- a/dev-lang/whitespace/files/whitespace-cabal.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -N WSpace/Setup.lhs WSpace.patched/Setup.lhs
---- WSpace/Setup.lhs	1970-01-01 01:00:00.000000000 +0100
-+++ WSpace.patched/Setup.lhs	2013-08-09 01:14:00.415264165 +0200
-@@ -0,0 +1,3 @@
-+#!/usr/bin/env runhaskell
-+> import Distribution.Simple
-+> main = defaultMain
-diff -u -N WSpace/WSpace.cabal WSpace.patched/WSpace.cabal
---- WSpace/WSpace.cabal	1970-01-01 01:00:00.000000000 +0100
-+++ WSpace.patched/WSpace.cabal	2013-08-09 01:44:19.129339177 +0200
-@@ -0,0 +1,10 @@
-+name:                WSpace
-+version:             0.3
-+synopsis:            Whitespace implementation in Haskell.
-+category:            Language
-+Build-Type:          Simple
-+cabal-version:       >= 1.2
-+
-+Executable wspace
-+  Main-Is:           main.hs
-+  Build-Depends:     haskell98
-Common subdirectories: WSpace/docs and WSpace.patched/docs
-Common subdirectories: WSpace/emacs and WSpace.patched/emacs
-Common subdirectories: WSpace/examples and WSpace.patched/examples
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 619a3f79f25c..8f53bba37a4b 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/gf2x/Manifest b/dev-libs/gf2x/Manifest
index c53b8c2608af..8990f12e9bb9 100644
--- a/dev-libs/gf2x/Manifest
+++ b/dev-libs/gf2x/Manifest
@@ -1,4 +1,4 @@
 AUX fno-common.patch 1170 BLAKE2B 828fb26be2a3055d0dfb7fb5b0237c0a0b6f22143ed0a55e786b3cae6e39a5eca189856ce0a53d5a672194e2a418e76934ade60549aa7cc6d46ee436bc7583cc SHA512 c01d85b974b58accff169bdb34292d79d84b9035374a92933a503622f66cd2b08f407122c16b8c358d418626449df33083ae554a7e7a334ed6f32d500a7d7084
 DIST gf2x-1.3.0.tar.gz 727717 BLAKE2B 65f6596a09087708e4ae940b067cb375476c1e7b25a28bf12e9318c752cb326516edeb9363d0f98a9b4173f5bcefd204aa62e1cb87b3f27ad9c30b661edc7451 SHA512 4991568032483e0ecb4552a698e5b7d09f80875e54584a0060a9473be1f87e4e8f714e657f08fec0b9fcf493d969408e5a9000f900623b3694aba1ecf6dc239e
-EBUILD gf2x-1.3.0.ebuild 1529 BLAKE2B 5d3572e495ae453e3acbd0feeca731a5cf50dc1dd4eddd9a121ed0374fa549a0fe61171688e5f61e8bfb4128d9939ec801de4f382dae6104b4e95fbe609b2393 SHA512 dfea32c58e8cc61301764a225130a85714e3db8a7c229001e7d6bc8870318cfbdd30cddc853d372bfdc45382fa612685a0b41f3d79864cdf1130764b44316ccf
+EBUILD gf2x-1.3.0.ebuild 1530 BLAKE2B b674c37ab4bbd9a93228047cdb79626ac277b8a1eebda7ce86c827b57598af6ab5ad767cb018bd5f76db57dfab775335a113771c2027d203278cfa57c75160a9 SHA512 d6319583c3f49d3d2dd17add1b86d89325e63a4bb9fda22bbd0272d35192309c5c643584b5e33cfc883362236820d73014adbe6e1360f1f12b378d8b3cc85924
 MISC metadata.xml 754 BLAKE2B 53d2cdd4bf257213b6f431fd7692593d9577f0c146c2b40546846ef868a781f8ef40d82fc3c833edf7e0cb9c9805c67e1740af2ba205a2e50f767d3e7160303b SHA512 48a3afc2bef2fee5bce10f9d0f4580269bc0089855f2329cf74c3726ebf20ab05867e628dad5e05c57982433cee2a17782b30b16080a76ebc979373105e18803
diff --git a/dev-libs/gf2x/gf2x-1.3.0.ebuild b/dev-libs/gf2x/gf2x-1.3.0.ebuild
index a634e10fbabd..3c44e414e864 100644
--- a/dev-libs/gf2x/gf2x-1.3.0.ebuild
+++ b/dev-libs/gf2x/gf2x-1.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="C/C++ routines for fast arithmetic in GF(2)[x]"
-HOMEPAGE="https://gitlab.inria.fr/thome/gf2x/ http://gforge.inria.fr/projects/gf2x/"
+HOMEPAGE="https://gitlab.inria.fr/thome/gf2x/ https://gforge.inria.fr/projects/gf2x/"
 # The Gitlab release is missing the autotools files.
 SRC_URI="https://gforge.inria.fr/frs/download.php/38243/${P}.tar.gz"
 
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 520bce76bc43..8067be96317f 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,4 +1,6 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
+AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0
 DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
+EBUILD libjcat-0.1.3-r1.ebuild 1485 BLAKE2B d12e00334a25c4b44c77a35214953808897db2391ceff642b68b4d4bc8cffb6a40ea753dc3b8113ba130bfd8387fe59e56c15145adceb6da204d0f431f4d4ed3 SHA512 6f5c7d87680e48dc7a1c40e4f85c6b4265bb0e1d1283964879bdbc4c5178baa4ff249bf4bd24e62e7978eabaf76f4ad163839d97e15bc96f5cf6f88c498f881e
 EBUILD libjcat-0.1.3.ebuild 1403 BLAKE2B 95f1152cdf7bde258b549d08646f2de4f85c97af540f70b79e381143ecba366765fcc2971c9f5f983d435ffc47e6084a39bb9e13a75e0104f45f0af43c394904 SHA512 e4c17f8feab615a290f4495d03f24ca7a6a2371643476634165fc7db69abaa57185487f8477ddece2f60ec8e54cd2e000166e170320590dd1a3ce75b2bb0c73f
 MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
diff --git a/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
new file mode 100644
index 000000000000..3c31e63eff59
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.1.3-optional_vala.patch
@@ -0,0 +1,28 @@
+Make installation of dev-lang/vala bindings optional. Unfortunately
+the option name "vala" is reserved so we must use a different one.
+
+--- a/libjcat/meson.build
++++ b/libjcat/meson.build
+@@ -122,6 +122,7 @@
+     install : true
+   )
+ 
++  if get_option('vala-bindings')
+   gnome.generate_vapi('jcat',
+     sources : jcat_gir[0],
+     packages : [
+@@ -130,6 +131,7 @@
+     ],
+     install : true,
+   )
++  endif
+ 
+   python = import('python')
+   python_interpreter = python.find_installation('python3',
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,3 +4,4 @@
+ option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
+ option('pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support')
+ option('man', type : 'boolean', value : true, description : 'enable man pages')
++option('vala-bindings', type : 'boolean', value : true, description : 'enable vala bindings')
diff --git a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..ccbbdf6c2393
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+	"${FILESDIR}"/${PN}-0.1.3-optional_vala.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vala-bindings)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 68e091328a23..446ab5d69aa7 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,5 +1,7 @@
 DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c
 DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
+DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
 EBUILD libnfc-1.7.1.ebuild 1028 BLAKE2B bee89d075ef440e75098aaa3b17562b24d3c2c9a1e57b8eb4241491123b6afc98ac7459024d692b17f93b386bf1dcd24a4ce62fcca712d9a26c05dfe34023b05 SHA512 d022f3e1de007df189e8c72fe57e07531f8462c45a535dad9ce87324edce108a140facc80985a898499052e166a8fb87537292af3e3e86d8787d0507939865c0
 EBUILD libnfc-1.7.2.ebuild 1025 BLAKE2B ae078e376e5f9184c5b7331f5da8ff38cf6720933f35c01ea06ac85eff3add00228ee58abb7e19a4911d2fa5863fa0db08694f2060656461859a45df126a5710 SHA512 a2437f94ba444cafaef9d97ed30a6916009d25ee24233c2e375113268e08c1f7f764c88b450e50420a941d8a8468a6217680fda0252488ddf6dd2913e9dd2d8c
+EBUILD libnfc-1.8.0.ebuild 1025 BLAKE2B ae078e376e5f9184c5b7331f5da8ff38cf6720933f35c01ea06ac85eff3add00228ee58abb7e19a4911d2fa5863fa0db08694f2060656461859a45df126a5710 SHA512 a2437f94ba444cafaef9d97ed30a6916009d25ee24233c2e375113268e08c1f7f764c88b450e50420a941d8a8468a6217680fda0252488ddf6dd2913e9dd2d8c
 MISC metadata.xml 463 BLAKE2B ef027bb940311ecc6a1c0095114924a3daefc3b85b1bcdddd83d0c1b87e6a2b210c3b5411fcc7a9fdd9940cd709758e743c6e3a462c100fcc31904cc88af9e8c SHA512 20f4b81da686998f0e779615d995433aab1cdc89f30bb79bf5426b2dad480da5ec90d65d371f6fad11ad94773bd758c9650a157067dc73547c180c8ce4c54dc6
diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0.ebuild
new file mode 100644
index 000000000000..cb49692161fb
--- /dev/null
+++ b/dev-libs/libnfc/libnfc-1.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Near Field Communications (NFC) library"
+HOMEPAGE="http://www.libnfc.org/"
+SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc pcsc-lite readline static-libs usb"
+
+RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
+	readline? ( sys-libs/readline:0 )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
+	use pcsc-lite && drivers+=",acr122_pcsc"
+	use usb && drivers+=",pn53x_usb,acr122_usb"
+	econf \
+		--with-drivers="${drivers}" \
+		$(use_enable doc) \
+		$(use_with readline) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && doxygen
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+	use doc && dohtml "${S}"/doc/html/*
+}
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index f5d7ce879e3a..4f18c42440c5 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -2,6 +2,6 @@ AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r2.ebuild 3103 BLAKE2B de86a1c4c36a43fba7c435836e741ed2b5a174bf61f324dd8e77bc8400b1dc075479b2549a5726f4631e9bab817eb84aabb6db2f45dd6a11e022821d6bc5e80f SHA512 98fa09ffdde740962824ac9aab0375900e95a8885ebd99312fcfc5b8120756cf7ccb57736b04eecaf970edde83786305fba5ce75f5526818d9955c28c9127c59
+EBUILD stfl-0.24-r2.ebuild 3108 BLAKE2B 26cccf2f38414ebf0b5dea03270bfa6e0f2c91f6caff0525a9dc23186d5e2fc25a1c7ebd9a6de94ae30e3607da5e778eb4a2bd83f74ab2925730b670ac3bfc13 SHA512 e1d41fa3109acbac0e3a5d600d6a8d3b7a81d8372d8ec1e7df53aefa68c9d7f841ac38784aef30cd31db1f330175e33d76a3b501ee07ab89f5d27d9f3c25b779
 EBUILD stfl-0.24.ebuild 2995 BLAKE2B 0f57b85f5677b818ddeff285cebc84a636b887c1d57fb587ce537cb66269500bf82916d5bdd1de02c138a23733b72e8f106daf4e2de1faeae484dcb29c61d6d9 SHA512 e213afd5c42bd6c321c82489acd6546ba2afca4e9f67ed34a8d64472bd7d1f5c8a9977d73f8f08cd5ea37f931f205f50b68246b7e0ddb6baadeda9e67ae22a0f
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r2.ebuild b/dev-libs/stfl/stfl-0.24-r2.ebuild
index 2ac5a52674ad..b60bf1670276 100644
--- a/dev-libs/stfl/stfl-0.24-r2.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r3.ebuild b/dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r3.ebuild
new file mode 100644
index 000000000000..a586ce5a396c
--- /dev/null
+++ b/dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ZEFRAM
+DIST_VERSION=0.009
+inherit perl-module
+
+DESCRIPTION="the Eksblowfish block cipher"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Class-Mix-0.1.0
+	virtual/perl-Exporter
+	>=virtual/perl-MIME-Base64-2.210.0
+	virtual/perl-XSLoader
+	virtual/perl-parent
+"
+DEPEND="
+	dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	>=virtual/perl-ExtUtils-CBuilder-0.15
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+src_configure() {
+	# Overriding this breaks build,
+	# as people always set this to a real LD
+	# but a CCLD is expected
+	# If you know what you're doing, export CCLD
+	# Bug: https://bugs.gentoo.org/730390
+	unset LD
+	if [[ -n "${CCLD}" ]]; then
+		export LD="${CCLD}"
+	fi
+	perl-module_src_configure
+}
+src_compile() {
+	./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Crypt-Eksblowfish/Manifest b/dev-perl/Crypt-Eksblowfish/Manifest
index 8acc2600e810..6a484c75fa04 100644
--- a/dev-perl/Crypt-Eksblowfish/Manifest
+++ b/dev-perl/Crypt-Eksblowfish/Manifest
@@ -1,3 +1,4 @@
 DIST Crypt-Eksblowfish-0.009.tar.gz 36302 BLAKE2B d28bf1600a5d2d5c1b119b91957d8c1ac21b1da0e3eaec4b8603fc7ceb8c75b352dda620c250b7cc0330abd4fc81b18e8670bd1901013d0cba2cc800b3804898 SHA512 ca66a1ca4fd71388f25dc77c943e2416ed8534576309dd75f19a7219457418140c1bd21887d61918c34d3d6f9e11ea822b4661d30c6edf7f3673bbcd9a00a51b
 EBUILD Crypt-Eksblowfish-0.9.0-r2.ebuild 498 BLAKE2B ab7834b7d6c235ca6cb6f9b74a52f4f7d76dda9a66773396d6319f27ff9ada5e12bc263ed42b76d5241a5b097e2782a02efa4cfc10ace2b79c908343619b9355 SHA512 ad5ac9b8e74ccf986487df806e3b515987b0ac73170d9e99db9d996539ebc81e149c1d26c46b0e20d7ffe8d15013d3b8216783284447d554c76de6831136cda5
+EBUILD Crypt-Eksblowfish-0.9.0-r3.ebuild 969 BLAKE2B 5110cc269a8bf1996e936d33bd563d6d17ba9b8640f6b45b7f5dc32ce40b81e2f6ec59d725f2632be0725462ce65284efb40fba02fdcc28d41b965200532b6ff SHA512 0e9f06ed01714f474dc57bec2022eb3c182f3344ed2e619bb97ad167ab498fc1156413b5a7bef8f761394323a98f0e36d1087188625764ff87c0f176e71b1ca8
 MISC metadata.xml 518 BLAKE2B c1cbd7d129f7f5ba04e4835660a74ab68b2858bbc00804c2fc01ff31cd2a8d43b04ec405d2c46f10847da194795ab00586f40ebe65c95c92a4e1ccf521c6456a SHA512 b1583a71b09dd07933e1d2d01b5370d1cfc91d51528593153912c78bb799f433379cdf5a7b9a6c233aa39de29d40ba24d010920639fe7fd7b8c807e24b31fd89
diff --git a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild
new file mode 100644
index 000000000000..b093191e6191
--- /dev/null
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DPARIS
+DIST_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="An implementation of the IDEA symmetric-key block cipher"
+
+LICENSE="Crypt-IDEA"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+BDEPEND="virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-IDEA/Manifest b/dev-perl/Crypt-IDEA/Manifest
index ff7837b59b33..47f8754db920 100644
--- a/dev-perl/Crypt-IDEA/Manifest
+++ b/dev-perl/Crypt-IDEA/Manifest
@@ -1,4 +1,5 @@
 DIST Crypt-IDEA-1.10.tar.gz 7225 BLAKE2B f7c2321441714ae57e77be1cc3c47b4c48456c8758da4713e6f806825606a351bbefe8767a38bdfa78b7842923a857bf3085919ac1dbb0cf6744a2f2f02a07f7 SHA512 2459f8f8ca088564b037101129796d6d3652062e80f9342173508df95b60ceb9ccb836b946d50127f86b38b239e25c58e1f4efde4eb73a5b24fc823a100fd018
 EBUILD Crypt-IDEA-1.100.0-r1.ebuild 625 BLAKE2B b5ef5bb64019b82824ed0a3798a1d8e1deeaf43197efcbc300da59abd832f3e376cfc84f255d6b25bd402f06bf7c54c8e7bd76157351475878a442d3002c1569 SHA512 e1bada127b56d0cc59aabf9221b6aa090ddf859ff45d89c48a37198ac0e6c9f153416c8de0c9fbe2908c5011505d33cacb87bc2db4a46fc9e806018f28fdb5cf
+EBUILD Crypt-IDEA-1.100.0-r2.ebuild 710 BLAKE2B 0029b9256786687c4e00c77dee1d6d194438c3873fe2732ce1e67ac788767dc8aac626dc96cb6843899deb8e8051062028b41248ca327f93ae56725c911aff5b SHA512 38a7ed358a8683e628f7aae1f62a634773ac74f8bcd0c31f90a4a364748ad684207866dce10f9f792250e1b6cec50277a1c1b0b25d066d0590092940c2025994
 EBUILD Crypt-IDEA-1.100.0.ebuild 496 BLAKE2B 67e2d5e5fe6baacbdeb2760f3438868d1879fc4bd4ad7f4df7f5cbefbff04dc37487de905e37328c9bca1ddbfb9e02252b12ab56d4619b4fb8c75e636fc92c94 SHA512 5337d374c7cd4c5701df0df4b7462b55756d6c0ca33e28e19a0da39d374fdf75fec5962a3eb142b063502060afa63406091b05a65bf865b68dafed3124f46a1d
 MISC metadata.xml 443 BLAKE2B b347d52c409f7ce634b42aa1f96f7d31f08814a4ac1257f6bf6c832215becf59461153670213dd9aee3d83619d63f7c7f96f7a93a082d75b89df717bf3820282 SHA512 fa184e8b05a5260b36577b71e91bd2f5178269796c73c3711de1897737ccf1171dd878e849c34ec747233ef8b632082f9a0782683e220f024f82a01549873241
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild
new file mode 100644
index 000000000000..3609566d7c9e
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KMX
+DIST_VERSION=0.09
+inherit perl-module
+
+DESCRIPTION="OpenSSL's multiprecision integer arithmetic"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/pkgconfig
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Manifest b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
index 68eb8a66a706..0ece70bac04d 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
@@ -1,3 +1,4 @@
 DIST Crypt-OpenSSL-Bignum-0.09.tar.gz 16202 BLAKE2B 912329b37230d503e7928640b2861c05dbcdf64a5943b5b3d27dfd41ae2eb585b6c61811060c29952ab5f9c09a7160a4038656c7ed9046a27e3dc0c5361bcc63 SHA512 3480a64e35e158a7a7c75c0e57ac0f578ddcb901a14f80a58ffabd1f318a68a83b411a72c22c53650273507198907b1d62c88fddbf5587885f6fe1a75deff3ed
+EBUILD Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild 736 BLAKE2B 2fceee2087d3bf11af63a3d07ed23c03e628ac758031d32a7429881983387427283d1363c93a9feb1ba0100cc86f7c9bc6664d1ef5b203ef32e1ccf54cd69f3a SHA512 b9029915d6c945580f086ce88ffa000fd32fb16f6a717afbf679f5143aed74ca9d7b09b95206e635a23f4af7ce955d1abacd015f8efcfa2ddd862d9674a4267e
 EBUILD Crypt-OpenSSL-Bignum-0.90.0.ebuild 627 BLAKE2B 13070ff6a16221b5e117b1315b27cba46e92df9a066a3c85c31edcd5d274d2229f17bb708850dde0267c6ff5af234df12acb295dc83e164fb78c267aaf3bbabc SHA512 6222404bcc2d990d8489a6314d19c66ba7841b977d5dc8dafd4e9fd4f7a27f3fb4b7719ea3d0d2cac629325afa3fdceb75aaf7c7c4a8b84688a6a9734f518c69
 MISC metadata.xml 487 BLAKE2B f989929f1ea0c37f69c27f3b0cf3466672831c28bd53d8a572e3c0cd04cb028c5fdc2e59861f6ce45d102a38e719993b43796dac1ee214d2fd3a27a2b4c613e6 SHA512 1e71784a35f318764db6f11bcbdc77aac5390288565af158ccd66cfa72c0b4e1d93973cd85bad2a39388600f6e29f0a7ab68f57832f3117626a17524b712d3a0
diff --git a/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.190.0-r2.ebuild b/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.190.0-r2.ebuild
new file mode 100644
index 000000000000..f9674d7a6f43
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.190.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=KMX
+DIST_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="Digital Signature Algorithm using OpenSSL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( >=dev-libs/libressl-2.7.2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+DIST_TEST=do
+# otherwise random fails occur
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-OpenSSL-DSA/Manifest b/dev-perl/Crypt-OpenSSL-DSA/Manifest
index dc478a7de9d6..599b2de73be8 100644
--- a/dev-perl/Crypt-OpenSSL-DSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-DSA/Manifest
@@ -1,3 +1,4 @@
 DIST Crypt-OpenSSL-DSA-0.19.tar.gz 9244 BLAKE2B 6f930b8ce89c275c095f937ee256f9cab7f387fb478110b28696dfaa2ee97bd77853661f770776e34402e7f43e1c801fc314bd42282629eb6f6fced9549676dc SHA512 92306a04dc821b7b5f81331c362c6d478df8c118c1cb62591cf7b369029a67dbdd2798e239cead8f1faf2b79e259e906b70ea8fbc38b457b1eb897468d61c839
 EBUILD Crypt-OpenSSL-DSA-0.190.0-r1.ebuild 501 BLAKE2B b5c8e651193f44f4a6b9fd028690146fd1458d5d6f984a232577d77e3f873e4466e8b5398990215f4500fc83b55d5d42a64a0f249fcfd629781e1bf1749b271b SHA512 21e951748fac5b23a6a852444becf6640aecdd8a70e70516b285ebbe1662594d70d6915ea5b060a3c8e4f3c416c139a9bf59a9d2988f1e4867a922402a38ac1b
+EBUILD Crypt-OpenSSL-DSA-0.190.0-r2.ebuild 608 BLAKE2B abf7f94c109e033da02770f050e4dc681a44b403107154bddbe2576b2934351293af1417da86e323a32942a20d82bc4e5f743c6e68ed8b730406ea27639a22d8 SHA512 e6459e42093fb93e72208e5df5c64796c2e8e033837998324aab0997cb9a340ff709e8d00675cdd7df51da61a5e40104b5cab28ba1d3d99c785f2f90a4a922b9
 MISC metadata.xml 395 BLAKE2B 533a15f8ceac7f4e2fe9163335cf4cd47450c27bc98ddaf764221d33d05ba336fcb3657a653cf0d34651be1e42eb5fdf745ca2bfffcc1b8ad1a6d69def33d1b9 SHA512 d1120d7c2642f069bd68f5caaf84a5233ab03d6696adafbd6258ba890a0bcd623750fae6873c3787684e43c315576fcb1a9d7cf31d86a674b832bec418d2e3ec
diff --git a/dev-perl/Crypt-OpenSSL-EC/Crypt-OpenSSL-EC-1.320.0.ebuild b/dev-perl/Crypt-OpenSSL-EC/Crypt-OpenSSL-EC-1.320.0.ebuild
new file mode 100644
index 000000000000..8e382c37015f
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-EC/Crypt-OpenSSL-EC-1.320.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MIKEM
+DIST_VERSION=1.32
+inherit perl-module
+
+DESCRIPTION="Perl extension for OpenSSL EC (Elliptic Curves) library"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test libressl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Crypt-OpenSSL-Bignum-0.40.0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-OpenSSL-EC/Manifest b/dev-perl/Crypt-OpenSSL-EC/Manifest
index d2fd8f9cc459..8ae778d4961d 100644
--- a/dev-perl/Crypt-OpenSSL-EC/Manifest
+++ b/dev-perl/Crypt-OpenSSL-EC/Manifest
@@ -1,3 +1,5 @@
 DIST Crypt-OpenSSL-EC-1.31.tar.gz 69152 BLAKE2B 197b4701459ac4e065439861f6603154affab88c65945eb299daa060df27f6e6773cd49f7d41876c8f364a70bc45eecc3b469532f15477d17bd9e8cfb968c196 SHA512 ee631616ac4838c7e0487f732035af2a3b7c3e591ccdbdac63f49931cdd901acfcf479cbed9cf838f332bfb34fa5b2ef3617dfc9c1e6ba8bcc2909b7d2ea577f
+DIST Crypt-OpenSSL-EC-1.32.tar.gz 69455 BLAKE2B ef306b59153faf394a08d80c8fafa2d6fc53e305884fdfc1d5b05274a4ac70192ac141ba26adeaf6a72186006bb88a9ea87abfa4d3fd14d9052f85dc00e451ac SHA512 cf1dc70295ff061bf10ca7c1dfaa699fba5502906564359cc702e4ae65bf83ce4255aeda841d44f6467dd20d3ed377587e8ffad04a6ae8c39c86385ec9a3e218
 EBUILD Crypt-OpenSSL-EC-1.310.0.ebuild 495 BLAKE2B 6e4ead9ae72c1f01cca1732b941a878e286ee771195541d2c06d7198919fe9f320f3825983113b3586dbbc9476385e60a6f14a9a1d7b5bd2fd501a2ce4b6240e SHA512 bcf216a28889721736d776a86602f146a8b1f3e1a6e397677d249c5e5922679938dcc29af250558801688baffc4773ce7ae8d8c3f163ec911ca32522dd16423b
+EBUILD Crypt-OpenSSL-EC-1.320.0.ebuild 654 BLAKE2B 3982c82f96cbcb1fe8fe779980a8f4d8cc96a96207b7ae3dd80e0fa972ff6c26d3f816b8b1308c81ee40c6423c8410504d29033db2c9f7a56a96d34f5feafdaf SHA512 8521cfb9ac6cfdfbf65d39d3155879d483ebf6f1442d2720e85a4c9ed86bd4b1a98be833490c297bd5cafa2bbb07be97c9e7a9e189c83dd55881383b0bbdf25a
 MISC metadata.xml 405 BLAKE2B 8a1f215ccaf7af877b185866b36952bbf4935b7a9040914fd940bda7fbc2aba5ab571c0570700fb14c33cb21d972e5509a3abfd5ebff77337425ebc88bf8d417 SHA512 ab49064f8dd20eec49b64dce403329e26c019220162afb5946e1ebce1ee45fccb40954736386034118ad50514c3ae9b9cb993128fe584456e008178aee12ca97
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild b/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild
new file mode 100644
index 000000000000..60f22db0b518
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MIKEM
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="OpenSSL ECDSA (Elliptic Curve Digital Signature Algorithm) Perl extension"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	>=dev-perl/Crypt-OpenSSL-EC-0.50.0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+PATCHES=(
+	"${FILESDIR}/${P}-0002-Port-to-OpenSSL-1.1.0.patch"
+)
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/Manifest b/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
index 2332e83848f1..2c0d702f0141 100644
--- a/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
@@ -1,4 +1,5 @@
 AUX Crypt-OpenSSL-ECDSA-0.80.0-0002-Port-to-OpenSSL-1.1.0.patch 6988 BLAKE2B 5b40ec7a06b81e49271c304380fc227b105872328b1bc077cd7b10eaaeec8aacd4dcae9595aa2db189ae0ef612e87a302b8ec158a7f4442bf01e1deb8500b2d6 SHA512 c9ef31155af0b1fa247aa782909ebfd7af6ea2c1eb05aafd928f3ad04406faf80f460689d5097b5641e8018da81e690099d5f33885c87bc48f08f1bf32d31c67
 DIST Crypt-OpenSSL-ECDSA-0.08.tar.gz 52955 BLAKE2B 014d0d82dde21d8a797f0c498f8534b5c4034c5a5414c358ce5a9da1598fddd4cf03a4187e0acd0272e58d0e21002f426c0e8f41d4f485b7dae168c2facbc24e SHA512 7bccf904819b323ad958dcb59ef3981e3f22813057727cb7d19d4eeab69f57ed7b63e4e586f7494c316e7568d606087099738918eb440947d326ae5a703e9b19
 EBUILD Crypt-OpenSSL-ECDSA-0.80.0-r2.ebuild 543 BLAKE2B ef524fd4e4f8fe63026ea4da728ef8ea4c769ec37dc71a7c7f6f83b4d5804c10ee420568236affaf256ab71f96ac2e5d9ee30091050b73546934ec0a17319e6a SHA512 332fbe1d4c04e7a68d57a46254166e3aeb845f0e8d1fcd84a0840c5e1509a4cb0b5882db7950a4adcb535eec56ce4e154962a7b6ad72f11da8a7890b4ce6534e
+EBUILD Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild 701 BLAKE2B fd01b555745eef580f035ea337d6de3795abea9483eac01549f62f2d76b7d77c0281ad526224a29901d55ddfb3f460c3163c79f1437580d8740f4cf136a7ed48 SHA512 84888e3e4c28496e70d31205fed4e76732fc01854d5a6a3a9a1a59bbd8c1065c9efc07ce0b6e700536d0fe6630a5fe8ebaea4cc14eee3ec8fcb7e5269325f58b
 MISC metadata.xml 411 BLAKE2B 25f4cd25a774a8ca02630c9408e5552ef64c6f20d522d67e5eadf66b633400a01298c149f31243918ce73bea6e7d99c14f22972c2f1c449a2b78ed8148a6a61f SHA512 7dde247b0b93d93f6776cf2570fdd6225d4087183b6c626d950f09648748181dd15d78fc164e8700b245430027bd59a408e6affa7466773b6fd6740c9a1958b8
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
new file mode 100644
index 000000000000..1a4da0faf42b
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=AKIYM
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Guess OpenSSL include path"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-File-Spec
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
new file mode 100644
index 000000000000..7e98411ec509
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -0,0 +1,3 @@
+DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
+EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 623 BLAKE2B ad99a77f6c5fd327f888ecf30223734ec6ace8b6b3312016f4170b3b2adea1b0671bc022efad000218693844192cb41ee5a65621df5eeff75647870b5ce5d72b SHA512 06c1e7e5db4c65a18a8bbcfe4d21d330378529fcc3cf0f890802d3d45335db067e21b92d8f5ef96c473b366b1575d5b877f0d0018644d74593a7d89f62b3c0a4
+MISC metadata.xml 411 BLAKE2B 777372daa18fae2658976904b22a5e17c15e1ce863a3ca026a03131be84cd435a8fa582c162500ae76881c6605abc8a2737ce877448d62f46e5101c1a9776b6a SHA512 da55f9571c2cec8cd96e6fbf95f74cab2b89cca8c74d32bfd217680f60ea0454b60b6cd851b0f8f841ea07ca2e23cb83764f0e28340eea38119ba216a31113f0
diff --git a/dev-perl/Crypt-OpenSSL-Guess/metadata.xml b/dev-perl/Crypt-OpenSSL-Guess/metadata.xml
new file mode 100644
index 000000000000..80fd8888a947
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-Guess/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Crypt-OpenSSL-Guess</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenSSL::Guess</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
new file mode 100644
index 000000000000..87892490f35e
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=0.31
+inherit perl-module
+
+DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Crypt-OpenSSL-Bignum
+	dev-perl/Crypt-OpenSSL-Random
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Crypt-OpenSSL-Guess-0.110.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test
+	)
+"
+PERL_RM_FILES=(
+	t/z_kwalitee.t
+	t/z_perl_minimum_version.t
+	t/z_meta.t
+	t/z_pod-coverage.t
+	t/z_pod.t
+)
+mydoc="rfc*.txt"
+
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Manifest b/dev-perl/Crypt-OpenSSL-RSA/Manifest
index d3c92d24e754..81c6bd7ee0dc 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-RSA/Manifest
@@ -1,4 +1,6 @@
 AUX Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch 7018 BLAKE2B 58b6adac6c8d7fa6e5b7aa5592fa395dbbfab006bf427a6da3a119d2b221946166133c64573c1fda32d9e806a92ab9ebe0e0430b25e2938a7e72c1a8fdd879b5 SHA512 8a56a800496a427448a82c5a3051dc85ace049f7e4c78859a44f62e30c218c28e31dd24bfc2a9ec9cb7f64e14933982f26181792771c54c3e684be738206a310
 DIST Crypt-OpenSSL-RSA-0.28.tar.gz 20035 BLAKE2B 9b98a22e68f2c16a38c0aee6ee9a509cd6c6b1d20b1c6533856b7682aa074c24a2e12e87ebdaf3deb7011cbe257737335646b52be74537533d836cbf6fb6ce6d SHA512 4a20c3f814e80ea15304b2a189001172e72237d703a0f9281e7e46d593c521508abfac3a259701994ec867f160821bec37e4e8234d04b792168db19b065ce324
+DIST Crypt-OpenSSL-RSA-0.31.tar.gz 25856 BLAKE2B 172d48cd6cc0f3df2c1c1684897d8ee376663cb366a1e28c13e4af603b2b985d542f83284112be5e4717a3a13a512926b4413b5a8f08f7ed613cd9929683cce9 SHA512 e00d25fc1d39253ea2d7d6ee478403d2b38bd9125602baf5815672fb9e81674ff58bbb47539e425526db1988ebc1a40837372cf42ffd466cb532efa2e450ccab
 EBUILD Crypt-OpenSSL-RSA-0.280.0-r3.ebuild 718 BLAKE2B 422cf2673094d24207e2b0edd8ca70b9112fdd9b459f51e89a3789cb7b98fe3199284e4d86b00b8401bd2aaedd5be1c7f4494ab71357275c71e13e60877d1c25 SHA512 3370be2a7276825e31c1638a132e8926463cdfa0adaab4247a3d1bfa8a56684d01fec143c8b21752ea13c498f6c52fee762e677abd10ebf8c597668010c5d9e1
+EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 876 BLAKE2B 18e91c4733d509e669259d52f1e22a5ab1a78c593bf5e025a80b639adf0d5d521333b284d9dd2d2307777c72270dec443c14391d09c6d0f9c5826079c609ef81 SHA512 4d0cbce664841f028c1850f6e8b27627508e8dcc3065f5d4813c08684cc9a03507bb61ef7e0f0fea5f49adc2e726df285e7a2cafc2b9f0902cf1503ff7cd76bf
 MISC metadata.xml 407 BLAKE2B 0dfbb22c5bd94b1f49bf73aa69d6f6ac9272aa4631f93d890a10f8ce0f17df9c3760a79f82bbe4453b4ce7bb1c9dd4a05d838b11681aae42611b8bb9496d2ac1 SHA512 5cd69acf50b1ec86397e96b03d6aca318669f83b7a6276231572634622e889479330e741ac7a858a5c4fd633f40b5c4ca7cc0bc40e6cfc8eb02bee827eabb9a2
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 028bf7fccc48..d7a1063d8158 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 98f167f0d442..fcf8267bf465 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 210b60c754cd..7547f075935d 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 899 BLAKE2B ca6391d1e844fbe1a46c00b5e4b8d2d1e257e7507ea731f0c5aafcbad91b2d18f1dc97f63ab369610522304f90998ac622e6a79fff64c45bd86c463431c41c3b SHA512 9381849961c660c5bb12469ccfa2e94e3e920c0b56e65d0dde191a187a2aa83e4a4a03dd8d150da5dbe9c67b834899cf632a9d37f0cfd2392947acaa1bf85cbc
+EBUILD argcomplete-1.11.1-r1.ebuild 898 BLAKE2B 742f17949c4a59c2b630c20afbca518f73252334cd70eb8b0e273674aa9d3e89b6396c9dbb7b762eca3bbe4557a34c11eb90da8fcda9d785999bd4a42163a127 SHA512 25cd4c71319a0a5da418dce52f53961b4d26a663c0b56c409bdcdc0af5403116419c308a73c007fc2bb98bdca89cfede211512b1c646d4b153d4896cbbb978f4
 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 eefc33c78356..036d621fad96 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 8e178ad58abf..4dd87db726ab 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1193 BLAKE2B 69ed66261a5610e2510e47d3433c1962f3b05ad114a2d3d0dd6439f2111c8e9952861d291f4800a9478b35cd295a2fdfd7b11c736c366fc7c5dfea0ebadcc882 SHA512 ea2d379c8241fa0e89e06f8db277f6965a02c6494bf6e288f3091fffd981e1994d20c1c3b8caae189819a707937ca7e261e9df20888438020b843f50a552d54e
+EBUILD betamax-0.8.1.ebuild 1192 BLAKE2B 4520e4ed9959f4a1bbe92c61e77074b0cf7d1202f63d689a39c047edaba54e61a2ebd627f39797fe429e6d6f17be39c3a3dd1c3f4ea1c6f4dc00eef478ef31cf SHA512 f0af3253fdd737a2a552f7c30039ab62d50c0b5b2049b77396fbde07291ec8b983948059575f378bce5d73b602f469c4648bf4e88abec3cd63af7187fcaffa1b
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index f134539c79b9..e9b5bf518d7e 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 9c1385334520..9cd5bbd29cee 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 635 BLAKE2B 5aec16896106ba8504b1cf63758dffbc4b112443c62d2250acccaed1e6d6d5e69261733a66d032266f76f93882ac6a653db4a03110ceda9492775445a18ba618 SHA512 032c0a29d680bea4cb25d03e8bea65226d5e13ba5bc97959df5f668cbf6395fb24e2ba46a7cc38a9b69bc820c52d1aa8f4178c72c42fa527a92facc6eae06ff3
+EBUILD click-default-group-1.2.2.ebuild 634 BLAKE2B 3c9461711593d7baaf4288b710391dd7246d1149987aa897f566588efd914bff5e2a05c5af050bc254531de4e1044ede3a72c424b890388854ef884e2c3c039e SHA512 51c3dcdff2de3e0fdfa74ce8ad375a1bb2c4cb422d8901151772b811a93ac311a12810814226b641fa10d72fe2724c498b45ab7fa727acc350db87160c23d84f
 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 53e65996a52e..bb2111cb949d 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 ~arm ~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/django/Manifest b/dev-python/django/Manifest
index 016e95ab9719..65a836f669c0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,11 +3,15 @@ AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb4
 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-2.2.14.tar.gz 9022051 BLAKE2B 397f1de35f645da9964581d494d933ce2327915315049997aaed238f27214e4fead8c50e779052eafb3d237e065ef47f2d3f151552f712b6348ed23b75d25e52 SHA512 48ad065df161300920abe0c28c3f79cebe536de00fe60c8a7633caee149e0632aa564a848172bad0f254f2a98194cb625a5c169e51a89f3cab95c1213cfe485d
 DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
 DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
+DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
 EBUILD django-2.2.11.ebuild 2344 BLAKE2B 124f5e9dd4fe7c19439ffa3f5586525499a1e02ebea738f2a515f2ee9c6a11efc909c56d556418a5a0a0f491c6c37d07c406576a69d012aea686c6d16047155f SHA512 629706bd162f4c45f80e4d37abe32d7ad99fb37ae34a25e76ea89776e7d3b76fc7ce80eaffbda2c48688d2f69f453ffef1c0a59e63ae4fb154b1f87709d8aeeb
 EBUILD django-2.2.12.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
 EBUILD django-2.2.13.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
+EBUILD django-2.2.14.ebuild 2366 BLAKE2B 8796ccc566d580e69f6c12c663a7a34311f9cb11c3d9a9045c32396523c1c33e2a5c73aedf52e177bbf09526c0435533dc7ea8b85b6c3ab2cc5d41afd65b6023 SHA512 2733ecb9d91cba09b97a223c049d9f84b6bd228da4936177abc5dc3e0a50b97074071e120ac357c4c87f7d8893cd123d164f010d7a453ca18c96f253ccd56f2f
 EBUILD django-3.0.6.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
 EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
+EBUILD django-3.0.8.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-2.2.14.ebuild b/dev-python/django/django-2.2.14.ebuild
new file mode 100644
index 000000000000..f2f8b34c1441
--- /dev/null
+++ b/dev-python/django/django-2.2.14.ebuild
@@ -0,0 +1,78 @@
+# 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..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-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}-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.8.ebuild b/dev-python/django/django-3.0.8.ebuild
new file mode 100644
index 000000000000..fbc688b75cbc
--- /dev/null
+++ b/dev-python/django/django-3.0.8.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..9} )
+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/gevent/Manifest b/dev-python/gevent/Manifest
index d68d4c2fba67..1b772f141e1f 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -3,9 +3,9 @@ DIST gevent-20.5.1.tar.gz 5566653 BLAKE2B 1d9a474681573ec2e9d3c0d40fbae8a91b8cfb
 DIST gevent-20.5.2.tar.gz 5567755 BLAKE2B 9cac45f92c7c1841cca4eb52a54f71406beb3e83136170610bba326a32722de3c5ebd3b777a45b73ab5e1012eb0dc49d861b042bab0c6194e61f44e6011ede2e SHA512 24f00a599f26d673947f0ed5582f8b55d1b214677578d7c5c2f8d8c106f89a98951db523597c470bcd788de9f6b7abcd3f25f7aff27788227f6d8c7ca7c183c1
 DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
 DIST gevent-20.6.1.tar.gz 5806150 BLAKE2B fb75e440f31ad2952d1395780a66ee673c55e62b635a2c6757efe9706c404d126c38a613ac08cd088900c0b10913fe9ce9d57cec8a7cb252ae87912142cfafce SHA512 b7ceb5251b01972a11e3d51e1ebcaaca7c08d36b6ba7b138bee57f0d5da4553539a0ad538e8a433321bdac396788acbfb0ac294191e829df3f066d00816310bb
-EBUILD gevent-1.4.0.ebuild 1714 BLAKE2B 004653a06d92f0668aaca427663197f4839c0c9fd5b0bc11e55e873215d26a3699205f91e8e71189ee40a7264867ad4deeb6e3b7d985a64a9f8b5dfa7ebb0e8d SHA512 66fb5a52bf63c00b39f071b3407ca179f41ae8e3180bac96133e2bd836dbe3c7c19d5b4db6ed27aba8dba339cbbb34daee526e1db286f7d00fbc465af7cce37c
-EBUILD gevent-20.5.1.ebuild 2277 BLAKE2B 172fe82a89a3e3c1f36f66f2c4ee88f173071acb56e57542fb5da5ae24e92911dd52b6d7e0e3ce060acb47238fc4ab55edf81c365334760bc44887331594f77a SHA512 a93d813e7dc7ef05cb3b802f0bbff8853068c3cd962b399cd7013e24c2c40a6c5ac4d68797f2001334d446c6de1355616eb15032a1c3b406c2393cb8f6361873
-EBUILD gevent-20.5.2.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
-EBUILD gevent-20.6.0.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
-EBUILD gevent-20.6.1.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
+EBUILD gevent-1.4.0.ebuild 1719 BLAKE2B f933f4b4d229f0b8db7a02babee639ce18b9a44f9390b2ded21b0ba6ec13ba1c13baa2a412ea50ec10bff84822a839ad711dea20bca3fd9e821e7d6a057d6569 SHA512 b28a51f9be4ae39bcd8b41e30adc5b5cfdb959758f6437c5dfa017588730bc50fbb8205552edd5de7b90792da021a55b92d3ed027ed7181f5467e3dc62f257eb
+EBUILD gevent-20.5.1.ebuild 2282 BLAKE2B f52fc8d73a974b29cab3b1d356ab9f90c8f00179fbbe14b4837fc93310ca8a5f62cc6c2d999c506fc1f1ce8a6e0e285a519f5cbc0ae59c8c34bf9a01c2450695 SHA512 aad4f67e2f49b2f887328f74f0d6d12e8d0fa79e3f2c934c1cd721aa706e903ada017f2352297b0259ecee9ee6564d3e1337053d9a942e47b84233d1d54e3110
+EBUILD gevent-20.5.2.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+EBUILD gevent-20.6.0.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+EBUILD gevent-20.6.1.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.4.0.ebuild b/dev-python/gevent/gevent-1.4.0.ebuild
index 51c761bd8a9e..3f87f8d3fe59 100644
--- a/dev-python/gevent/gevent-1.4.0.ebuild
+++ b/dev-python/gevent/gevent-1.4.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.5.1.ebuild b/dev-python/gevent/gevent-20.5.1.ebuild
index faeb72ae729f..9c22b6bec13b 100644
--- a/dev-python/gevent/gevent-20.5.1.ebuild
+++ b/dev-python/gevent/gevent-20.5.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.5.2.ebuild b/dev-python/gevent/gevent-20.5.2.ebuild
index 0ada47ba7720..1448d3df4c13 100644
--- a/dev-python/gevent/gevent-20.5.2.ebuild
+++ b/dev-python/gevent/gevent-20.5.2.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.6.0.ebuild b/dev-python/gevent/gevent-20.6.0.ebuild
index 0ada47ba7720..1448d3df4c13 100644
--- a/dev-python/gevent/gevent-20.6.0.ebuild
+++ b/dev-python/gevent/gevent-20.6.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.6.1.ebuild b/dev-python/gevent/gevent-20.6.1.ebuild
index 0ada47ba7720..1448d3df4c13 100644
--- a/dev-python/gevent/gevent-20.6.1.ebuild
+++ b/dev-python/gevent/gevent-20.6.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f71bb86c08c4..36e494af5fcd 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -11,6 +11,7 @@ DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a46
 DIST hypothesis-python-5.18.0.tar.gz 9013356 BLAKE2B 3863414e54e40ac5f2a45edbb57fbee058e82f04cbde9eadb99ed6b03a2a2684777b46eabdbe136aea74b835e343485d80cfe98c263afa537c7437e7566f796f SHA512 b1a1f37f1f58a6401a31f32ef0e7de452b8a8bd71fe5aeb72eeac197a23b78c3ff17b61f7940e2a2a755f7f008f0ea3df5b0f2ad5e4c0d2d316bf13dbd7cbdaf
 DIST hypothesis-python-5.18.1.tar.gz 9013452 BLAKE2B a513c19a19b3ff49c78d97839dea7d857d9a00f7d42e5e0376cd6fec9ff9a86f9b6b9471da474ec7724e41254105c0ac65fc7d772f01bfc40f6deda200f11629 SHA512 19455699ed50d30767edc5627f797992f2542aeb3ca9e38603a68ffe1108f0287baa183e4dca101f21eaea6c7c7501e135b5baf9e09117a2cae92ec1e437e8b5
 DIST hypothesis-python-5.18.3.tar.gz 9017453 BLAKE2B 85356e723fca66853e388a4a3e791dd4b1cfb80b7a4b62363a4f0d0aeffc44c051eeabd516eebd5737a96050edef978a87788c1141f87aa2e310eda9bf64a0a7 SHA512 baeb4644a90fd8694d88819a46ba1ea6c60ad13e00f07cb923a3d0f43cd4b4d61bd07bf25e45e6d1203f9db44fbe8ec7eca7e029c804659025df89a80520e550
+DIST hypothesis-python-5.19.0.tar.gz 9022213 BLAKE2B d8996cfd18d24722cd4faaf8335ce2b1c67757e3ffe973a33bd8ad087fcde513442d9fdf01f486ee07b33504e4088aa9e4c104782c3b03aa4f0d77a99ba6f672 SHA512 c26b0c9c5c7e1941c7f491e8e8165fda86a6e985204b9098c214080e508167f77f7dffe65192a4418f4958c3c6df44a20d75131895517c40c1113995ace3b604
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
 EBUILD hypothesis-4.57.1.ebuild 1835 BLAKE2B e78e8aad70d73ab036ec275cfe0a59c7ba38eafabf3e6a8273fc3a0ec88a8ae60f685d302963eea9e4e5d00c8e4b5ca05f3b5fbaeee3c822979eed460a7e0f83 SHA512 4d3ac5f3919ffac5cb5dbd134d939d71493b2fb9e8414b43185336e78a4d4a62f74c829efa512e32440ac4892e2857611f5dd1d076dd8469a477fc132e0d5834
 EBUILD hypothesis-5.11.0.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
@@ -24,4 +25,5 @@ EBUILD hypothesis-5.16.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621
 EBUILD hypothesis-5.18.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.18.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.18.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.19.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-5.19.0.ebuild b/dev-python/hypothesis/hypothesis-5.19.0.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.19.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 98a0dd40092d..0b94b656dd09 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,7 +1,9 @@
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
 DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
 DIST jupyter_client-6.1.3.tar.gz 290112 BLAKE2B 205d4fc4bee263b05a36c562db11fe9a0d39defa5d633e85412a7e6382ddc49f9875c5112c1d23108b8e8ae7e57060afebeef949d7bf685b9541dfd06ae43fcd SHA512 39756e1bd7a051092c70c5f75ff1a8b8dd308eb054b3e572d5682e832dc83e6935c3f845230908f1c3debe95977c7b7ae63c373aad4ea6c1e87674b083d5e72c
+DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305f591597947dabaef3fd670c7fd595bc8a8fa5258ad07b0bbe170c134f8f50593e980c2360de2521216fc061996268032 SHA512 b289b07f1300a7aa541b15ece33340fde7dd9765a200214668ad3a124ec7fd98c742f61417c9d31d6daff9ecc1aaaca6ec516f359cc26007731c0f8d859a73a9
 EBUILD jupyter_client-5.2.3-r1.ebuild 832 BLAKE2B 1dc7d8971a00f3e0bd8aad14f7ffedab3d79a4a0b5f8132109f09a9c2d6704160302db777d7455643004337a886482175245e6ecac6876250a5260a1e8ee18fe SHA512 071de2eb4f843e0b0dd038d8de712b249d74d7ae15655b96e63b7c62f6e4df6ec89bddadb8d695e97644d64a06d21f4707e3285e52d5b8c865b23306413a4ffe
 EBUILD jupyter_client-5.3.4.ebuild 903 BLAKE2B ecd0184c24dc7820d44ce8f50e124fb3fc1f8ae1c494b2b7e6fd76f81f0eeac3815515be73285d8368feef61ff27ab553b569ab3100cd3fefda771a7ad5e33a0 SHA512 0110cfbd150b7be4b625a7d572a0aed9f4f9ecc88f2680a4b338813e5faaa21f7c8f0be92f770a311b73e2c28aa856ed2b2ba9c3d61e04fb9aa366649ebb676c
 EBUILD jupyter_client-6.1.3.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
+EBUILD jupyter_client-6.1.5.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
 MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
new file mode 100644
index 000000000000..2bf01c589f1a
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 84ef378e56ff..86c1608af2b2 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,7 @@
 DIST keystoneauth1-3.17.2.tar.gz 253877 BLAKE2B 9a8f10a5a535ee6ee02859f6a7da38777af250303d0be0feed266c677fea3f6bd465e3e14309c38f67dc5886c846a6aa9a9a7438f5e511f7a80782e29ce88b52 SHA512 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a
 DIST keystoneauth1-4.0.0.tar.gz 256925 BLAKE2B 3ba149f9333a42c8fc2f876cf3ee4533633ed881a90f2fd944ee1c245d94dab548ea1c363f2085bc995dd588d8d355d779d9357885ecd0ee9c73115216010388 SHA512 c24d10b2ae6318c22bd62596dda952a36ec8ede8a6436aa111657a984b2b3be72e55895c009317b2ad652979701d4dca6f2c3e1764ada20d1c7b676f072f5614
+DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35
 EBUILD keystoneauth-3.17.2.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
 EBUILD keystoneauth-4.0.0.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
+EBUILD keystoneauth-4.0.1.ebuild 874 BLAKE2B b852dec1e77179c7283a48cc45901ac57f050cec9784a54a09b4eb20196767a54652fa553c120ebdbc894134accecc2f9df07ffb76370a579c034aa97193fe3f SHA512 6377faae295670fa72ab06dc7eccd9232bd81c571e5e9e88910f09e816dc3eb3cdd53500daec2b6a4af120bab1c56614e36f3225772f55a27a746e3efe4fa044
 MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
new file mode 100644
index 000000000000..21ce2d584e88
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${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/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 6e4c6ef815f2..aa32f83624bb 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,6 +1,6 @@
 AUX networkx-2.4-py38.patch 3170 BLAKE2B 33577a719e9f59f910b5f0284318d77a9dba2392c4a2a25a0539cb3770f8326363de7a24473cd6c7d74a96911f3b0c040056daccaff23bdfd05fc9aff76410e7 SHA512 6142474c21f3ab613256252bf688873f19a68f781690dfdee63325835a692182e10b241495b0948f4658aaf2b36ff1f051931036cb97254459974dd807cd1550
 AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64660c2a35d24ec4f405b5abb46fc4d971606ffaee0637d469673f1e55840629453c57d1e3c809d5e2b02c7a103 SHA512 3474cce5a89f3011bc8715c1ee6ca64c2251dae8ef142da24edb88c6b85d4ce1bc1cf72656674387b6a75132d25c4c348f1d32fc71674c789d3c06e9cb9dc5d6
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-2.4-r1.ebuild 1510 BLAKE2B 7174aacd90741d927f8299e841a36f7ef4d7b6d9a1dfa54e2ba1ab4b96db725a8c9d1cc360b8fff3341711216d539981b149aaba5576b0efec6a4dbe6f29808d SHA512 f002f7407410cb07aa64e8c65485b268a9c58f5b52d70ff2313d788939dfdc705b7e755769ad49116899b3d9adb8f3e8853dba2419ac5e86452b4b4746076431
+EBUILD networkx-2.4-r1.ebuild 1573 BLAKE2B 295aa550d91e38a9a891c3bc3e1599e2c1585321f9d750b4bd31118e43d553f83056d86e3cb5248189d29194fc9d107d5fbb92839d713739f105e2c5c2327454 SHA512 5abab020ce2045a9f882636d40a599827169038c5ac3a4104c08ab05804b8418b05d443ee71c743972595465efba69220ecb7cdd45b1fa9b807ec6ca0f387d3e
 EBUILD networkx-2.4.ebuild 1543 BLAKE2B b3cc53f08dad66b10636bb9082b43af06eb0828031b9327a1fd04bd329613effe35817af97f546b50ae0e194f73ed4ebea56af314e1311044395ff8c02546b15 SHA512 5c5a68c58eca8beb45568d6f4fe80bd1b58b6513cf3492654db7c4f5ca23d6192a9702793fd1aa62db48f3fc71b48a80dfdc5638c37e3c89d16fd3d1db2f3ef6
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index 988703d38773..ef197baa3467 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -32,6 +32,8 @@ RDEPEND="
 	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 1f3c55188728..736b38775606 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD passlib-1.7.2.ebuild 1037 BLAKE2B b00dcee17479443e2e463884308ba4df036d62e49f8c0b36f8afb0fa5ffa531f37e32b5a638c029a550768c7d32ad16110206e71fe46bc15afcc9572497774b8 SHA512 71a9e4e035aa145bbdb2834d6051e073ea289f864fa9a7ed4f2ba425639056677c4841a660c4a3fefd952358ca500e7dcfa4444293200e62e86a66a8ffc9ebfe
+EBUILD passlib-1.7.2.ebuild 1036 BLAKE2B 7e3e95ac097b2080217f8fe4b4a1a33eabe836449e275e1bde3d1d8fa8c396f9f63f1a55ff481f5f53b4eb757ddf3032844018d1f1679f3062bde61fb39516c4 SHA512 bdd7098b67b8a381ce8384a0d1eb13b8e7835be3a4d708c7f3970d5dbd8028d9791c665bbc1a3a3b2352c22ec5a82809532c0c5382227da946dbcb576662a4fb
 MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 0794ac4dad0f..95c6d0072683 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 4eff07a42f6e..9a6c36cc65f3 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,7 @@
 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
+DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
 EBUILD pyclipper-1.1.0.ebuild 697 BLAKE2B eb94f08accf6b67bd82bcde3b794e49daaec73c905937bea4f31ec03446b8b4d3f72298ab1e891d79fbc260588ec47eb3e629774cb875868c22dd88688cf1355 SHA512 fd81e4272d19c9b9b67a3cd74a216ef84e9af8150b176235bfa320cca385fc9603e143b9f079591943cfd222e679d1207a11012cb6397732c8e9577ecf3dec4c
 EBUILD pyclipper-1.1.0_p3-r1.ebuild 787 BLAKE2B 467902dc039d84eda5ea972da3476ee3e7d87cee5a870cdf7b1911241ab20694ccb3d15cc83740e0baa1b88543028d0477a523ef8e03148e7e3a17f235ad90ee SHA512 e887c57691cb41f3866d7401667b6ef5a5a158d14f38ae58863d9938224e1f1bc158c1dbcc981e739380238d07e9f443fe9cb264f1ac7681ad7c2037a12e7b5a
+EBUILD pyclipper-1.2.0.ebuild 787 BLAKE2B dc824b271b64d1b045c81e8639f5a814d14c847dfaa6c5461f218fbdd6b5a8fd7fca17284f2b380a38b08e70a07637c5c40a31315e4c5da0e2df02d9306623b9 SHA512 0ff63d3385d381168d90c0641ac56e64a599b049a4c52ed0550f5a69ec72cde7477ecce0153ed88c8110ddafd66563f8d9f18d2bbbff4d67224562ad8a6a1d21
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/pyclipper-1.2.0.ebuild b/dev-python/pyclipper/pyclipper-1.2.0.ebuild
new file mode 100644
index 000000000000..3efd8d8de2fc
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 588db22501fb..067ccd0da9ec 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,5 @@
 DIST PyICU-2.4.3.tar.gz 219819 BLAKE2B 5e4b9ecab9e726aa05ae4a30d3b277dec3a94a2e0393a7cd9a9f247c73f02051649f03079b3b5f6d5a1745f00d2dc367066de8e93cafe3291cce7aa09884d7af SHA512 77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
 DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
 EBUILD pyicu-2.4.3.ebuild 541 BLAKE2B aeff740a3137edc2947e797c527e52b6306c283aa6610f23a827f3a77f47f7801922416d7b48c2aa79032f02eb6e254663507f5470a05201d99ae76a8bedb8c1 SHA512 d9d12f2f1a1982026b2955ce9bda2b687360176e3d2ebb1d6209689964d3d6f12532957973e7ca6ea057d16a3a6ed761e5fe6e8eeb9e7af282e0837e20b8d967
-EBUILD pyicu-2.5.ebuild 543 BLAKE2B da8a39e4f4807dfff127d126fbe2b7364ce78f977a45011ff9398b085d8a99ad6bd79b1786d32054dba0599c9e34f389bde6381ef63eff88b88791f96b3fb213 SHA512 99e658752ab69dd1113a07fe1c6698b67079cf183b1e239ca07bd421f9ee7993c483b30156eff78c2c485c84d77493e10cccc7eaac2de8ce9e9eb26a2df00d57
+EBUILD pyicu-2.5.ebuild 542 BLAKE2B aebd7778668b85f90007d78c4100adaf69af61fc89c80653dfb2ed616628b7b5fc8287ab62031bb793d4c261efea73c901d274ece4e805a194fb85eb0496c9d2 SHA512 ab4e7f228c8cfa8290742720ae84c4d78cd4cac54108ff3c3b5534f8906703c3280b558e9dab6fe173f73b83053b180d09aa3d7d39bc46f73c2e8980af8d72ea
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.5.ebuild b/dev-python/pyicu/pyicu-2.5.ebuild
index b22a46704638..9c7ec0357142 100644
--- a/dev-python/pyicu/pyicu-2.5.ebuild
+++ b/dev-python/pyicu/pyicu-2.5.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/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index b37375f58450..cb7afcfe64d0 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -2,5 +2,5 @@ AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad
 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 1110 BLAKE2B e403bad0f7cbec9f698509783fecefed3306064f1c51958891770b6eefdf7f79c314434c11e31fe4a3dea886f7c5b9b3247b694cf6e6f6de35992de7cdfdfa3b SHA512 9a35625332e2e1e33830912e339e22e2ec72bb958d9727a80c095e20f3513362b17b91f68f11c9322c931ed6ee52be73d7da3e2ab77b76a75236c641273b56f7
-EBUILD pypiserver-1.3.2.ebuild 1288 BLAKE2B faa730b7c6cb1a2865ee0a3feadd1330d19a5592cb4b895f57cfd57b8fc445511baf00bd4cc922f060515eb293e2c9dc8e80696af1fcf78a3d29a5ac677b699e SHA512 2f2e284d7ca72dca458c97b0c443cf501c060acebbb2ed64c8aaf5ee6b8cfe72d04ac0c91165ec61497b4eaa5ccded2f440ade50385970b8f85cb47bde34e8e3
+EBUILD pypiserver-1.3.2.ebuild 1287 BLAKE2B e6f7b4882004471150436ca12d5596be9249e239fa659a64fad56e1a1e2bb80979532a28d98e873ca61e32f748c61155f7f7c45e8515eb7fea92f60d4abc05e8 SHA512 3a08723d219e8e6b024fbc5c1d2c65b2436a884f3a507b16acfd86f6c93207e2071144ca64a9e70337b1cd2cc20df2db5076a2f20a36d4b2e687ec39a7f08c80
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index 629571cc42ac..58fe52472db6 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 1b56661ba0e9..55341a75dbe5 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
 EBUILD pytest-localserver-0.5.0-r1.ebuild 716 BLAKE2B 0e6635efd6ebd7b961a5fb69a8cbceb79fd2f24b951a89a8afbe222b8b2f835be0ee4cdbf46c982c60af595f59457e516390a7f94a7fa28306ed1076a4be407a SHA512 d75d5c52f5693fc7f583a2757f78aa40470f0ced3cba0df2ae8714fc79c663eaa7a8b0e974bca3c116db874ed3a7594de4178d3c2c900cbca2a26f622a2f8ff3
-EBUILD pytest-localserver-0.5.0.ebuild 720 BLAKE2B 69567dda9a66186418036fcfe9bc35e45e53f4e92f41f5daa275ddcfcdd93161e11f381e13643270ff99f4ac4b4fd2290cc96fff6658d3887451ebc1bce3f936 SHA512 320fd0e1003ee031c9419d5a418a01307a2cbbd91175153c25c78a5af69c051a4c1f2d7295eac8784124acb70cbb27f4d46e78dc405db7901062b366193dbb21
+EBUILD pytest-localserver-0.5.0.ebuild 719 BLAKE2B df9d40386399c8ca6f4f7f4d88597cff9b4aace2848e3d88a5951a6a04ee008877a4ce6b7b4cd1445f4e1a03955ca5cf616b261661b9cfad96788a2bfbc280cc SHA512 99b6e08d6b0476df2f2af2cee089572f6b1f8fe9b8bdf1c71c56c722720fac145449e52b7e0695d1947c9767db491b3b8e8dfb0658cfe84a5f114dc9cd8c1614
 MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index fd5d804e3e26..2f652f05515c 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.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"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index f08f456847af..8b2b86d13a91 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -11,7 +11,7 @@ DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a
 EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
 EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
 EBUILD pytest-4.6.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
-EBUILD pytest-4.6.11.ebuild 2481 BLAKE2B dc1fab11ccc7c3fcbc383d75b6a4c1acf6c85d4ed577291eb2799d936ce52a0897ac5b7e4ea85e9eb8802107c45fe51b82a86adec0f8cdce75d0e5b1d992ff18 SHA512 3959a6485abafca733d5382b652ef9c053a6757cb38ed29a38f583f1f94a9b35e3ee878eac202caf7042017001105112676fce2d0e1da7175452eac3627186f1
+EBUILD pytest-4.6.11.ebuild 2480 BLAKE2B e07497464d930cad0e01a9368fd24b3b101d429bacf69555e1e3dc4eb0b5c17dacc4c14f4ee369f19c0868ae8bcf329cd5baf7f66bee0c382cc7d924fbd7284c SHA512 46fea47ec76e148a86af25434b4db9d382d14d13a1b8a6643196684eaa6604d806fe0934343562fdc24acd1ada63d975d2e2927bc1d963312fb458fad351c2c9
 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 1937 BLAKE2B 0daa6532a40c9f098d68909976723249039fafdbea364b9051e7d00596c6a99d8f1e0faf650ff4326f172e3a032c74f96bd30b98e198cd07b29ee21eb6852c9f SHA512 4f0c41aa9ba7c1029e3400786ff3b81be695ed7d0668c602324ffa41681c52ad87ad5c54361e16cdaf1d3fb22d8903e502287f796189da12700416bfa2f0ab9a
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index 32e713dd573d..bc5454e1edee 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 74c9baae1a9e..5ae4d24f022a 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 838 BLAKE2B bc78fd9eead45397bda6676c10ce44c131edaa0e1e0c2900f00ad1409518ee952ec77f8f0a253740d97fe22846ae2e813b3b07662d64dde40f3434a9e7f76271 SHA512 6497d3f5735c1a8cb334f2f5433782b6712446164422a26aab601b5f8a4b9c3ef9846d14c330226015124679d87c202a8d689e6b06f9e6934f59514e2f4118f8
+EBUILD readme_renderer-25.0.ebuild 837 BLAKE2B 736191156b2a4fba72d3a0deb4a7c85bb3a727bf2a2e50519650d8fff93e98f4d21c7e0350cd1aedca18d366da7c040ff123d16159371f6ba7984312e6f72ebf SHA512 502137429dcdc30a359147843fde6615f875b6a56688cc83066fba8efd1fbff14982350687a740ad5da5660022de189e18e25df576de541ebab629756cd09b63
 EBUILD readme_renderer-26.0.ebuild 842 BLAKE2B 4092a8e2f2d59439c9723e09d47839970fefbd1268e29da0818eb75d33f5cd48bf1c01a8a5574444c5c17e762e0ec223a618e19352f69113028c3d2797b1e300 SHA512 22eec30dc8af1ce076551a0b78c51dff2b5b8f4edbc59f2a77f8e70ea9fe01cb91eca239dcffec014922cbd3f78dea4cb2c903a13d607be61c0d66418408f7c3
 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 742f1a80b007..eb4d283197bf 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 ~arm ~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-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 052aeff971e3..491a44093231 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1141 BLAKE2B 65fa3786fdf156281f67d0cc32e36c2b190860f3bd9d0f3d75602b2024f6884259fb3dbce8deb9f1245c8d41fbb705fd025e81d031f93a590c70957e5b226a90 SHA512 2de54016082a95e1461b1c919436bbd3e0d995e72ca773fc00329d80be76c1dc2e007b910ce40dcb81782249366458b8dbbd8e9aac96543f9dc102052b6cb1c3
+EBUILD requests-toolbelt-0.9.1.ebuild 1140 BLAKE2B abb7e93a38626a97fc61dc2781290e74288a7e49cc5d0d3d150a1a0957cf59748b850d37a3abbcb0c6408cc2edde29dbb5edaf765ec43f386d2d3d5adfd55494 SHA512 5c9b34692f9fa8d75d47f97898330a3e40c614dba4b2986c99859921de98eb3091453fe92d19212d90421cfd5e4ee5d52af2f87e5cba7d19b56b2334d04850f3
 MISC metadata.xml 398 BLAKE2B fcde3c429bad373cc0b0f1c155b217a69aac285add9c7ad92b50d211e36ccbed9e8d6c8b4d3cf42ce3250e614085bdc241893a6f2354dfc8b7e6a60a8924f58b SHA512 57e6affb2231a071faaa01d60bc44832eafe1ae5b927383666b230492fbfcbeb27e5ccd9d06308041aaaa1626289b5e1328fa1ba1be6d845564dac56b4fe3321
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index c6e899c5d0f1..0c24676e2815 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 54bb27fb0f27..b6889ada08ec 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
-EBUILD scrypt-0.8.13-r2.ebuild 608 BLAKE2B ca8ab15fa570948247c47e0d393cf148b959f940963ecfbf210f4fe71d6ef9074dea0cdf3bdedd2824094f6d4329da20900d156931ff8a0c54df79dc0e36aabf SHA512 397deaefcd0191a88d4c3a81a70a847490b50089ece03002e5bd49b82f7ae80f82ee6231d52f345c1e06e4443d34161374239066e15547360b9e9ecb8d60508d
+EBUILD scrypt-0.8.13-r2.ebuild 607 BLAKE2B 32466dba438e36fbfaf65a6b5f0197e32a87c91a23ad80bf5a95312b0e2a1018731ef921507dc0fc702f04fec32f38092b13bf47a4b4df1ed2b3f7da089a89cf SHA512 663da0614dbc3d363b03db3bc6548b064f59e3234414a7161ad12630a44a55ab71d40e9b27cf812121d1708f2b766550ce154756b975c0174b46e0a957688692
 EBUILD scrypt-0.8.15.ebuild 608 BLAKE2B 2c0bcb42b4489a580781f45a7137ddad465c80335055bdf7a2a304a1fbfa8903a57b82608eff91b587f2428a8309d7e97bd5c13a0667909de4456ce469b06fbd SHA512 7bf524032a6a974e2ea05be229f522a0e4bcf2ca782beb2c0e2ec9293ebb3cf34766418ee3d594f78afd8aed8caac049162e5cf558913e63fca4996f89c63015
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
index 8c1f7764603c..9dc427d23a37 100644
--- a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 703bc4bbe530..1aecd870ca68 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 921 BLAKE2B 14d176c918a616af267ff8a2eee889f1c0da565e7c95635917bb9bc0f0c81242e144a4c1fb0c372c9d7b495c1e90c748337e6823f2aa3631acfedc9eb7b5395c SHA512 b8523784d3dfdc99a4252046177cfda3c4503e77a5525c63b3c740ea830e678343dc08d65b1079acdd2ed840bcc20d75d3f455d1578e91bc0a0ee833aac45139
+EBUILD towncrier-19.2.0.ebuild 920 BLAKE2B ed2e50cfad627a285290d331f23295703e6cf01602eb9047f2cc9afd11e4e6b1754e51f6fec94f80b21bc6b882c6f08ebdd81a180331f1a4b454290b1ec47903 SHA512 61fb1d109fb3ae994b88c5ff683535c202e6a8655fb0eaaf8d73ddef6842bc171f629d96ac4b3e62d654de2e09dbd2ac594dbedf9d7bc65bc1ab8ea610a806f4
 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 7c6b2b5c34e1..5a541b16fd50 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 208e2f71d2bb..86c7c87e6e7b 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -8,6 +8,7 @@ DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62
 DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
 DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
 DIST tox-3.16.0.tar.gz 294040 BLAKE2B 2f5ca2c1b0b839b4fe6834cba69d772b9605e6bb00b24d75867de768042cd091a8fd7f5a349867a5de578b96eaad9f59f2ad019203fc6b2c39c9efc6933d2d96 SHA512 f92accae643b01867749f10d01ba0e18ebb36071af55a21cd38ac8f14fa3db1b1e708b22f8601e4d1b172e59fb62588c1252d064be3fb6007002eeaaef716373
+DIST tox-3.16.1.tar.gz 294080 BLAKE2B 692ef3f498f78f239ecbb3f9ac5745462430a96bb67df7a732e5c5756d1b579c4ee8582d528d5eafddc7b19905057c01514cccaa42d7c1a442ac24cd531a656f SHA512 83fefc4b82fb33adbf2ece9a6fd6ffaf27771ac6076af5d2939dcbf68f1dd88b8edd0a105b0ec86dc7ee37b127d27ed46748af61423811c7435d0093d2e8e1eb
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
 EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
@@ -17,5 +18,6 @@ EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b
 EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.15.2.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.16.0.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
+EBUILD tox-3.16.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.16.1.ebuild b/dev-python/tox/tox-3.16.1.ebuild
new file mode 100644
index 000000000000..0365e6a79004
--- /dev/null
+++ b/dev-python/tox/tox-3.16.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index d319a56250d1..347eb26493d5 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -9,7 +9,7 @@ DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d92433
 EBUILD tqdm-4.23.3.ebuild 673 BLAKE2B b49a8fdad4ee136a4b5149ab39a852d748c0a9f357587490fd272d37743ce530ed2b69fa8cd87a8ed657d26c0669c2e038d484afb7279ec3460562d281b0063c SHA512 2eb6fa8f796289073d92c07b6e7af8e7441d83bd32a01ac2a0d3dc8b530d1c796777ead4502cc6734b81adae01d8c0a496bff147cde268fe2d5223c4a8ad448a
 EBUILD tqdm-4.33.0.ebuild 1233 BLAKE2B 06c019bae07709c13627ec3b47c00c2745041b604d15a1f84445ab82cd82990506a61ce6c2d44cf9d84c4b1b2c5772ee6b03a4252af7035ac33fc4e6816d5ca1 SHA512 007d81a3e948d9b02e57a501d96ee8bfe8763bdbe5fa89d21332880873dc459cf184f3ffc3a9edf6b2b8b46933ae45d1e07b32b649c8d5ba15cfadf374bf2814
 EBUILD tqdm-4.40.0.ebuild 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
-EBUILD tqdm-4.45.0.ebuild 1357 BLAKE2B 61a3712f9a48e6fdf639f3a93e98f45d8252fddf368a10047e29c88a8041db391d6a196642b82bb5afc8bea5329e0f178dbec286b0a7b3fce9fc075ff687e9f1 SHA512 6cc9c993115b72a3e91bc0cf135d67e166de30f538a503e2901b01648805012056d4326444ff56f4fc6469b61aa1fb9a3eaa856a64c268649235945e3efc8e9f
+EBUILD tqdm-4.45.0.ebuild 1356 BLAKE2B de99573fcb953a2298a212e005aee99a22cbf5c65c24df98764a91fd9e284bcbfb025861e91da5941f870c881adc29f83b4f8868cce903f59a694acaae11dec1 SHA512 28dbd940ba11c365a71531fb77f8ce11faa835e761b93f6e272a380a813e337f07ea3069d2e584b405b39cca532664983ac2821ad088a65b3145e38d6505268d
 EBUILD tqdm-4.46.0.ebuild 1382 BLAKE2B 4c22605d67ffa9f686148c836e55d696adf92a9c8ef16e5c6aeee371b5f232996673a33f179638b429e1ebb2d6870cdc6b4332ac5ae2eb4e3b5b522c062d9d7c SHA512 312a694be69f171f8b07be4c718bdd1955c95366b3adbdc16de2694353b1d2e92b68e948add38bba57092a8bada6d25bebb90b7ad289974d86278da1d727fba0
 EBUILD tqdm-4.46.1.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
 EBUILD tqdm-4.47.0.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
index 6ec5bce83c37..e0fd100ba36e 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 ~arm ~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/twine/Manifest b/dev-python/twine/Manifest
index 9a188a74f880..b64af84c7488 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -3,7 +3,7 @@ AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
-EBUILD twine-1.15.0.ebuild 1316 BLAKE2B f3caf2ad608b788cbf8c221a52e192d4df24441a9cc6bde46131a44a117bc0e2300e507769a79945ab5afdff9d3ed3bd3fe8afa9611fab50561b9efe2c3a72db SHA512 4f55f1e3e359064f151a5975d5d28f45eac932a87a79ef7cfc9aa6aeceb5b94ce47b7da177fd8b3f78fded784b64501061308bf02fdac3a71acd495982640f80
+EBUILD twine-1.15.0.ebuild 1315 BLAKE2B 855ab7cbe5071f1f12978c4a834a21eee84b7cb5404614f4caaae63120cfb46aadf485e363a049e3864997cfc344f607cc3a772742d05a1b12ca1ec181073d47 SHA512 fbd347002493be89cd4a5c8622ba66c95bd9f2baa09294582935434502b3935888da1de539f4c7d6b78ddd27feb652dcc8603b73574cde9c0399c68a560e2fd5
 EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
 EBUILD twine-3.2.0.ebuild 2000 BLAKE2B fdb7b5d3d8e7f454658ebdba4b7047c496931936e97f71b13e9f4e0d9d7af21ab3b925a61ab38e0271dbb798835fda14218b80dbe76958cc19ff5a3020832b05 SHA512 81c68f707a4a9e5a3d36d25a05bea66ba85d2adbb2200569779e4deba6fa052b3ef68f558aec33e5b42563080f94f5b56e546c547fa99400f095e1a35ccdb5b4
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index aae10c3dab61..48fb322e6a9f 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 0ba08f3b2e24..efa748702a46 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -10,7 +10,7 @@ DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12
 DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
 DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
-EBUILD virtualenv-16.7.10.ebuild 1764 BLAKE2B d3006a8462b7ecfd27c0ba82f239e95e39973103cfbdce218fe078ea53947352e1590b66a3e8704f764f173a55afbc44b71a207f86e906d241d3c12cd0e97fba SHA512 4bbe5a62aa6bc3613800ff01ec293043d8fe733043ca5fe55bfd02105855b5a53802ce8b0db0d289e002a3319dc323049ca282de70619cb82e1445ae6f807f16
+EBUILD virtualenv-16.7.10.ebuild 1763 BLAKE2B 7c250451da0232925815ee78d115912b87a82becce3c668ba78c530defef96bb809fbbf9a5ad9c061c58e373ac2a6d2e726e30ec268f5bce5c631710ae26f92a SHA512 f3915ad1001fab6afa8757f43db2a8f4c86bc7819e13f4f524dfc7549289d109efb0db97758dacb99d17f0ccfef83736b186c875f9ebe90f866562d2e2d33ce4
 EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
 EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
 EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index b26dbd53d0df..bf9661e38d1c 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 ~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"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 42a5551c5d95..75bc14f5926c 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -2,5 +2,5 @@ AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9f
 DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
 DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
 EBUILD webtest-2.0.33.ebuild 1411 BLAKE2B 10c8762873ce7fb712480e3e9ce6cbcf848ed9a3db274e2306a09bb496dd223d29b40eac61604283f9fbba222579bfc8f6ba55b5a3bfc2355d561d45ded511e1 SHA512 da877093e91a7d899ca6dec376eacb2a65a9d26017b20a1c18d249ff33c498baf893d3433ca6e3c5561adbddb32d30584f9d1b99b67217c55d05ce82bcb87c89
-EBUILD webtest-2.0.35.ebuild 1167 BLAKE2B c4c4c20f74514951579f99486386e0dbaab239c34cb08bdfc8edc73b180690f586cdd868e3005b7dd0ddb32cac65fda46d8b368b6254f1b500494e605ae534e2 SHA512 c273fbc09af634c2a5fbf0ad4d0df303e26033653ea81679846e7eb16625bbbc89ac7212b84692d3760e556210cefc40ac50da35b05a1b244b93780491d740d6
+EBUILD webtest-2.0.35.ebuild 1166 BLAKE2B d89cd6d952f46789bde9be8f534ad6b9dad5552e0e9464327872b1d1e023cdfbddbecfe5270064a263374fdaaeae75e48f440a7022a631c2d5dc04284c15b9e8 SHA512 3f705e0e280b1da215d478e4b2010ad2bb6c812228cfc543767002478507d5207c989d4f564f47c4dcd0c5587eef8889abcedbd2dd0cc89b11d3e73361f70ecd
 MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 2f10b3f2dfac..2a82d27844c9 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6271b146d715..4f1152cc323b 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index cd0be3f57cdb..46babc7c4a79 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -3,9 +3,11 @@ DIST zeitwerk-2.1.10.tar.gz 92514 BLAKE2B 509cdaeecb8d7d369282a5fc9e8632a19eb203
 DIST zeitwerk-2.2.1.tar.gz 94726 BLAKE2B 6fb5fe08cc6a3845598ee70bcce5a6546b7fea8de547dc821c337ef3bd02983061edffb0d2ce1e1ab446b38ff282dc042a26532cff7604a9cdb9922d333deee4 SHA512 984740b981448edc539db06b268e16256ef4302f0d8d56b31c69a8f0324ded8eb1d77c3720b9e2e49723e4e0b4b5e4db538ecf5f24690930d336d7b0f0d246bc
 DIST zeitwerk-2.2.2.tar.gz 94978 BLAKE2B 0920f7c1848eff586d0dfd2a15821fa38ccfe7d1d2945196a3cad534cb7ca740a30721b434ccf602e431bfdd16e87d6714fa0ac0edf60e6dcfa6398aae22dbaa SHA512 19b58ed4d9a04c9d3cb0f587ae8b824cca1a8bf44b2a484d7ea1c3a0a8b378b66174172a3e4adec75853602bfef0c6fd3be5205eacdcad96ef87dce26d7ba5a7
 DIST zeitwerk-2.3.0.tar.gz 95973 BLAKE2B c484d40587d7ce52e257eb90bf543a573b6512bdd833809316c9407cd275dfc9aad703982477e1c601510d5e0703449bf2794505156fc51283ad1989c8724758 SHA512 e891b2fda9375f1e459dce2adc2f1b2128bd20a2f7e617ae27967b3bd0927689f5134aa42b098fdd077c089bf2debcf0a88b7b3fd89a97ac44dc9c9fbc72f14e
+DIST zeitwerk-2.3.1.tar.gz 97616 BLAKE2B d5b387f9a02c5f0250b709d144bc833a0f20164ab3065483cba177078fc04ada7fda99bbe5efa7c6481ae6c21006b6d9a73a31e18f40b19f9183efcf7f0f76cf SHA512 b0f782afde6f3a60e6dc3440316689ba39542e3c9d57129a433a0ea967869ca32d79ab1c522d84091b29a698e80ced31f94c9d12592f310945c4267d1e72b5f0
 EBUILD zeitwerk-1.4.3.ebuild 830 BLAKE2B 7b8d3fa7f20752b2e0caf92e9e63ed1f50ad4e759092d20da1e9d1f4cb8389fba1160b533e21d0b46773152224e2cf69e54488357918353c1fc4bfad6843ba74 SHA512 98529f550a67c791df72a0126a9aaf10d11f1ea427540b4551fa02ad0b4a4ff11c6de51fc25b3d95037cda90896528fcce2634960d931a22f48d0e0481be5004
 EBUILD zeitwerk-2.1.10.ebuild 829 BLAKE2B f01d4a529d45c3209b6ae76c5caba3541505ef1f4bbcae50570a647ba03718b83fc66af6292e8848d8af5af71f598661ae1e3b28bce01e45fbd6c80c980b0674 SHA512 0e97f4fa5b5ddc47168661d121f1eb44528da255d9fd7c9ccaccbcb9cfbb6dc0674f3a04583a2260806fb38b4f7c629fbd3db847eb001260dab5261b8de83d57
 EBUILD zeitwerk-2.2.1.ebuild 829 BLAKE2B f01d4a529d45c3209b6ae76c5caba3541505ef1f4bbcae50570a647ba03718b83fc66af6292e8848d8af5af71f598661ae1e3b28bce01e45fbd6c80c980b0674 SHA512 0e97f4fa5b5ddc47168661d121f1eb44528da255d9fd7c9ccaccbcb9cfbb6dc0674f3a04583a2260806fb38b4f7c629fbd3db847eb001260dab5261b8de83d57
 EBUILD zeitwerk-2.2.2.ebuild 883 BLAKE2B 307c4ec1f2a54853731c9fd7555a2e7c55e87aa6ff7db531855bea0ac8aa379d1949c466689378c9f860bced8a83e33ac24f701651c651399a9c29eddfe6f1d6 SHA512 ab3b5052dd09ec90dc89608067314751581378a6572a4c6cb69e1e8e18786d44bf544a530f085ade20a8b4011dd6c7192cb7a19e52de5e184e82fe0b32a990e1
 EBUILD zeitwerk-2.3.0.ebuild 883 BLAKE2B 307c4ec1f2a54853731c9fd7555a2e7c55e87aa6ff7db531855bea0ac8aa379d1949c466689378c9f860bced8a83e33ac24f701651c651399a9c29eddfe6f1d6 SHA512 ab3b5052dd09ec90dc89608067314751581378a6572a4c6cb69e1e8e18786d44bf544a530f085ade20a8b4011dd6c7192cb7a19e52de5e184e82fe0b32a990e1
+EBUILD zeitwerk-2.3.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.3.1.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.3.1.ebuild
new file mode 100644
index 000000000000..827d557e2223
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index de0cc12a4aba..da7cf4be4ccd 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
new file mode 100644
index 000000000000..87788535cf53
--- /dev/null
+++ b/dev-util/bear/Manifest
@@ -0,0 +1,3 @@
+DIST bear-2.4.3.tar.gz 49933 BLAKE2B 2a91c30d81f9d0e58a25458579f6b0c867c07d2e532bd2ed29305645e152bd564156f708c4a07a683577412b3fdab1f106685ecf1ad88eaad2f33f0bc43a5baa SHA512 a4690cfc9938d8752ca5c8322ca4c5039746ade059e4459e7f3f91b2bf3d36ea691a5d855cab7a4e7ad8ff76478c48c4394593e069a1cf8396ead41017421753
+EBUILD bear-2.4.3.ebuild 1634 BLAKE2B e0adf19fb18817851269ce6ee51bc32a91ecadeded8245ff8febd2e521f5cb5a3892b862186e2bf58d893a6ea63b9fde70868c338563b3347518b186ada5ec62 SHA512 80713166f3397724f34824d1498ac338b6b5cfefa39b6dc323f190e01dfbbebee031c2ada1186cfe493006abd7a9294f3d70c66583c31db7b1bf0b154acdc0e0
+MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-2.4.3.ebuild b/dev-util/bear/bear-2.4.3.ebuild
new file mode 100644
index 000000000000..83600bfdb38f
--- /dev/null
+++ b/dev-util/bear/bear-2.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="test? (
+	app-shells/bash
+	$(python_gen_cond_dep '
+		dev-python/lit[${PYTHON_USEDEP}]
+	')
+)"
+
+RDEPEND="${PYTHON_DEPS}"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+src_compile() {
+	cmake_src_compile
+	# need to fix it now, before tests are run
+	python_fix_shebang "${BUILD_DIR}"/bear/bear
+	python_fix_shebang test/functional/tools/cdb_diff.py
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "removing unwanted/unsupported/xfail tests"
+		rm -v test/functional/cases/{end-to-end/scons.ft,intercept/cuda/successful_build.fts,run_pep8.ft} || die
+		einfo "test may use optional tools if found: qmake gfortran"
+		cmake_build check
+	fi
+}
diff --git a/dev-util/bear/metadata.xml b/dev-util/bear/metadata.xml
new file mode 100644
index 000000000000..f8c8a305d1e4
--- /dev/null
+++ b/dev-util/bear/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bear is a tool that generates a compilation database for clang tooling.
+		The concept behind Bear is: to execute the original build command and intercept the exec calls issued by the build tool.
+		To achieve that, Bear uses the LD_PRELOAD or DYLD_INSERT_LIBRARIES mechanisms provided by the dynamic linker.
+		Bear has two components: the library and the binary.
+		The library redefines the exec methods to be used by all child processes.
+		The executable enables the use of the library for child processes and writes the output file.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rizsotto/Bear</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index e84348be171a..d7c71ff4d1a5 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,4 +1,3 @@
-AUX bnfc-2.8-alex-3.1.6.patch 207 BLAKE2B 3e14851866c8ae0dda9245dd1dc920bc4554eb9eae80caec36b9a9b27d62e01727d23e2d716806c18e7e414def483dc192a1c7c8dbca1a5841c7278f40487264 SHA512 6d467ff25b7e8ef70c99b80f4f847b2c22ad39890f72a9a2dee851783af45a91567629f87685e0f8a2d3d64213161713cd7282feed4cd927aff7feab38b97b48
 AUX bnfc-2.8.1-ghc84-p2.patch 4144 BLAKE2B 19ac2a0e8edcbad7d441c248625904aa0021fc64e97d3f7ebcf3e0d1bdf693b442062a5126af1162404de59a022e8f573d7127c223209993755e99e60285eda8 SHA512 4a21d805f24d9f4729a2b95af04333651639324f7ec26996627007ffb5dc8657cb175b228e95e9356c2b47e70ac49576f58b024891c0ce6ddf299b4ee9299548
 AUX bnfc-2.8.1-ghc84.patch 986 BLAKE2B bf7ecd64654f04d701a2b7ec9dfc969cbf4a1bd51db7e6d31512c2cd7bfbaed83ae37a93bec7ce667cae2a98369086accf5d76dab84ae02df4af6d87703531bf SHA512 615ac9cf9b7eff19f675b4cb44e9a3b9d9acc53c827c57c2b556fb76c9c37832f8d137609df64c469eed0b298c0b9dbe01b1ba9cb8d5a1b3088fadadfe27af49
 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
diff --git a/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch b/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
deleted file mode 100644
index e9834830e257..000000000000
--- a/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/LexBNF.x b/src/LexBNF.x
-index 927e15d..aea3386 100644
---- a/src/LexBNF.x
-+++ b/src/LexBNF.x
-@@ -11,2 +11,3 @@ import qualified Data.Bits
- import Data.Word (Word8)
-+import Data.Char (ord)
- }
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 85c8bfe7547f..149ff49a3ff7 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,5 +1,3 @@
-AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 BLAKE2B 3dabdb99730f9581bd44d5c5ff9930aa57887e830db3226a37f9ba788e46b17e64ceb35f75476872936cc07c42cbda2241fd03a2d3fbb1ab5c3d2a59ece99811 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588
-AUX bustle-0.4.7-gtk-0.13.patch 6428 BLAKE2B 20eea89172dbd4ef029ec598be9556721d8a5503aaf6cf1cefa3003e166dd12e1d1be3e41152ba530a49bf8bdd746495797887bb4c3ba9c91df965b3cd54c529 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
 EBUILD bustle-0.5.4.ebuild 1635 BLAKE2B 4e3e075dc2d7ca51a77112a26c86e975681d35f6ba41b5cf2d3b2d074b1d2d5be59f2bb63c713dfa5fbe5c8f6145c87388159060995897062e37de910d00e348 SHA512 f8b263727d6c917fa5a76f6f4462c07310181bac753763ffb44f5633fbdf7b63580f99eae5268e5f29c83df048ae5dfb37bd5aa49984bd6fefcd95e8f9b84af2
 MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
deleted file mode 100644
index 74ab26ff8fcd..000000000000
--- a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- bustle-0.4.2-orig/bustle.cabal	2012-11-15 02:19:34.000000000 +1100
-+++ bustle-0.4.2/bustle.cabal	2013-04-03 15:07:35.381569187 +1100
-@@ -82,15 +82,15 @@
- 
-   Build-Depends: base >= 4 && < 5
-                , bytestring
--               , cairo
-+               , cairo < 0.13
-                , containers
-                , dbus >= 0.10
-                , directory
-                , filepath
--               , glib
--               , gtk >= 0.12.3
-+               , glib < 0.13
-+               , gtk >= 0.12.3 && < 0.13
-                , mtl
--               , pango
-+               , pango < 0.13
-                , parsec
-                , pcap
-                , process
-@@ -111,15 +111,15 @@
-   pkgconfig-depends: glib-2.0
-   Build-Depends: base >= 4 && < 5
-                , bytestring
--               , cairo
-+               , cairo < 0.13
-                , containers
-                , dbus
-                , directory
-                , filepath
--               , gtk > 0.12
--               , glib
-+               , gtk > 0.12 && < 0.13
-+               , glib < 0.13
-                , mtl
--               , pango
-+               , pango < 0.13
-                , parsec
-                , pcap
-                , text
-@@ -163,15 +163,15 @@
-     main-is: Test/Renderer.hs
-     other-modules: Bustle.Renderer
-     Build-Depends: base
--                 , cairo
-+                 , cairo < 0.13
-                  , containers
-                  , dbus >= 0.10
-                  , directory
-                  , filepath
--                 , gtk
-+                 , gtk < 0.13
-                  , mtl
-                  , text
--                 , pango
-+                 , pango < 0.13
-                  , test-framework
-                  , test-framework-hunit
-                  , HUnit
diff --git a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
deleted file mode 100644
index f2691521c4bd..000000000000
--- a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff --git a/Bustle/Diagram.hs b/Bustle/Diagram.hs
-index d558beb..ef96d60 100644
---- a/Bustle/Diagram.hs
-+++ b/Bustle/Diagram.hs
-@@ -450,7 +450,7 @@ mkLayout :: (MonadIO m)
- mkLayout s e a = liftIO $ do
-     ctx <- cairoCreateContext Nothing
-     layout <- layoutEmpty ctx
--    layoutSetMarkup layout (Markup.unMarkup s)
-+    layoutSetMarkup layout (Markup.unMarkup s) :: IO String
-     layoutSetFontDescription layout (Just font)
-     layoutSetEllipsize layout e
-     layoutSetAlignment layout a
-diff --git a/Bustle/UI.hs b/Bustle/UI.hs
-index a78797e..9843b29 100644
---- a/Bustle/UI.hs
-+++ b/Bustle/UI.hs
-@@ -30,6 +30,7 @@ import Data.IORef
- import qualified Data.Set as Set
- import Data.List (intercalate)
- import Data.Time
-+import qualified Data.Text as T
- import Data.Monoid (mempty)
- import Text.Printf
- 
-@@ -281,6 +282,7 @@ promptToSave wi = io $ do
-     case mdetails of
-         Just (RecordedLog tempFilePath) -> do
-             let tempFileName = takeFileName tempFilePath
-+                title :: String
-                 title = printf (__ "Save log '%s' before closing?") tempFileName
-             prompt <- messageDialogNew (Just (wiWindow wi))
-                                        [DialogModal]
-@@ -459,7 +461,7 @@ wiSetLogDetails :: WindowInfo
-                 -> IO ()
- wiSetLogDetails wi logDetails = do
-     writeIORef (wiLogDetails wi) (Just logDetails)
--    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails))
-+    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails) :: String)
- 
- setPage :: MonadIO io
-         => WindowInfo
-@@ -525,7 +527,7 @@ loadPixbuf :: FilePath -> IO (Maybe Pixbuf)
- loadPixbuf filename = do
-   iconName <- getDataFileName $ "data/" ++ filename
-   C.catch (fmap Just (pixbufNewFromFile iconName))
--          (\(GError _ _ msg) -> warn msg >> return Nothing)
-+          (\(GError _ _ msg) -> warn (T.unpack msg) >> return Nothing)
- 
- openDialogue :: Window -> B ()
- openDialogue window = embedIO $ \r -> do
-diff --git a/Bustle/UI/Canvas.hs b/Bustle/UI/Canvas.hs
-index 46c1582..5a28761 100644
---- a/Bustle/UI/Canvas.hs
-+++ b/Bustle/UI/Canvas.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE OverloadedStrings #-}
- {-
- Bustle.UI.Canvas: displays diagrams
- Copyright © 2008–2012 Collabora Ltd.
-@@ -58,7 +59,7 @@ canvasNew :: Eq a
-           -> (Maybe a -> IO ())
-           -> IO (Canvas a)
- canvasNew builder showBounds selectionChangedCb = do
--    layout <- builderGetObject builder castToLayout "diagramLayout"
-+    layout <- builderGetObject builder castToLayout ("diagramLayout" :: String)
-     idRef <- newIORef Nothing
-     shapesRef <- newIORef []
-     widthRef <- newIORef 0
-diff --git a/Bustle/UI/DetailsView.hs b/Bustle/UI/DetailsView.hs
-index 35e80d6..d1b9d96 100644
---- a/Bustle/UI/DetailsView.hs
-+++ b/Bustle/UI/DetailsView.hs
-@@ -55,7 +55,7 @@ addValue :: Table
-          -> Int
-          -> IO Label
- addValue table row = do
--    label <- labelNew Nothing
-+    label <- labelNew (Nothing :: Maybe String)
-     miscSetAlignment label 0 0
-     labelSetEllipsize label EllipsizeStart
-     labelSetSelectable label True
-@@ -77,7 +77,7 @@ detailsViewNew = do
-                 , tableColumnSpacing := 6
-                 ]
- 
--    title <- labelNew Nothing
-+    title <- labelNew (Nothing :: Maybe String)
-     miscSetAlignment title 0 0
-     tableAttach table title 0 2 0 1 [Fill] [Fill] 0 0
- 
-diff --git a/Bustle/UI/FilterDialog.hs b/Bustle/UI/FilterDialog.hs
-index 9560507..152931e 100644
---- a/Bustle/UI/FilterDialog.hs
-+++ b/Bustle/UI/FilterDialog.hs
-@@ -99,7 +99,7 @@ runFilterDialog parent names currentlyHidden = do
-     nameStore <- makeStore names currentlyHidden
-     sw <- makeView nameStore
- 
--    instructions <- labelNew Nothing
-+    instructions <- labelNew (Nothing :: Maybe String)
-     widgetSetSizeRequest instructions 600 (-1)
-     labelSetMarkup instructions
-         (__ "Unticking a service hides its column in the diagram, \
-diff --git a/Bustle/UI/Recorder.hs b/Bustle/UI/Recorder.hs
-index 1e98a68..085eea2 100644
---- a/Bustle/UI/Recorder.hs
-+++ b/Bustle/UI/Recorder.hs
-@@ -27,6 +27,7 @@ import Control.Monad (when, liftM)
- import Control.Concurrent.MVar
- import qualified Data.Map as Map
- import Data.Monoid
-+import qualified Data.Text as T
- import Control.Monad.State (runStateT)
- import Text.Printf
- 
-@@ -77,8 +78,7 @@ processBatch pendingRef n label incoming = do
-                 -- message from the user's perspective.
-                 i <- takeMVar n
-                 let j = i + (length pending)
--                labelSetMarkup label $
--                    printf (__ "Logged <b>%u</b> messages…") j
-+                labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") j :: String)
-                 putMVar n j
- 
-                 incoming rr'
-@@ -97,8 +97,8 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
-     maybe (return ()) (windowSetTransientFor dialog) mwindow
-     dialog `set` [ windowModal := True ]
- 
--    label <- labelNew Nothing
--    labelSetMarkup label $ printf (__ "Logged <b>%u</b> messages…") (0 :: Int)
-+    label <- labelNew (Nothing :: Maybe String)
-+    labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") (0 :: Int) :: String)
-     loaderStateRef <- newMVar Map.empty
-     pendingRef <- newMVar []
-     let updateLabel µs body = do
-@@ -142,7 +142,7 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
-     widgetShowAll dialog
-   where
-     newFailed (GError _ _ message) = do
--        displayError mwindow message Nothing
-+        displayError mwindow (T.unpack message) Nothing
- 
- recorderChooseFile :: FilePath
-                    -> Maybe Window
-diff --git a/bustle.cabal b/bustle.cabal
-index 4ac107c..2d1f907 100644
---- a/bustle.cabal
-+++ b/bustle.cabal
-@@ -106,10 +106,10 @@ Executable bustle
-                , directory
-                , filepath
-                , glib
--               , gtk >= 0.12.4
-+               , gtk >= 0.13
-                , hgettext >= 0.1.5
-                , mtl
--               , pango
-+               , pango >= 0.13
-                , parsec
-                , pcap
-                , process
-@@ -136,7 +136,7 @@ Executable test-monitor
-                , dbus
-                , directory
-                , filepath
--               , gtk > 0.12
-+               , gtk >= 0.13
-                , glib
-                , hgettext
-                , mtl
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 904abe090a10..7066030c793f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,10 +19,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
 DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873 SHA512 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
-DIST cmake-3.18.0-rc2.tar.gz 8948443 BLAKE2B cf225cb9470fb99741fee83f0acb2d9a673130df5c29af546f9742e433e39811f942d5a5e3748110cf6f8af58d65f4dba05ff2106144be933f9d22781d796687 SHA512 30f6a223151bbfd9d18c39d5236a7d420e4a526fa88f7254dfffe3dd456b2e6efe66ab206b4c9a9ac758ab4d1cb89a2484c52d90f9d7658a8093f6ee2dc90632
+DIST cmake-3.18.0-rc3.tar.gz 8968777 BLAKE2B 9fdbe4870e70400bc73f53a4ba37e832b3f32cee1342bdab5e3078ce0969564c3d8d9fde9945fae8cd5da35f77abb2be0c6003b2f321d5458cff65935792a972 SHA512 f4bda297c90d6449d6ef3adcf91debc61a9dbef65934dfd1447f86d30747b4b466bb813abe58ee3d6a3aa9e8e49d5e7cd118820e92bec3b2e52f06142faa017e
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B 8bbcabb94f033e35c3c6436d7c53a08901bfa102e2b1d8dc57a090e7bc7a68c9cbcd80c1e758540282b2d03d6a3e72f54e35cea0c37cb905a648b1daafe370f5 SHA512 7d1462f3281e275fefea2f5983ade92ba3436981d652be57861bcac44f2b6b6e42e8da900574347cf76df123e4a6da37b5e3d94d06fa514ee3b91d32d9916675
 EBUILD cmake-3.17.2.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
 EBUILD cmake-3.17.3.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
-EBUILD cmake-3.18.0_rc2.ebuild 5859 BLAKE2B 1f840725f5f008e9f35da31ce7038be1234bf6479a132190556466e530f5a9516aa931db53a5c90f5ac4911df28fd0810c041bd7e1d255a3ee10b192da099f64 SHA512 330fd0a4fcedefd2fd83da8f623f0f22d75e585e2d3179a13fee8b49b8d4832935f19fe98114154c459dbb0df9375de52171725b9af35f5c4f9f860072ce2224
+EBUILD cmake-3.18.0_rc3.ebuild 5859 BLAKE2B 1f840725f5f008e9f35da31ce7038be1234bf6479a132190556466e530f5a9516aa931db53a5c90f5ac4911df28fd0810c041bd7e1d255a3ee10b192da099f64 SHA512 330fd0a4fcedefd2fd83da8f623f0f22d75e585e2d3179a13fee8b49b8d4832935f19fe98114154c459dbb0df9375de52171725b9af35f5c4f9f860072ce2224
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.0_rc2.ebuild b/dev-util/cmake/cmake-3.18.0_rc3.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-3.18.0_rc2.ebuild
rename to dev-util/cmake/cmake-3.18.0_rc3.ebuild
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index ae73ab2eef9b..77dc62c8fb75 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 60fff8a5150f..974067913c11 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -7,5 +7,10 @@ AUX teeworlds-init.d 1000 BLAKE2B 7681574d8e35583ea029b604925fa0ed3af50dafb17993
 AUX teeworlds.xpm 2785 BLAKE2B 288e6fe273e38d802c102403f5e70d0a2c004bba28c3c1744f0a5f3d77168cc76dccf8039b9eca761d159cf7c1d127755171cc313ef3d614a195d9858426700a SHA512 f8a8a1c3a5675f12b13ddaf9b68bc2757698725d406356c871d58e62f735413b5f4f0bcb3dbf783e0aa6b3ecb0ec7f9eddbcef044506a6a07a374fe46d2616c0
 AUX teeworlds_srv.cfg 193 BLAKE2B dbbad582189f5b098e9f199dc59227ef90485e7a1bc406372d69f9985ee5a7fe39db68c52d8eb394a1c6e1320496925fa8c5474dd91204bf6e93787c2c0ba838 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5
 DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
+DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8 SHA512 74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
+DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925 SHA512 41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
+DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3 SHA512 673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b
+DIST teeworlds.png 21502 BLAKE2B 8064e0c2149f20f182b2ca2f7454f0e8395e199a432b8f21a9963cc771b1504ebe8cbe427ecd738d35313b1a378eaf8e305d509cd5360a07e9ab3c5224b78b77 SHA512 a272a1d9f13504c43ba873d93899df93c435f58cec20ae68bc9493a983e54cdd4c8f0f2e0630558c5e915aec891d2267bc3459ecc78c25738602452a2123fadf
 EBUILD teeworlds-0.6.4.ebuild 2391 BLAKE2B 83f8fe3b44e3bc40d93dadbe98aa38fb36e38963dd20394673d197f194ed23a8e6f7c7edc914c1f37ee48d339f7195530e608335aef639d850c64d61261c718a SHA512 214e0c0a4210ab302d48db14424d24c6444d3df6a1dda576ab084d8017a3898fcb6558da320717ca0a679e4e586638f83dfb3710da24dc30d5cfbe69b83cdbb3
+EBUILD teeworlds-0.7.5.ebuild 1947 BLAKE2B a1bbdbaa360202dcdf8092077e847cf591644b9893a913d462354cf95145e3a03394c60ecbf849ce9e805f3420c489a8a0c53e909d7ebc99b46e41935ee8da67 SHA512 1e4e539c77b549fc6183098aac12c4d30c89743ef2cd037204d047fa9ced2519893a2252cc2802fb99ed14ad7c854fc6a7f913b226c12afd659763d007bf9f98
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/teeworlds/teeworlds-0.7.5.ebuild b/games-action/teeworlds/teeworlds-0.7.5.ebuild
new file mode 100644
index 000000000000..7e5532fed006
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.7.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb"
+COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65"
+inherit cmake desktop python-any-r1 xdg-utils
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="https://www.teeworlds.com/"
+SRC_URI="
+	https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png
+	https://github.com/teeworlds/teeworlds/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/teeworlds/teeworlds-maps/archive/${COMMIT_MAPS}.tar.gz -> ${P}-maps.tar.gz
+	https://github.com/teeworlds/teeworlds-translation/archive/${COMMIT_LANG}.tar.gz -> ${P}-translation.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+	!dedicated? (
+		app-arch/bzip2:=
+		media-libs/freetype
+		media-libs/libsdl[X,sound,opengl,video]
+		media-libs/pnglite
+		media-sound/wavpack
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND} ${PYTHON_DEPS}"
+
+src_prepare() {
+	cmake_src_prepare
+	rm -r "${S}/datasrc/languages" || die
+	rm -r "${S}/datasrc/maps" || die
+	mv "${WORKDIR}/${PN}-translation-${COMMIT_LANG}" "${S}/datasrc/languages" || die
+	mv "${WORKDIR}/${PN}-maps-${COMMIT_MAPS}" "${S}/datasrc/maps" || die
+	cp "${DISTDIR}/${PN}.png" "${S}/" || die
+	python_fix_shebang scripts/
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLIENT=$(usex dedicated OFF ON)
+		-DDEV=$(usex debug ON OFF)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon -s 256 "${PN}.png"
+	domenu other/teeworlds.desktop
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	insinto "/etc/${PN}"
+	doins "${FILESDIR}"/teeworlds_srv.cfg
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 2fe8db159540..699b2af95ce8 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index aa4cd3cf3ca2..33dc5cfba8d0 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1,3 +1,4 @@
-DIST pioneers-15.3.tar.gz 4154470 BLAKE2B 536b2100ac0dd75d8c118741bffdd433bebcbdef2df54a75a5e9004f5fb2f7859bc75c27935251fc94b3428e730a7be522b88a7ab13224cb545180eb84ad86f9 SHA512 57aa8bc48019c87a683a4728d28d56f6bd755a0566922dddb4de825904820d1204f893e73fd13465fcec63cecb4a5735a90338f6ff915b7f17113dc0f1e834c1
-EBUILD pioneers-15.3-r1.ebuild 1020 BLAKE2B f238e770e814394468c8f35a14d826b765f2dd999d12ee26736a1b2ebe61ab5a23bbc509ba82b19a641e63cbd655321724f856292eaa9ad9c06848c155212ce6 SHA512 c81f2facd174bad96b13784a15e7b4c06cde98f0af73f5dc798e06d0a893357e3ec1edc464fdff5a307a50e8766aba0a704e3028786f18897cccaa4320fc248b
+AUX pioneers-15.5-fno-common.patch 465 BLAKE2B 1ea0122a77ddb954760067ecae5e2704ea7e76ff221ba13126502dc7217ff89592da64f54df4f2d0f99a3567019d4f7db1e73109f3efbabd4959531a563ffa3c SHA512 b37a07ea641d271ade5a243e38b8be71aa8a144332e99079f2dc50f168e943eb914a86381034aadc679382a521e7247ef3e2965844310dbe527b2a5a168cf404
+DIST pioneers-15.5.tar.gz 4975627 BLAKE2B 8cae5df3e122743819196f0442ba18cedcfd4fee51d9e76ef4137f120e3429456f58ca9d6e537b8e0206c937d882b4a22d76ae333a7d5d7dc69d65f7bbd94b18 SHA512 a3261197348d7e994da81ad4948755520bf29678614a9ea2b2cacc81622093c6460b0cee671a04c125684d88a9ee1deb9206ccb73ab1440be1a1505e24b2ed2a
+EBUILD pioneers-15.5.ebuild 1008 BLAKE2B 4a8675b0a4230e7fc8a72d9fc9aa3838fa0263d489bc42e48aca3435da74d09588fa7803a464d9c25a4d83c3b7b78e62cfdc89087b7a939e8a43eb14c9b16a0d SHA512 58f4b5dcdd6bee422d2444da171b4a3fb88b032326d83923046ea58c74bf282c6a5a4cd17d00fe86fc01a9c43c90d173a201d3a73c140a3bd5c043760d07349c
 MISC metadata.xml 516 BLAKE2B bbc4f44f35490c9f2508b7b4bfa20d748757237608ff09fe5424e3e22370eaf8fa9d88bad25e9a6f0507557ad8bf84d8d78e59c9812e4a94ce8e0e009776b218 SHA512 363d4fc98308e842211f4515c1b6da788e6d43498376efbc7195a17406ad0015c6dee37b380537bfeb530d5ead40c5cd2c6c9836378d4ab178f8c1f1434a2dbc
diff --git a/games-board/pioneers/files/pioneers-15.5-fno-common.patch b/games-board/pioneers/files/pioneers-15.5-fno-common.patch
new file mode 100644
index 000000000000..5d8522b772ec
--- /dev/null
+++ b/games-board/pioneers/files/pioneers-15.5-fno-common.patch
@@ -0,0 +1,12 @@
+diff -up a/common/game.h.me b/common/game.h
+--- a/common/game.h.me	2020-02-06 12:05:24.472403768 +0100
++++ b/common/game.h	2020-02-06 12:05:45.662644226 +0100
+@@ -137,7 +137,7 @@ typedef enum {
+ typedef void (*WriteLineFunc) (gpointer user_data, const gchar *);
+ 
+ /** Default style for a player. */
+-const gchar *default_player_style;
++extern const gchar *default_player_style;
+ 
+ GameParams *params_new(void);
+ GameParams *params_copy(const GameParams * params);
diff --git a/games-board/pioneers/pioneers-15.3-r1.ebuild b/games-board/pioneers/pioneers-15.5.ebuild
similarity index 59%
rename from games-board/pioneers/pioneers-15.3-r1.ebuild
rename to games-board/pioneers/pioneers-15.5.ebuild
index da4fa55fbc93..afd322eae4c7 100644
--- a/games-board/pioneers/pioneers-15.3-r1.ebuild
+++ b/games-board/pioneers/pioneers-15.5.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gnome2
 
-DESCRIPTION="A clone of the popular board game The Settlers of Catan"
+DESCRIPTION="Clone of the popular board game The Settlers of Catan"
 HOMEPAGE="http://pio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pio/${P}.tar.gz"
 
@@ -14,24 +15,23 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dedicated help nls"
 
 # dev-util/gob only for autoreconf
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND="
+	>=dev-libs/glib-2.28:2
 	!dedicated?	(
-		>=x11-libs/gtk+-3.4:3
+		>=x11-libs/gtk+-3.22:3
 		>=x11-libs/libnotify-0.7.4
-		help? (
-			app-text/rarian
-			>=gnome-base/libgnome-2.10
-		)
+		help? ( app-text/yelp-tools )
 	)
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gob:2
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	gnome2_src_prepare
-}
+DOCS=( AUTHORS ChangeLog README TODO NEWS )
+
+PATCHES=( "${FILESDIR}/${P}-fno-common.patch" )
 
 src_configure() {
 	gnome2_src_configure \
@@ -42,6 +42,5 @@ src_configure() {
 }
 
 src_install() {
-	DOCS='AUTHORS ChangeLog README TODO NEWS' \
-		gnome2_src_install scrollkeeper_localstate_dir="${ED%/}"/var/lib/scrollkeeper/
+	gnome2_src_install scrollkeeper_localstate_dir="${ED%/}"/var/lib/scrollkeeper/
 }
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 6f7dc9e75d31..dd4a17b1e30c 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 3a22eeea78e2..cd79be7f4ee9 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,10 +1,4 @@
-AUX alpine-2.22-cc.patch 537 BLAKE2B 0f916be9bf91d8f9c347c9325d20a13e8ffdc462f050d0e7adc0f90b8371844bc615182a178fac145d95dfbe425c20e211606558e56158e2dc3723875df96c44 SHA512 ba694fc876b2ca32b0ff068e6153768fd117c0f9ea26d1fffb35a1640cd38882667d58c7678300917c17a23076e2a4cb0111992b4e42d07b22c2e328d69713e0
-AUX alpine-2.22-fno-common.patch 677 BLAKE2B c03b54ff8db4e8a4868144c3b6214e75153bf88af78380bc5334a94cac4c2aaf9404a3b6ba9cfb4ac662af2f911211703c5383c37138dfe0acc71c965e08c395 SHA512 cb1513c374ced36adfec51267a61cdb38c38ea0d3d81812a1eebdaf973f2aaabf74f8fde58920c4044d0f389898966335cae2f54505a8314e0f917fbe2786cab
-DIST alpine-2.22-chappa.patch.gz 173232 BLAKE2B ac2cfc22119c9e60fdc053212447fb5df8cc59781c049329560d21e19e67d700fe45a07649352747583b500a605499eeb61dfd83ba150c3bd58f4033486e2581 SHA512 9db36ebb4fb2efaee975ed33d44cf95780c56075cbc0ad39056268248db38109e1bb04e279b40cdd085b3dfec89d0f9c69aa4ddf5a64b5708437909661288e23
-DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1
 DIST alpine-2.23-chappa.patch.gz 172604 BLAKE2B f814a269fe316dd42e73f98b09a67b26f8d0c5db9bc83ebcc6145f7f3373f14a5fa9f7991f60a4186c0f078428fa0a38bc81b0459998045ea433438f730f05a8 SHA512 5195db336651da161b3d94afeab8f46fd6bd3d1953db72b8f453355b46eafe8afe26eccb2466024f077fc3e40ff52e1a14a126ce3cc33fdcfcaeded67f9422d0
 DIST alpine-2.23.tar.xz 6330784 BLAKE2B e7be73dc0ccf04cfbd8712e70f8b114063983b971c1d967765b41ab0bf86369815d954e85fc4d9622539b1e3a6324ffda635a2808b9439a123302e7f9c9f421d SHA512 abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b
-EBUILD alpine-2.22-r1.ebuild 2309 BLAKE2B d294369cddf068bd2e7a01de85f2abeef467ff88db001fb6e1994975f422c16cf37fe07d659d156d9b7185035f9a131f58c85bae3e2b46a2dcdf02f0d5703654 SHA512 21d917188d5b94d01ca12bcabd65d41bd44e3b721a1081b1fadc69ff082d9f7fd32b8bf236b3074b824df22c39e2ec0b236d38c77173376f8871a2e2e5e323b2
-EBUILD alpine-2.22.ebuild 2060 BLAKE2B 5f58202d66033d9417c2d9eec597e2cef12c04c7d7953490fd680782d2a843afdea6791bbe2a2cb265ccff3934c55221f5495b7c656289874b64f6fd83fb78ce SHA512 6685cbdb825260de2da09d8a23c06be390235346aa93d411cdabe9741dff45c10399b4693baa3bd30355591de59b7dfc77e5e847924d5f24ae226645569d5301
 EBUILD alpine-2.23.ebuild 2227 BLAKE2B 0dc55e814c736e2381e1ccc05b3b67e5b7f1ed065d8b854569bc4ec8e5db4028cf427fe1e24aa6ec8d07b792790402ee3a946811f2722b79e1cc498aff356dfe SHA512 b1ab7041333db6b69b4378a4f4f76e6309f460a2507bad2d5b2b2e509b2df2f8dd56a9e4020687f3bb5614796e676ea94bc28b3b749e97d838451a995990554e
 MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
diff --git a/mail-client/alpine/alpine-2.22-r1.ebuild b/mail-client/alpine/alpine-2.22-r1.ebuild
deleted file mode 100644
index 9a57c1139c81..000000000000
--- a/mail-client/alpine/alpine-2.22-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-CHAPPA_PATCH_NAME="${P}-chappa.patch"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
-	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
-
-DEPEND=">=sys-libs/ncurses-5.1:0=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	spell? ( app-text/aspell )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cc.patch"
-	"${FILESDIR}/${P}-fno-common.patch"
-)
-
-src_prepare() {
-	default
-	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_configure() {
-	myconf=(
-		--without-tcl
-		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
-		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
-		$(use_with ldap)
-		$(use_with ssl)
-		$(use_with passfile passfile .pinepwd)
-		$(use_with kerberos krb5)
-		$(use_with threads pthread)
-		$(use_with spell interactive-spellcheck /usr/bin/aspell)
-		$(use_enable nls)
-		$(use_with ipv6)
-		$(use_with smime)
-	)
-
-	if use ssl; then
-		myconf+=(
-			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
-			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
-			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
-		)
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 AR=$(tc-getAR)
-}
-
-src_install() {
-	if use onlyalpine ; then
-		dobin alpine/alpine
-		doman doc/man1/alpine.1
-	else
-		emake -j1 DESTDIR="${D}" install
-		doman doc/man1/*.1
-	fi
-
-	dodoc NOTICE README*
-
-	if use doc ; then
-		dodoc doc/brochure.txt
-
-		dodoc -r doc/tech-notes/
-		newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
-		newdoc "${S}/doc/mime.types" mime.types.sample
-		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
-	fi
-}
diff --git a/mail-client/alpine/alpine-2.22.ebuild b/mail-client/alpine/alpine-2.22.ebuild
deleted file mode 100644
index 66f123bdd622..000000000000
--- a/mail-client/alpine/alpine-2.22.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86"
-IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
-
-DEPEND=">=sys-libs/ncurses-5.1:0=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	spell? ( app-text/aspell )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cc.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_configure() {
-	myconf=(
-		--without-tcl
-		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
-		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
-		$(use_with ldap)
-		$(use_with ssl)
-		$(use_with passfile passfile .pinepwd)
-		$(use_with kerberos krb5)
-		$(use_with threads pthread)
-		$(use_with spell interactive-spellcheck /usr/bin/aspell)
-		$(use_enable nls)
-		$(use_with ipv6)
-		$(use_with smime)
-	)
-
-	if use ssl; then
-		myconf+=(
-			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
-			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
-			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
-		)
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 AR=$(tc-getAR)
-}
-
-src_install() {
-	if use onlyalpine ; then
-		dobin alpine/alpine
-		doman doc/man1/alpine.1
-	else
-		emake -j1 DESTDIR="${D}" install
-		doman doc/man1/*.1
-	fi
-
-	dodoc NOTICE README*
-
-	if use doc ; then
-		dodoc doc/brochure.txt
-
-		dodoc -r doc/tech-notes/
-		newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
-		newdoc "${S}/doc/mime.types" mime.types.sample
-		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
-	fi
-}
diff --git a/mail-client/alpine/files/alpine-2.22-cc.patch b/mail-client/alpine/files/alpine-2.22-cc.patch
deleted file mode 100644
index 87132bdd6b51..000000000000
--- a/mail-client/alpine/files/alpine-2.22-cc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./imap/tools/Makefile	2020-04-19 23:45:13.080083548 +0200
-+++ ./imap/tools/Makefile	2020-04-19 23:45:24.525083844 +0200
-@@ -21,7 +21,6 @@
- #              Internet: MRC@CAC.Washington.EDU
- 
- 
--CC=cc
- RM=rm -f
-
-
---- ./imap/src/osdep/unix/Makefile	2020-04-19 23:54:55.454098598 +0200
-+++ ./imap/src/osdep/unix/Makefile	2020-04-19 23:54:55.454098598 +0200
-@@ -132,10 +132,8 @@
-
- # Commands possibly overridden by the individual port
-
--ARRC=ar rc
--CC=cc
-+ARRC=$(AR) rc
- LN=ln -s
--RANLIB=ranlib
-
-
- # Standard distribution build parameters
diff --git a/mail-client/alpine/files/alpine-2.22-fno-common.patch b/mail-client/alpine/files/alpine-2.22-fno-common.patch
deleted file mode 100644
index 0ef289eb8cdd..000000000000
--- a/mail-client/alpine/files/alpine-2.22-fno-common.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/pith/smkeys.c
-+++ b/pith/smkeys.c
-@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: smkeys.c 1266 2009-07-14 18:39:12Z hubert@u.washingt
- #include "../pith/util.h"
- #include "../pith/mailindx.h"
- #include "../pith/readfile.h"
-+#include "../pith/options.h"
- #include "smkeys.h"
- 
- #ifdef APPLEKEYCHAIN
-@@ -50,8 +51,6 @@ static int       mem_add_extra_cacerts(char *contents, X509_LOOKUP *lookup);
- int		 compare_certs_by_name(const void *data1, const void *data2);
- int		 password_policy_check(char *);
- 
--int  (*pith_smime_enter_password)(char *, char *, size_t);
--
- /* test if password passes a predetermined policy.
-  * return value: 0 - does not pass; 1 - it passes 
-  */
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 9d38ca125ed6..d93e7b7fe347 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -60,6 +60,59 @@ DIST thunderbird-52.9.1-uk.xpi 652854 BLAKE2B bc5557a1df83f9b8ca0671fb7c76fe3a11
 DIST thunderbird-52.9.1-vi.xpi 637163 BLAKE2B 95c18bab7d30dea4a8b2241290175c77a2b47e3b02346b734e728adadfa4656e4197ceb3328de4c5a12a076dcc7b4b412b0a32e3cdef41d888865e471b2601f2 SHA512 dec44726008af723e44146abb89754f9fd0684e3cce0f0db07c05d8a100a8a862e5f7ad028c0f7d3594965ec35251e7c357ac212fb78570463bd8c18174658c9
 DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9dc2008c80c1ebeaf4d125d5c804755509b9b67dda3423cc9b9a9af3d29b386bb621b231e426bdd89879e2e620f2106dea SHA512 db0c8a338df861a43563c70fd73768a5db730ce39e7a8400de44ccada3edac1f7e3736edee5cff439df76ff17f2b4838701e95fa739f5aa04463539516a86f0b
 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
+DIST thunderbird-68.10.0-ar.xpi 617169 BLAKE2B b1332b1a70a7cf85b608d1cd177c3c3b65bf5246684aebf1f348649043a44c7c5e7794fab8a01cb6ed3e6a7f4eb281c31b6c3c626a358e93a7584936c630e525 SHA512 b8abcf0aaa8488942d195c7507b1f7763381e312b001349fe5dd3ce083a58c7f75b3e03b3beefc5dff5e07fab2b975b2084516a3d3d011c60ddbaa274716b962
+DIST thunderbird-68.10.0-ast.xpi 551300 BLAKE2B 55815b205b5b667f09f534ac058ca3737ef4545c38d95b95c9277d5d3e1ff182bdd4659b0c04b5352316298fcb37ccdb19fb57cb1ed194095db15928afd360aa SHA512 925b82a654161a4d5c216079f9fd6a7d5b93a4652e878a1e19882f99cad94dbddf44855f8a0e10d27a289733cadc6d61f42e549d3a63508fd4a3b065f08b5a1d
+DIST thunderbird-68.10.0-be.xpi 646281 BLAKE2B 1fb7f596fb2b2f2c11910d3f6aadecb3b28c9e4fe5ca8a811a89725c8454cfd1a02dbb04b977700468d5c513416610b194ee19328545bc14fc641bd0ddb473dd SHA512 19b8ebb2dfcf984435d24dd0687b16342bb3a723be3a69f000094e0e31429a908dceafd89f197093d53370a7e36b83759c8ca89350c3c87f300f11017f384760
+DIST thunderbird-68.10.0-bg.xpi 646228 BLAKE2B b0cab8335eec58f21a13b6ae6970b07ac1070205eb5ee75e9491f59b8d42a5c486f56ef3b3105faae90835095660cf8963b43341de46e3fe8e269c1065ca0472 SHA512 c4a84579bb92ecd8f78bc8d831e7bfebd337ee847ffcb2d81ea9de33bc46cb9a7dd5695c0eb333382b39bcb98e709ddf6eb0ed06322478cd3a2e0d18861f96a7
+DIST thunderbird-68.10.0-br.xpi 574852 BLAKE2B aedcbc138090f132a375f92fc9fb18b4cc943b84bf4fd7b28ff95bd1c1c4ccb90200a0b5bac96a25ed725755aeda444f5f56e6a49e9fed67ccfd074f330b48da SHA512 f6f46e881d141c667d6cb357a16750f572e31cfcc99a5b150e2f7362166c45d20557c2b43e25dd49fc1ba6de4ede3988bb332fada86e81b22bbbcedd14a20698
+DIST thunderbird-68.10.0-ca.xpi 578440 BLAKE2B ba04528b022615f16bd54ba80d6af056747336f7a56b2ffb9cccc562732bb8ff0a64bd4e880608f0e13d65b617ce6e3c9353bc0f3e09011d3851bd2b19e6d29e SHA512 7c8be4a150cff5e4c14f0c1ab4a4ef0efc5a19a1e7bd12b273109a22188d7c76ce104775bea227fbb54f71383d59228e9f2a9ad873611b2e8f19b4616ebc9091
+DIST thunderbird-68.10.0-cs.xpi 603043 BLAKE2B 3711a76dbd12cf670633f16997ac4bbcb17e3c821c2ecd0ec7b0718932996f81dabac01783cc25be66272a55b7ef4c245ce98516554c5f2a959eadec74cb5261 SHA512 689ffc46ab11a57c8316ae8bfaf467324a148d9c6eee835a934d3e237da7bbc91a48ea191815ed925c8740ac6ed2ad481eb6bacc29f6a1bfb2e60a289afaa146
+DIST thunderbird-68.10.0-cy.xpi 589903 BLAKE2B afb83cb52d6d4c512a06a47d44669942dca1a58b516732324e77921698400008de16c3e272ad466af7c05b9d6e3a967637ff444d919064c9a1caaf2a0bf3aeae SHA512 ded712c24f988499914b138c2066e9e7e58cda0a19f9d6cbbf6b8ff859024fe63a1ec14fe44a8ca7de9eb6d220f48c724250c90d3fbc50cd83cd834083646a4a
+DIST thunderbird-68.10.0-da.xpi 588349 BLAKE2B c7b9e91cb8af39384dfc8b85d13b1edf38a8701bbe201cb441fe08ad12fdb51ec2a02e2216c901d42dd0ad3eef898dda6530e019042788d619346b127877cbc2 SHA512 f93c1852d1a6aa18328cd44da78fe899ec7ac268c588d2e90e16594751b11b92bd00b08cc2eee0d91fa7824b21df9215f1d478dedd6db14d81aeb688467dfbd7
+DIST thunderbird-68.10.0-de.xpi 597804 BLAKE2B 3d62acf68ae22ca623138c8c142f03c7b07fb23f84c47d03ff78f6d7ade2bfb210e1a503eb58b2f590257cbab6d37a4fba26762d0864e93325d724ae0619c683 SHA512 60deeac7e30001f4813a2c96bc0ee6218446434348c8ae5b2c9127b84b69264cadf05fe175be48a9ecb834c9fec8d5912af2d9b0e79a3191680ec94bf22d39ea
+DIST thunderbird-68.10.0-el.xpi 699224 BLAKE2B 7d59de168a25fcb0682a8360cdb0d7a6c7a1eea5266487fac49b65f081fc0201c635654a3cdbd53f8cadafa326a33b341d012cabe235a2c592a5d56eb6a067e3 SHA512 4b896054b7ef13d9641090cb9cfddd6bdb34977f5d99b6d6fcfc17e70923f1117b9c2b8444439892589e5333ddbbe08e5c24651d813741e520a87e8225223d86
+DIST thunderbird-68.10.0-en-GB.xpi 556404 BLAKE2B 246e8d643a7e26965718c17159edcc6b1408d68bb7c8962fe729a31d9e4dd7be62dbdeb99d3b5059b749b3a0d23fc7e4696fdf3238a34888f2efe8ebb316d3b4 SHA512 6d599bf5f98b9b0a0ac7de3288ce606f09b63b1c3b31204d666bc049a236dbf18a4dda052435910436be8ec49f3ecdfc4e10416a73c4af49aa70f5aa07fd647a
+DIST thunderbird-68.10.0-es-AR.xpi 596552 BLAKE2B 689f02a59b99eb2c27feae23226b9a99fa6501ff8e0443261262dbbba3a67dae12adcb5b3e1c5b33391a9e1d66c7a32f26c29d225bd46f573cf9835af74b3a9f SHA512 825e82494f817599520a6b5529b9c1d924e053cc96810549d5fd441fe7d817b16e154c718af02a025bf41faa1559e6e0f08c1bf59103ebe715ab0da080349e1d
+DIST thunderbird-68.10.0-es-ES.xpi 518352 BLAKE2B 7714b8baffc691ecbb7a38f26937c6d1a3e232726880f3c37c644b519d71eac579acb45c4a8aded36e142c0ef13d682faf03c88d872ae9419fd1cc5df7e427cb SHA512 4b3eb51d7b15765f631009853885d0b579252672750e0bded1b6c58ef1fb04b37a450796c20cfc4b93a483f26060ce38b0d2a4fc60cf9fd943921edbcbbc8515
+DIST thunderbird-68.10.0-et.xpi 573581 BLAKE2B 01a936e10b4337e1eb10cd070f9c8fcea134df19c7ce7f2dd739af2d12bc7a8cb6ed137c7a693c021ec21f14500a215b88cfb1b687c80ed21f8a4a6662ea6a48 SHA512 d0478b5f5a903497849ec347e4b0a4d73d9d8d30fe57419f1f7c25c5671487ab81f853126517a03a30cd20d6472d819d6ba7a832142afea4afe8b807ecea1b22
+DIST thunderbird-68.10.0-eu.xpi 579945 BLAKE2B 4f9c72fa3238287ef05d63c518880391365590d037315396c55a366cb54cb8c870693f42d83253cf52ec9f56698e5ba7756655fd99c3efbd4f8e920cd50db5a9 SHA512 83bdbe488d3661f292a02adcdda33baf496a1cb1ad91ea164dfcd0b04415a5936031de14030816374636584f9cf8d61eb7a4e595662bd5ad4c2ddec0f28a7929
+DIST thunderbird-68.10.0-fi.xpi 578419 BLAKE2B 66ac40bb132acbafd9ef07fc6815caa953d180feebc4498ff31f73b542a507a7937f2377b43d55a413c2640402eb8ffa87a5f3924cb4b3f4c536958fa3326cb1 SHA512 fd5c8dc9ef85e32dcf95b8354f1811e2403abbeb5a8158460805c55ad3099a3d9db8aa38e43cda7b7f7ec6a4b4b208b7ace8b78e7f566efdaffcc9a99fbd5aac
+DIST thunderbird-68.10.0-fr.xpi 607811 BLAKE2B 2d017557554ba62772c39770ddb1bb604db218e947d4b2de923e8b78975d3aae3244e7f25313eb250dd9e189e681cdee7b8cd8f4012d32f76a02d87faff6cacf SHA512 7064e5711e4d31ebea5e6b324150b1615888d5d41e5bbc78d1322824331aa423ecd473e731025179de24062228ff3ea124d25e508b2bd9be1b2b90986313c50f
+DIST thunderbird-68.10.0-fy-NL.xpi 594467 BLAKE2B 74443fa4b98874bcd909802612ea43505152c29e64e5d464ce4a0766a352bb84c76860321187c87289f8997e467c1a8f0b664e3d34160d30b19349bf8a19f2c5 SHA512 21e789f30ad206c58d37bee8654261d422f62ed64958619907d89235bcde20999104395107d9801ee8f509ec024d1ceb8501640489ceb5a739c4535f17bf5960
+DIST thunderbird-68.10.0-ga-IE.xpi 588710 BLAKE2B 7a7e890826c71c6cb33e6597918cf6da5dd4116789585884e8052dce2e94869b62626d8ca60b95dcad16cc69df1ba6d3b6edf29814643d1c66702d93a96676ab SHA512 acfab69ffc7a07422d64558449bb029bec11a965a0e056286eb10cd530ea46578215d9279d027410b3885980191485f89cc29b00676336bdb0ee76072580f562
+DIST thunderbird-68.10.0-gd.xpi 587110 BLAKE2B f41fe4dff3205b0264ff3c781530c1408d2775d25ec48cefc30448ddb9c93bd8ba003d8ac96fe463fdcb269b6202e7adacc80df71242c8406018061237919ec4 SHA512 408b5994cbfca255696e22214fe276dfb8f2a2882434264c2d73395f79a9ce60a9eb592f54079d041374caa9c4b073f6cd3900866555eb56d685e0712822bd9b
+DIST thunderbird-68.10.0-gl.xpi 568397 BLAKE2B 34556566d8ce9c531c4476e6f480119ccec8a051551e3ab919a014a8bba7a054d488d2925cc8f603a532ff2c84e1dc393a599ba6afa0e574dab57a72a0b1995e SHA512 d299f53c97d596e584d468856ad89d7f7072db7bb7ca7cb7ea6fc211c9642254d9c9f15492e2f15ce80fa9dd8435f7639d1a88e3030e542c13441530335eaab6
+DIST thunderbird-68.10.0-he.xpi 604787 BLAKE2B 4dd595b4b7f4532a97cc8a2b1395f459a17b556efb893198e191ad1c3bd5e77da280c7fdef703e8c425bfe89e1ba01272849afc6eb0f8c9515d054dd87bc311c SHA512 2b7ea590daeafacf151313d851db1e90a2e185d47608591c52d9e2a8493e4cac0376c5e6a571cc66edbda0b2b6f5c87f95fc5a78fb9b28dd255ab454bf88da6a
+DIST thunderbird-68.10.0-hr.xpi 583784 BLAKE2B 6247ac9d868e0486130e9bd8b310d2967e297c2ad706e6ca93f4804bcaccd28e42a9678a6702a3a44b14ac9a825299e0378c20d74c28314655a04ef53b16ae80 SHA512 d47862d5b96fb75ae0ad209cabcb18012c17318e84d4884912b7abb577a4848a416adb3c8059caa4a8d1029c090f06ff9bfb3ae31c1567ee8ae7fb91a456f451
+DIST thunderbird-68.10.0-hsb.xpi 616036 BLAKE2B e7ee5b96f300a78324f4bcb222c6f374f57a56c38941d838154a3fae2a9f73e2f5a903d743fb82e8d29be292165aa2761af637f481885bc29ac2f4961499a82b SHA512 42d1916a3a9f0b8e3aa0cff7a6981453bd8838eee82aefe4c06b87e1856cba6cfdf854c8dfc55cdcd318d59a0f36aee34576d5813e1eb8bdbaa1cf0fbec21d58
+DIST thunderbird-68.10.0-hu.xpi 618155 BLAKE2B 1d4518cf154485134cd3c93cb373a62e3be3c73438e4101474a386228551fa1ac04ee42cbee9d0989688c0d11af53d29aaf1ce5c089f361e0d7affd2281368b9 SHA512 299bc88262c376afaaeef2951bd988ea2ea8781fe7d0d52ea6f20d1eca6961fe1176ceb610920f43163c1b2a84081709e2823760b2316899fc7bf5d5a01d1b34
+DIST thunderbird-68.10.0-hy-AM.xpi 631980 BLAKE2B f7af34f6285ead2ff32f4d5a82be7362d91105bcc0fc22672fc0c0dc73f14b11c668010bd5608a25d9deb38537ac1e96d9be2bfbdf05ddd64c567bc266a72be3 SHA512 5e162506deef63859e99b21ec6b61fc582d02c1507132e3b4814c993f28514a0e2da8f353125b909dceaeab0c84426419e1335f717883455dfcbdf358185f93e
+DIST thunderbird-68.10.0-id.xpi 567748 BLAKE2B 1ecf4f966f6168522d088584306622a41319dcf3985e98445e230bd2d4f2f0f70282862e538957eba9ae322d12f4a1577bc5cbd28f346a177c42ec3916a5e306 SHA512 8a48834440339489226e353756cb35cfcd48ac6c38c2b8b435a7dd3f0346e9f1eaee150f764e5f36677e1355f128783869a5a59d5752552a40e93069adb0efd6
+DIST thunderbird-68.10.0-is.xpi 575441 BLAKE2B b179486cdc161da29039f5d90e23be4f93ceea712c1c56f81c5c1fe772675361d4ad1f1ad699f954319e2974e2ece1884ad5d8d46f499001c03b6218505401d2 SHA512 53de9cb92b65148881e5bb5b8dfa793faef5c27f93fe409a75e515e2b821c8b786d795f16739db9247570fa8a2d04b59be6c9ba47a2b887f11e5b69ae3514ec8
+DIST thunderbird-68.10.0-it.xpi 489521 BLAKE2B 0cefff88fa458991b66a4f2265153bcc51863ef6fe9f925c61e57f8868bfee11e8b22e323c71eb6ff72fe7fa277a908cdf755ed24b02f0ac09bc87977af920ad SHA512 603b54f0c159b9285b533f18aa6210aae43098df01362a18650665fa700cac9903f02fa93d27b37fedad56916d1506f5e45779a9c98bf43c685c8279f95cdf7f
+DIST thunderbird-68.10.0-ja.xpi 643576 BLAKE2B 7c3eed63c5d7560653581f979421b5a2394d0a0b9649565d876cba681036d7a1dd2484f04c9ac833d0569a131d64731a2b735676f83eee4c52c310a4d299f824 SHA512 0a003a7d27c239bac77e7d655aa7c9bbc8c7a45f2d6e134943a119af44ddac9bdd460907fd24f1c28058d652c7a956b2725adb4493c988ad43d5c8f90db18ff7
+DIST thunderbird-68.10.0-ko.xpi 620531 BLAKE2B bd129c82361909d3126ed3bd82be573ae00d96621d9dbf906b51487b7fec772f9061697bba37c11051a87aed6d6c231804df40a1b07875f9009512ef7f799f32 SHA512 de1bda440eaec76acc499a191091208537734f5e8b47f03743fd5a07e0a693d3a0d48530b1dd17b78bab782abc09b1c7c1754fc86d8071366d1db9ac46dc6718
+DIST thunderbird-68.10.0-lt.xpi 603847 BLAKE2B 61b1c46e0a7c87136dfe2f1ad218ade7eca3b59e67983b5fda45c869c525814c7cc776c3e916aad1cff7fa03412636761a4903fc21bd7d412fd4f541366f91b1 SHA512 7e4769f450e24e3d726f1752d528777f123aca5c8e084984859593ea3406f7315c2abdbb08ed6ccb39fcfe1913458c0fbf196732620312becade2939ecc41ec6
+DIST thunderbird-68.10.0-nb-NO.xpi 574022 BLAKE2B 65ae9c0f22790b870efa962d2d8999cd081f19156545d13a55a56e2b0d110a72bb03e383014c883f764864ec6119181945f35ac81ee7b246ef24ed97a9a211da SHA512 273ea6d6dbc9039039434d12ccd706e35cc00afded74dbf01a2c03e152ec45ba3760f41c53ce5ff080ec2ec3dd94bd149b98a2a9ccd265070f1cf436222f9bde
+DIST thunderbird-68.10.0-nl.xpi 581355 BLAKE2B 5517ae271d03e93c0218813d1608dac506e07a19c03bbb2174b6c82ba2c3db147e42674820abee8a5ec95d5367ee93f992f11f9f5f636637eaf44a478a20dff8 SHA512 27afe9f1e11bba8eb9a878a51fd2056ae19eec8a776e901fd843b8fd3b709adf86a8d540cb63fc52e4397b6657c360fa910cead8d2c6c16ad6d6144416fcbf0a
+DIST thunderbird-68.10.0-nn-NO.xpi 574950 BLAKE2B f46b7ce1571bd6d47c80caa1b7ca235538947d6f8473120de96862c64fcd490c723b8805403bca5fe32bfaf727cd9a26ad72bd9ef8fc55c27608a36211c69c3e SHA512 a51913263295595e960784581853a3d534a99c58b22b1e3f79970288a5da9a2e171db96d78083c8a24e642429b17f1fbd90842ddcd6af54fcdbae14de9e5f094
+DIST thunderbird-68.10.0-pl.xpi 576085 BLAKE2B 8691fda0fe103ce7b67553df59f8bd49eae6c50d649623645f0aa6bd74779335526d99d6092a440763a4a390050e55f327e73089068d3e650d3b39a016a97a84 SHA512 d1e56d36a0c168d75a99ca510f779c1a2383c34114bf61216bf47ff4108839650f7971f385ac47d083f170d8427446a59230e0507079a7064059811c56dd25ff
+DIST thunderbird-68.10.0-pt-BR.xpi 589837 BLAKE2B e6ccdf48c6ffb3d0cc12134e2ae2261810a2bda16010ff12cc542a4ca8d27ff3e6fee714abfaed9e4556ee05100c4b31b1b05bdb1ef2cc28e8698e88b6a9f9c1 SHA512 c68d184ade620a9dd68f716690119890eadf53d46a0371c342240c34bbafa8f73600665ecc03216acba2ee62b3f350e52ea60f5bdbc36fb0e8d60d242e994e93
+DIST thunderbird-68.10.0-pt-PT.xpi 588103 BLAKE2B 2233df17fc588256bbc34c4ec1d8640980192fc6904d1c7a8ff93da62211a16bb3abde27150ec4ec874883682a2642f1868be5cc814798415d1d7bb77ed0bdae SHA512 0cd0a8553382a6ff1b14b5e4e2ed6846d5a479897f788d665997b7628da939c2f90528b5245792350214c85e0a1e4ce68a3972ff0c3ee147a446243ea4781f98
+DIST thunderbird-68.10.0-rm.xpi 578050 BLAKE2B abe8c3d1316bc82e616d7cb418b0eb8716ca2469b9ec3dc58061f05972d39649ffb523b9db3cbe3153e8b7e57cfa532190cbdd72ba6f7d7fc41d6e3cad3c0705 SHA512 7a6129772582b294f6c44ea5db770ce3cbbf29b19e7f3bcdcfea343d699de545adae606afe6f0e30466323efefb8cba6fd347ca83af3629e5b8f51c253feca4e
+DIST thunderbird-68.10.0-ro.xpi 594840 BLAKE2B 9409ab855ce8412d3b16963e63c8c930e6b4b63906ad9845b4a917211a4a0c6450bc9232af67fddd26f7c359327556b16e9ebc5def1b7f581bc305ca63d487e5 SHA512 94cacac40830e2e8bbcfc2a805205ab83599771ca49dcc12c99b4c5424f2b6ed5f85f89fdddaeee8a33d31628bf7858464ba06983d68969bb1a7179bd0567571
+DIST thunderbird-68.10.0-ru.xpi 683325 BLAKE2B 826843432dea393de956db9def15f99718ea0ce2ec6ee4ce59a18d733f2d12e2334b6989867f68ce49cf1a178a96a41989e3a5547b5ec5f7361443fba7b20117 SHA512 046fc111057100a3bf34f25e7ab9bf8bfac0335e2d1d1ad210307083f9d2ba0caf37d95e2b61751e87d1b61b95fa07538ea80dd0d6d57684dd0840edd907ff1a
+DIST thunderbird-68.10.0-si.xpi 637405 BLAKE2B 61e6ea21e665dfb797bf6b86baa186f3fd0ed9b69cac2c1521a3e956dd87bc2ab1bc6c523bbb42cfdca485cb05fcaabc85b3e0140c78ec9d2a3e7d39eedbe706 SHA512 236654ab095f7e967911c7ef385e0c133151569f21ab4ff9c8f87815f2e745be6f0f2ef2bc6955af81a613b72b5e9fdfb78598de269443d31953916a0573c8d0
+DIST thunderbird-68.10.0-sk.xpi 609753 BLAKE2B 02496c0f38d3e6da751b5fdef1e231c4537f09af46cf643523e426a9bd7b1a4fa033acd9c2eee1b1b6b2c092606aae41ff062d6510dd4e925b565f8395d44e26 SHA512 8ddd8fb1203be4d2298c9d364cf95a6e51a504530608e3add552cd6480d9901a67f42e299b691cd89f269f57d6000b02b0b2a614d3618f8126d5ba848c2fdfd7
+DIST thunderbird-68.10.0-sl.xpi 590628 BLAKE2B 56acd47de4d31be5ceb61bae54c8685b8961d9a1e35538f1b5725cb3aca044a98319603493500471036bf6f409f456bfa10d29dd4d58abdc6a1d71554694df5c SHA512 34115bf279c3f1798a654583900b0314f4ba7f95ae09a53fec8deda88deda6cc2d9a751fc20304867fc92b322b3f05aaeb693602280c6cee8195f898992a36de
+DIST thunderbird-68.10.0-sq.xpi 598900 BLAKE2B 29a0be425c4b7eb2f09fbae3bfc48685dbcdd029b0e02417c062ad026481cbbd4136e7465938c96266668bc328dc48ce2c3d07cf394bca9cb5f35c21721fcd80 SHA512 730dcef2ed44ea0d2fbe646ba3fcb4606bd4d3532db003be6e60259bf9eccfee55dc69c4ba129b28129c2a7754b934f05304dece9e3af93e5b23d5044655a9c0
+DIST thunderbird-68.10.0-sr.xpi 624898 BLAKE2B a1bbd931e9cf86b706b2b813a2afcf73f82386cc86532abff0e99d09d217a2bf1124449cc7d002a97e1e29e05fc17568bf1b576a527ffb6d60ba8cbbfa49de25 SHA512 a120b5b2ea707a995827c818e7053c1e5aa8bd45b3c0d07d3c86ecea8645b810d83a9a880a3de30b3777b2924b75b76b46ed1c4d6494a5e678a63f6787bce29a
+DIST thunderbird-68.10.0-sv-SE.xpi 591596 BLAKE2B e0abf0f697f5104c1633cc7f3542c25d1f591e2a23154a7955fe467b4c74e506772a42be1ab100a43c7038550d1bb0d75c36416518389e4c6c1a7a74bd771d7d SHA512 4ba07b204e007caf1f8d971de90c8ae380bcf368b1f4c463b7059b0a971ddebf2817e0b7ba91763c9dc11d841517a6ed1b09725f932123237010eb30c1b81b58
+DIST thunderbird-68.10.0-tr.xpi 599707 BLAKE2B fad6027cd7c915d8fbbf1fc4d3cadd02d38156667a170f3e74b6013e68251b5fd1703c001afd6a6cdd3f2bdc38153a6eeba96cd3c1c8693ba9a1a9a4d18be6dc SHA512 e178e3368b3ecc3baafb2928e5f466b4a1078796e4d72ea6b3a28d40eb26070b92c0d6fd07c29d9f03a94dc6278eb3c619228b4116a61ad0dea84d017d39cde3
+DIST thunderbird-68.10.0-uk.xpi 671455 BLAKE2B 7249c39a0d75951fc74f0b6a7b7253243a2d7bf6c5ac8568b964b5de3179596b316bd11870b3d0d8686c009552f64e4271027e8012b349c21d99a203db859c85 SHA512 0b704c62579c0f5b3bcb7bebf43257b904f8048497359b1ed37b046fd7d729abe4b3142c50ce23ceb12d69513b40bb14d4b1b85bf3310a9c0fbd656264a30bfe
+DIST thunderbird-68.10.0-vi.xpi 623422 BLAKE2B 8e2557b66c51d6d98c516e58337334f41e77af631f7ae5f6f5636e2936fa19ab584a3843bfd72169b9c13e417b74efe5527b4ede61d365251807a1f9014b0ef5 SHA512 951536c862292476592a4518c812650294f7ad04ccd52a70c311a8793c4610bff22490454d46852a87733d8035d7783389135b11cc64569ad90659f3bb02adaf
+DIST thunderbird-68.10.0-zh-CN.xpi 626820 BLAKE2B 38b6ab9fd731e6edf6b32b77663adf64194117b1a1248881aa3209b631df0a60c90ae742e6bc907a16457df479397af720f94bceaf1095fcf47b6c33eb3362da SHA512 6b5ffbcc6d453573bd8f84ff2c61680e222c354e9b96425349c5de97503acd38c003abd76f748ee36b47fe8627bd232b6489ee6a5f4a9dce2c66c3a87870415e
+DIST thunderbird-68.10.0-zh-TW.xpi 627475 BLAKE2B 9b075bb3ccbd8ed565e27d0ad5364c6def3ffbb9391c766446694fbc37c70bc592688e28288f6739551899ca39385980092e7b97d7404ec74d75f76b7a21a07a SHA512 da25ba5f50510cf3d1e7fc5a5bc3ab825a275702de50c1dd1c517e9f0f45006570b2f8fc0ad7bdbd0613c8e54f7f31bc06c39f9a9b84e5b16a50db6e91b7cf0c
 DIST thunderbird-68.9.0-ar.xpi 617168 BLAKE2B 5e51afcba2c207b8951a1f956266ba8510821873e44b213a3a55a98e92495bd4ed3dc56bbb998c8b36d365fdfc86f4cc03c0e4e7edef867f211d355e69f6b495 SHA512 638c99cee69cad7d4fa1ced99b989d751529c03f2c36da8ab76201d75da9deb2005a3f4bd9be3bc7434ece4f6217928388cc1bd34913f422b3832392100a2875
 DIST thunderbird-68.9.0-ast.xpi 551299 BLAKE2B 6af53cf93c9c98a088fc7c88ab3e26d0b336b85bd96bdc30ff2417561936b9db2d94b5eaaa805549568244b74fb6efc628f2e0025b3365616a179cddc451e4cd SHA512 fefedb7262e4abedce010fbdba8a2cddb13ebe42db11914262c9e004d14b9e867e105fbb6236406fdd9fefa9a97eec35a7532e814943c22860dc720fc97b9b28
 DIST thunderbird-68.9.0-be.xpi 646281 BLAKE2B f4f674ebd8633a25761e0635d2776b85d4931856053cefd68102601e906bb4d52e49bdb2b786f9865c04cf613d06e8f11cbcdc9ff7aaf047ee491197dbf0a448 SHA512 677e71470d1117654ca36071afb3cf86c1fc5bd2b567b8740550c47e61418904a526c075adfe2b14b67db6e103d1a2001af4ee61722ff1d82681463bf1b31ffa
@@ -114,9 +167,12 @@ DIST thunderbird-68.9.0-vi.xpi 623422 BLAKE2B b2588964944fb7c52ca8cf7562d5a6d903
 DIST thunderbird-68.9.0-zh-CN.xpi 626819 BLAKE2B 6c5ef075b5e984aaf2d78d445f600ddd7ae911dbfc29d5acf21ffdd46c3bb0979fde7461f504bc0a73cffe09efd724d01803720ac4433015b33d67f1e366a521 SHA512 b1dadea97f266314eec66b9f9ca4fc8df51750e5f0ce0cf26dbba9a2da84abdbd41d8a0ed11f546bd157f865fe120626f0d257ee43c44ebd3d9b0139bb56a66d
 DIST thunderbird-68.9.0-zh-TW.xpi 627475 BLAKE2B 1f7382cab6f95ea5e2d734653163f04bb1095681e354ab9cb42dd65b42a0b1b6a44cd3b6794e83a1e1d4b47af1ab579f85e0aa167403b4732f1f10d4b127e8a0 SHA512 4548b0d3e49aabb36466d97590bdced672611dc3a95aea15f451a58e81cf6c3738aad46b56f9f538c244ec50ba1a6cca8be4af5fe937eecda5883b7378b10cec
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
+DIST thunderbird-bin_i686-68.10.0.tar.bz2 58027039 BLAKE2B 7aeeaefa96fd6428b73c3002e34dc6cfc34ad3b8196e0a34e04a1f5ce885555fba4eed52e688a786479f31463b1b2d228098bd2fff0edd10f49e467c74cf98d9 SHA512 9280a58b42f93b38f4c9ab26b8b6c2956ccb135ae959c61799cd3ce3b3419c9642f86418ac53e9c4f69e0430508c0619db4cf856a28d233a8d319e262755f4a4
 DIST thunderbird-bin_i686-68.9.0.tar.bz2 58227222 BLAKE2B 5fb651d115557eb7488e416aa3aafec6762b645a886ca93c03a65bbe6f6e232eac7911c0cb58d39d219e78b586526a808a38df9669ba0f5768ce1e03a63d3709 SHA512 a8fcf918c869e8064c2dd39a03bb768616b1a5e4e1c6121aa544d72626bfb790625e2cc48dc973443b947c6e619f9481cb20239d544b10bdf287b7fa4e05128c
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
+DIST thunderbird-bin_x86_64-68.10.0.tar.bz2 55727523 BLAKE2B 03455e622afb02c9ee7aec60e5b869adaed087045e298f82d22be57dda10746f22c24f0136c1bfc718bd96690878ddeb6625df92eeb86d2cd3fd17b157f58cb4 SHA512 3f7d4c844185b0be0ee3354130112ecc034f06cc2335681998e210b79537df7365f251b005387f319b0a2d2dd6a6337fd6287a007fd54ac03c39315c42893dfe
 DIST thunderbird-bin_x86_64-68.9.0.tar.bz2 55740405 BLAKE2B 3659bbc2d5e2b0d5ac6a4b8a55dda974027d18c1d24d8fc875a917d8df153819e28b507abd6c4f71872bcc1032dd2202f067f9e34115edddeed2d2c0579f98c0 SHA512 ed6caacf356c6487a489e983275a2c3d00eac3b2282445667a1f26ac9ce217afb8261a929ccc9aa2bdf7a89101a86faee2ef87c16f0677ecf5abcc727397275f
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
+EBUILD thunderbird-bin-68.10.0.ebuild 5278 BLAKE2B dc066614db0691d184628b78941fabad41245bf74b15ff5db3bd9efddfc43ee321fc2e3f76fe508119d0bfa0de9baee9a7a5850273cf2b5b0de484517e75e290 SHA512 94fbb50d6ec8b348c883ed8b3ada3530d20a19d2540bc9f06a5f9cc088bd31370ed28d45080d3da629ea91ae562518ef2c4a27ec3fdbc8c86c1ad08310c3a746
 EBUILD thunderbird-bin-68.9.0.ebuild 5278 BLAKE2B dc066614db0691d184628b78941fabad41245bf74b15ff5db3bd9efddfc43ee321fc2e3f76fe508119d0bfa0de9baee9a7a5850273cf2b5b0de484517e75e290 SHA512 94fbb50d6ec8b348c883ed8b3ada3530d20a19d2540bc9f06a5f9cc088bd31370ed28d45080d3da629ea91ae562518ef2c4a27ec3fdbc8c86c1ad08310c3a746
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.10.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.10.0.ebuild
new file mode 100644
index 000000000000..4fdf8bc9f318
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-68.10.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="68.0b6"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~juippis/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip
+	app-arch/zip"
+
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/pingsender
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_prepare() {
+	default
+
+	# Lightning
+	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	local emxpi="${S}/distribution/extensions/${emid}.xpi"
+	if [[ ! -f "${emxpi}" ]]; then
+		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
+	else
+		ebegin "Add localization to Lightning ..."
+		# hide warning regarding extra bytes at beginning or within zipfile
+		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
+		rm -f "${emxpi}" || die
+
+		# Install language packs for calendar
+		mozlinguas_xpistage_langpacks \
+			"${WORKDIR}/${emid}" \
+			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+		# roll a .xpi that mimicks what upstream would roll
+		pushd "${WORKDIR}/${emid}" &>/dev/null || die
+		zip -9 -q -r "${emxpi}" * || die
+		popd &>/dev/null || die
+		eend 0
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 128"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	newbin - thunderbird-bin <<- _EOF_
+		#!/bin/sh
+		unset LD_PRELOAD
+		LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+		exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+	_EOF_
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b0172b77f937..a5652a78de35 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -67,6 +67,67 @@ DIST thunderbird-52.9.1-vi.xpi 637163 BLAKE2B 95c18bab7d30dea4a8b2241290175c77a2
 DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9dc2008c80c1ebeaf4d125d5c804755509b9b67dda3423cc9b9a9af3d29b386bb621b231e426bdd89879e2e620f2106dea SHA512 db0c8a338df861a43563c70fd73768a5db730ce39e7a8400de44ccada3edac1f7e3736edee5cff439df76ff17f2b4838701e95fa739f5aa04463539516a86f0b
 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
+DIST thunderbird-68.10.0-ar.xpi 617169 BLAKE2B b1332b1a70a7cf85b608d1cd177c3c3b65bf5246684aebf1f348649043a44c7c5e7794fab8a01cb6ed3e6a7f4eb281c31b6c3c626a358e93a7584936c630e525 SHA512 b8abcf0aaa8488942d195c7507b1f7763381e312b001349fe5dd3ce083a58c7f75b3e03b3beefc5dff5e07fab2b975b2084516a3d3d011c60ddbaa274716b962
+DIST thunderbird-68.10.0-ast.xpi 551300 BLAKE2B 55815b205b5b667f09f534ac058ca3737ef4545c38d95b95c9277d5d3e1ff182bdd4659b0c04b5352316298fcb37ccdb19fb57cb1ed194095db15928afd360aa SHA512 925b82a654161a4d5c216079f9fd6a7d5b93a4652e878a1e19882f99cad94dbddf44855f8a0e10d27a289733cadc6d61f42e549d3a63508fd4a3b065f08b5a1d
+DIST thunderbird-68.10.0-be.xpi 646281 BLAKE2B 1fb7f596fb2b2f2c11910d3f6aadecb3b28c9e4fe5ca8a811a89725c8454cfd1a02dbb04b977700468d5c513416610b194ee19328545bc14fc641bd0ddb473dd SHA512 19b8ebb2dfcf984435d24dd0687b16342bb3a723be3a69f000094e0e31429a908dceafd89f197093d53370a7e36b83759c8ca89350c3c87f300f11017f384760
+DIST thunderbird-68.10.0-bg.xpi 646228 BLAKE2B b0cab8335eec58f21a13b6ae6970b07ac1070205eb5ee75e9491f59b8d42a5c486f56ef3b3105faae90835095660cf8963b43341de46e3fe8e269c1065ca0472 SHA512 c4a84579bb92ecd8f78bc8d831e7bfebd337ee847ffcb2d81ea9de33bc46cb9a7dd5695c0eb333382b39bcb98e709ddf6eb0ed06322478cd3a2e0d18861f96a7
+DIST thunderbird-68.10.0-br.xpi 574852 BLAKE2B aedcbc138090f132a375f92fc9fb18b4cc943b84bf4fd7b28ff95bd1c1c4ccb90200a0b5bac96a25ed725755aeda444f5f56e6a49e9fed67ccfd074f330b48da SHA512 f6f46e881d141c667d6cb357a16750f572e31cfcc99a5b150e2f7362166c45d20557c2b43e25dd49fc1ba6de4ede3988bb332fada86e81b22bbbcedd14a20698
+DIST thunderbird-68.10.0-ca.xpi 578440 BLAKE2B ba04528b022615f16bd54ba80d6af056747336f7a56b2ffb9cccc562732bb8ff0a64bd4e880608f0e13d65b617ce6e3c9353bc0f3e09011d3851bd2b19e6d29e SHA512 7c8be4a150cff5e4c14f0c1ab4a4ef0efc5a19a1e7bd12b273109a22188d7c76ce104775bea227fbb54f71383d59228e9f2a9ad873611b2e8f19b4616ebc9091
+DIST thunderbird-68.10.0-cak.xpi 602711 BLAKE2B 14688fb76b173b068fd8a96106d396c49fc94577d138e4781c5d5bce076f796a509ba0aa63d9b07ced63afd8c898b514bb95af9c0f647f81b157febf7fcf199f SHA512 bb5a35677b9d2945c803d7ea3681b720eb7d371c8d33d8988ebbd403d69cf27b43f5f051ac827441c6ce7a980f90740bd75780f915af8eecad7b7e5274693fba
+DIST thunderbird-68.10.0-cs.xpi 603043 BLAKE2B 3711a76dbd12cf670633f16997ac4bbcb17e3c821c2ecd0ec7b0718932996f81dabac01783cc25be66272a55b7ef4c245ce98516554c5f2a959eadec74cb5261 SHA512 689ffc46ab11a57c8316ae8bfaf467324a148d9c6eee835a934d3e237da7bbc91a48ea191815ed925c8740ac6ed2ad481eb6bacc29f6a1bfb2e60a289afaa146
+DIST thunderbird-68.10.0-cy.xpi 589903 BLAKE2B afb83cb52d6d4c512a06a47d44669942dca1a58b516732324e77921698400008de16c3e272ad466af7c05b9d6e3a967637ff444d919064c9a1caaf2a0bf3aeae SHA512 ded712c24f988499914b138c2066e9e7e58cda0a19f9d6cbbf6b8ff859024fe63a1ec14fe44a8ca7de9eb6d220f48c724250c90d3fbc50cd83cd834083646a4a
+DIST thunderbird-68.10.0-da.xpi 588349 BLAKE2B c7b9e91cb8af39384dfc8b85d13b1edf38a8701bbe201cb441fe08ad12fdb51ec2a02e2216c901d42dd0ad3eef898dda6530e019042788d619346b127877cbc2 SHA512 f93c1852d1a6aa18328cd44da78fe899ec7ac268c588d2e90e16594751b11b92bd00b08cc2eee0d91fa7824b21df9215f1d478dedd6db14d81aeb688467dfbd7
+DIST thunderbird-68.10.0-de.xpi 597804 BLAKE2B 3d62acf68ae22ca623138c8c142f03c7b07fb23f84c47d03ff78f6d7ade2bfb210e1a503eb58b2f590257cbab6d37a4fba26762d0864e93325d724ae0619c683 SHA512 60deeac7e30001f4813a2c96bc0ee6218446434348c8ae5b2c9127b84b69264cadf05fe175be48a9ecb834c9fec8d5912af2d9b0e79a3191680ec94bf22d39ea
+DIST thunderbird-68.10.0-dsb.xpi 618835 BLAKE2B 514f8fb7089fea81f80211f1f08569cafe71a521664f31e27f986173d9f9b1026e0512853a7fa255d8897b029612a0a2d8c4b3b260025c3247c587f0031c0382 SHA512 1acdefeecf54e69151e823830fb7b4230eec42bf659ee302f1b8a19b8469fc8d5241c6aaa2e08ec17df91ba862f014e3fc46b6211c92878aca37f82c8a4c57d6
+DIST thunderbird-68.10.0-el.xpi 699224 BLAKE2B 7d59de168a25fcb0682a8360cdb0d7a6c7a1eea5266487fac49b65f081fc0201c635654a3cdbd53f8cadafa326a33b341d012cabe235a2c592a5d56eb6a067e3 SHA512 4b896054b7ef13d9641090cb9cfddd6bdb34977f5d99b6d6fcfc17e70923f1117b9c2b8444439892589e5333ddbbe08e5c24651d813741e520a87e8225223d86
+DIST thunderbird-68.10.0-en-GB.xpi 556404 BLAKE2B 246e8d643a7e26965718c17159edcc6b1408d68bb7c8962fe729a31d9e4dd7be62dbdeb99d3b5059b749b3a0d23fc7e4696fdf3238a34888f2efe8ebb316d3b4 SHA512 6d599bf5f98b9b0a0ac7de3288ce606f09b63b1c3b31204d666bc049a236dbf18a4dda052435910436be8ec49f3ecdfc4e10416a73c4af49aa70f5aa07fd647a
+DIST thunderbird-68.10.0-es-AR.xpi 596552 BLAKE2B 689f02a59b99eb2c27feae23226b9a99fa6501ff8e0443261262dbbba3a67dae12adcb5b3e1c5b33391a9e1d66c7a32f26c29d225bd46f573cf9835af74b3a9f SHA512 825e82494f817599520a6b5529b9c1d924e053cc96810549d5fd441fe7d817b16e154c718af02a025bf41faa1559e6e0f08c1bf59103ebe715ab0da080349e1d
+DIST thunderbird-68.10.0-es-ES.xpi 518352 BLAKE2B 7714b8baffc691ecbb7a38f26937c6d1a3e232726880f3c37c644b519d71eac579acb45c4a8aded36e142c0ef13d682faf03c88d872ae9419fd1cc5df7e427cb SHA512 4b3eb51d7b15765f631009853885d0b579252672750e0bded1b6c58ef1fb04b37a450796c20cfc4b93a483f26060ce38b0d2a4fc60cf9fd943921edbcbbc8515
+DIST thunderbird-68.10.0-et.xpi 573581 BLAKE2B 01a936e10b4337e1eb10cd070f9c8fcea134df19c7ce7f2dd739af2d12bc7a8cb6ed137c7a693c021ec21f14500a215b88cfb1b687c80ed21f8a4a6662ea6a48 SHA512 d0478b5f5a903497849ec347e4b0a4d73d9d8d30fe57419f1f7c25c5671487ab81f853126517a03a30cd20d6472d819d6ba7a832142afea4afe8b807ecea1b22
+DIST thunderbird-68.10.0-eu.xpi 579945 BLAKE2B 4f9c72fa3238287ef05d63c518880391365590d037315396c55a366cb54cb8c870693f42d83253cf52ec9f56698e5ba7756655fd99c3efbd4f8e920cd50db5a9 SHA512 83bdbe488d3661f292a02adcdda33baf496a1cb1ad91ea164dfcd0b04415a5936031de14030816374636584f9cf8d61eb7a4e595662bd5ad4c2ddec0f28a7929
+DIST thunderbird-68.10.0-fi.xpi 578419 BLAKE2B 66ac40bb132acbafd9ef07fc6815caa953d180feebc4498ff31f73b542a507a7937f2377b43d55a413c2640402eb8ffa87a5f3924cb4b3f4c536958fa3326cb1 SHA512 fd5c8dc9ef85e32dcf95b8354f1811e2403abbeb5a8158460805c55ad3099a3d9db8aa38e43cda7b7f7ec6a4b4b208b7ace8b78e7f566efdaffcc9a99fbd5aac
+DIST thunderbird-68.10.0-fr.xpi 607811 BLAKE2B 2d017557554ba62772c39770ddb1bb604db218e947d4b2de923e8b78975d3aae3244e7f25313eb250dd9e189e681cdee7b8cd8f4012d32f76a02d87faff6cacf SHA512 7064e5711e4d31ebea5e6b324150b1615888d5d41e5bbc78d1322824331aa423ecd473e731025179de24062228ff3ea124d25e508b2bd9be1b2b90986313c50f
+DIST thunderbird-68.10.0-fy-NL.xpi 594467 BLAKE2B 74443fa4b98874bcd909802612ea43505152c29e64e5d464ce4a0766a352bb84c76860321187c87289f8997e467c1a8f0b664e3d34160d30b19349bf8a19f2c5 SHA512 21e789f30ad206c58d37bee8654261d422f62ed64958619907d89235bcde20999104395107d9801ee8f509ec024d1ceb8501640489ceb5a739c4535f17bf5960
+DIST thunderbird-68.10.0-ga-IE.xpi 588710 BLAKE2B 7a7e890826c71c6cb33e6597918cf6da5dd4116789585884e8052dce2e94869b62626d8ca60b95dcad16cc69df1ba6d3b6edf29814643d1c66702d93a96676ab SHA512 acfab69ffc7a07422d64558449bb029bec11a965a0e056286eb10cd530ea46578215d9279d027410b3885980191485f89cc29b00676336bdb0ee76072580f562
+DIST thunderbird-68.10.0-gd.xpi 587110 BLAKE2B f41fe4dff3205b0264ff3c781530c1408d2775d25ec48cefc30448ddb9c93bd8ba003d8ac96fe463fdcb269b6202e7adacc80df71242c8406018061237919ec4 SHA512 408b5994cbfca255696e22214fe276dfb8f2a2882434264c2d73395f79a9ce60a9eb592f54079d041374caa9c4b073f6cd3900866555eb56d685e0712822bd9b
+DIST thunderbird-68.10.0-gl.xpi 568397 BLAKE2B 34556566d8ce9c531c4476e6f480119ccec8a051551e3ab919a014a8bba7a054d488d2925cc8f603a532ff2c84e1dc393a599ba6afa0e574dab57a72a0b1995e SHA512 d299f53c97d596e584d468856ad89d7f7072db7bb7ca7cb7ea6fc211c9642254d9c9f15492e2f15ce80fa9dd8435f7639d1a88e3030e542c13441530335eaab6
+DIST thunderbird-68.10.0-he.xpi 604787 BLAKE2B 4dd595b4b7f4532a97cc8a2b1395f459a17b556efb893198e191ad1c3bd5e77da280c7fdef703e8c425bfe89e1ba01272849afc6eb0f8c9515d054dd87bc311c SHA512 2b7ea590daeafacf151313d851db1e90a2e185d47608591c52d9e2a8493e4cac0376c5e6a571cc66edbda0b2b6f5c87f95fc5a78fb9b28dd255ab454bf88da6a
+DIST thunderbird-68.10.0-hr.xpi 583784 BLAKE2B 6247ac9d868e0486130e9bd8b310d2967e297c2ad706e6ca93f4804bcaccd28e42a9678a6702a3a44b14ac9a825299e0378c20d74c28314655a04ef53b16ae80 SHA512 d47862d5b96fb75ae0ad209cabcb18012c17318e84d4884912b7abb577a4848a416adb3c8059caa4a8d1029c090f06ff9bfb3ae31c1567ee8ae7fb91a456f451
+DIST thunderbird-68.10.0-hsb.xpi 616036 BLAKE2B e7ee5b96f300a78324f4bcb222c6f374f57a56c38941d838154a3fae2a9f73e2f5a903d743fb82e8d29be292165aa2761af637f481885bc29ac2f4961499a82b SHA512 42d1916a3a9f0b8e3aa0cff7a6981453bd8838eee82aefe4c06b87e1856cba6cfdf854c8dfc55cdcd318d59a0f36aee34576d5813e1eb8bdbaa1cf0fbec21d58
+DIST thunderbird-68.10.0-hu.xpi 618155 BLAKE2B 1d4518cf154485134cd3c93cb373a62e3be3c73438e4101474a386228551fa1ac04ee42cbee9d0989688c0d11af53d29aaf1ce5c089f361e0d7affd2281368b9 SHA512 299bc88262c376afaaeef2951bd988ea2ea8781fe7d0d52ea6f20d1eca6961fe1176ceb610920f43163c1b2a84081709e2823760b2316899fc7bf5d5a01d1b34
+DIST thunderbird-68.10.0-hy-AM.xpi 631980 BLAKE2B f7af34f6285ead2ff32f4d5a82be7362d91105bcc0fc22672fc0c0dc73f14b11c668010bd5608a25d9deb38537ac1e96d9be2bfbdf05ddd64c567bc266a72be3 SHA512 5e162506deef63859e99b21ec6b61fc582d02c1507132e3b4814c993f28514a0e2da8f353125b909dceaeab0c84426419e1335f717883455dfcbdf358185f93e
+DIST thunderbird-68.10.0-id.xpi 567748 BLAKE2B 1ecf4f966f6168522d088584306622a41319dcf3985e98445e230bd2d4f2f0f70282862e538957eba9ae322d12f4a1577bc5cbd28f346a177c42ec3916a5e306 SHA512 8a48834440339489226e353756cb35cfcd48ac6c38c2b8b435a7dd3f0346e9f1eaee150f764e5f36677e1355f128783869a5a59d5752552a40e93069adb0efd6
+DIST thunderbird-68.10.0-is.xpi 575441 BLAKE2B b179486cdc161da29039f5d90e23be4f93ceea712c1c56f81c5c1fe772675361d4ad1f1ad699f954319e2974e2ece1884ad5d8d46f499001c03b6218505401d2 SHA512 53de9cb92b65148881e5bb5b8dfa793faef5c27f93fe409a75e515e2b821c8b786d795f16739db9247570fa8a2d04b59be6c9ba47a2b887f11e5b69ae3514ec8
+DIST thunderbird-68.10.0-it.xpi 489521 BLAKE2B 0cefff88fa458991b66a4f2265153bcc51863ef6fe9f925c61e57f8868bfee11e8b22e323c71eb6ff72fe7fa277a908cdf755ed24b02f0ac09bc87977af920ad SHA512 603b54f0c159b9285b533f18aa6210aae43098df01362a18650665fa700cac9903f02fa93d27b37fedad56916d1506f5e45779a9c98bf43c685c8279f95cdf7f
+DIST thunderbird-68.10.0-ja.xpi 643576 BLAKE2B 7c3eed63c5d7560653581f979421b5a2394d0a0b9649565d876cba681036d7a1dd2484f04c9ac833d0569a131d64731a2b735676f83eee4c52c310a4d299f824 SHA512 0a003a7d27c239bac77e7d655aa7c9bbc8c7a45f2d6e134943a119af44ddac9bdd460907fd24f1c28058d652c7a956b2725adb4493c988ad43d5c8f90db18ff7
+DIST thunderbird-68.10.0-ka.xpi 646012 BLAKE2B 06fca9fccc61673623949d349b5973c18e07060350053fb7d15d406a2e58d3d5f86045c14375805b01e6a753fc880240c5cad80a7a79a5810aaacffa395870c3 SHA512 b4a03933a70d65bc607e7288e9f9ba70d61be55af4c1af6fde112886e50fffcd8073381c4ba723ac49c31d6c615035073fd730b5a74e054016e1d95076f2f28a
+DIST thunderbird-68.10.0-kab.xpi 589820 BLAKE2B 73e63d0ae342ef9dc49af9405a49487153d32069e312b8b7ad41c0d5ee4f0666f3e216230cd6699a2ad5f372f99eb665b8a54c27c4681309dbc1c5273e0fd5aa SHA512 a9037ff956389efbb8ca867fa6da38058dde5e33e5b2fcd97338dd78b41d03ab78fe3a85c7240b0c7f02ff7bb3c4b52899a9458272ef9efb1e2ec5272b6ef6ab
+DIST thunderbird-68.10.0-kk.xpi 664809 BLAKE2B f55d7de868f591ae6818fd7b0824708feeb0b2cfb490603a3c5b94e9914f9c20467b55a7ea10f31275f4f6f73d6176b9db97eb2dfe2b0211d813c4b4692ba46b SHA512 8059b24be0a918b4ff6def5324261fc4134e2193101ce825a38512aeb6559631ccf694d7850e0cbada3603157395c2ac3867c0be13931fe1cd57b87e7bdfd148
+DIST thunderbird-68.10.0-ko.xpi 620531 BLAKE2B bd129c82361909d3126ed3bd82be573ae00d96621d9dbf906b51487b7fec772f9061697bba37c11051a87aed6d6c231804df40a1b07875f9009512ef7f799f32 SHA512 de1bda440eaec76acc499a191091208537734f5e8b47f03743fd5a07e0a693d3a0d48530b1dd17b78bab782abc09b1c7c1754fc86d8071366d1db9ac46dc6718
+DIST thunderbird-68.10.0-lt.xpi 603847 BLAKE2B 61b1c46e0a7c87136dfe2f1ad218ade7eca3b59e67983b5fda45c869c525814c7cc776c3e916aad1cff7fa03412636761a4903fc21bd7d412fd4f541366f91b1 SHA512 7e4769f450e24e3d726f1752d528777f123aca5c8e084984859593ea3406f7315c2abdbb08ed6ccb39fcfe1913458c0fbf196732620312becade2939ecc41ec6
+DIST thunderbird-68.10.0-ms.xpi 559014 BLAKE2B 8e73e94ccaf239a111faf2f870c35cc8f3f078728262f3eda7cca864bce02ee9d4e32b503e78be1bb19d68fcc86e2f58f200007dfc067ce54a6cd0c3285cab26 SHA512 c42397f35f6f80342d3606add7f27f21fdda919748c6d7b3092cff31c25b41ee6e42bfc41f69dcc84c33a21eef638ebeaf1e17a31f7129b78d1ea5ea4685a0c9
+DIST thunderbird-68.10.0-nb-NO.xpi 574022 BLAKE2B 65ae9c0f22790b870efa962d2d8999cd081f19156545d13a55a56e2b0d110a72bb03e383014c883f764864ec6119181945f35ac81ee7b246ef24ed97a9a211da SHA512 273ea6d6dbc9039039434d12ccd706e35cc00afded74dbf01a2c03e152ec45ba3760f41c53ce5ff080ec2ec3dd94bd149b98a2a9ccd265070f1cf436222f9bde
+DIST thunderbird-68.10.0-nl.xpi 581355 BLAKE2B 5517ae271d03e93c0218813d1608dac506e07a19c03bbb2174b6c82ba2c3db147e42674820abee8a5ec95d5367ee93f992f11f9f5f636637eaf44a478a20dff8 SHA512 27afe9f1e11bba8eb9a878a51fd2056ae19eec8a776e901fd843b8fd3b709adf86a8d540cb63fc52e4397b6657c360fa910cead8d2c6c16ad6d6144416fcbf0a
+DIST thunderbird-68.10.0-nn-NO.xpi 574950 BLAKE2B f46b7ce1571bd6d47c80caa1b7ca235538947d6f8473120de96862c64fcd490c723b8805403bca5fe32bfaf727cd9a26ad72bd9ef8fc55c27608a36211c69c3e SHA512 a51913263295595e960784581853a3d534a99c58b22b1e3f79970288a5da9a2e171db96d78083c8a24e642429b17f1fbd90842ddcd6af54fcdbae14de9e5f094
+DIST thunderbird-68.10.0-pl.xpi 576085 BLAKE2B 8691fda0fe103ce7b67553df59f8bd49eae6c50d649623645f0aa6bd74779335526d99d6092a440763a4a390050e55f327e73089068d3e650d3b39a016a97a84 SHA512 d1e56d36a0c168d75a99ca510f779c1a2383c34114bf61216bf47ff4108839650f7971f385ac47d083f170d8427446a59230e0507079a7064059811c56dd25ff
+DIST thunderbird-68.10.0-pt-BR.xpi 589837 BLAKE2B e6ccdf48c6ffb3d0cc12134e2ae2261810a2bda16010ff12cc542a4ca8d27ff3e6fee714abfaed9e4556ee05100c4b31b1b05bdb1ef2cc28e8698e88b6a9f9c1 SHA512 c68d184ade620a9dd68f716690119890eadf53d46a0371c342240c34bbafa8f73600665ecc03216acba2ee62b3f350e52ea60f5bdbc36fb0e8d60d242e994e93
+DIST thunderbird-68.10.0-pt-PT.xpi 588103 BLAKE2B 2233df17fc588256bbc34c4ec1d8640980192fc6904d1c7a8ff93da62211a16bb3abde27150ec4ec874883682a2642f1868be5cc814798415d1d7bb77ed0bdae SHA512 0cd0a8553382a6ff1b14b5e4e2ed6846d5a479897f788d665997b7628da939c2f90528b5245792350214c85e0a1e4ce68a3972ff0c3ee147a446243ea4781f98
+DIST thunderbird-68.10.0-rm.xpi 578050 BLAKE2B abe8c3d1316bc82e616d7cb418b0eb8716ca2469b9ec3dc58061f05972d39649ffb523b9db3cbe3153e8b7e57cfa532190cbdd72ba6f7d7fc41d6e3cad3c0705 SHA512 7a6129772582b294f6c44ea5db770ce3cbbf29b19e7f3bcdcfea343d699de545adae606afe6f0e30466323efefb8cba6fd347ca83af3629e5b8f51c253feca4e
+DIST thunderbird-68.10.0-ro.xpi 594840 BLAKE2B 9409ab855ce8412d3b16963e63c8c930e6b4b63906ad9845b4a917211a4a0c6450bc9232af67fddd26f7c359327556b16e9ebc5def1b7f581bc305ca63d487e5 SHA512 94cacac40830e2e8bbcfc2a805205ab83599771ca49dcc12c99b4c5424f2b6ed5f85f89fdddaeee8a33d31628bf7858464ba06983d68969bb1a7179bd0567571
+DIST thunderbird-68.10.0-ru.xpi 683325 BLAKE2B 826843432dea393de956db9def15f99718ea0ce2ec6ee4ce59a18d733f2d12e2334b6989867f68ce49cf1a178a96a41989e3a5547b5ec5f7361443fba7b20117 SHA512 046fc111057100a3bf34f25e7ab9bf8bfac0335e2d1d1ad210307083f9d2ba0caf37d95e2b61751e87d1b61b95fa07538ea80dd0d6d57684dd0840edd907ff1a
+DIST thunderbird-68.10.0-si.xpi 637405 BLAKE2B 61e6ea21e665dfb797bf6b86baa186f3fd0ed9b69cac2c1521a3e956dd87bc2ab1bc6c523bbb42cfdca485cb05fcaabc85b3e0140c78ec9d2a3e7d39eedbe706 SHA512 236654ab095f7e967911c7ef385e0c133151569f21ab4ff9c8f87815f2e745be6f0f2ef2bc6955af81a613b72b5e9fdfb78598de269443d31953916a0573c8d0
+DIST thunderbird-68.10.0-sk.xpi 609753 BLAKE2B 02496c0f38d3e6da751b5fdef1e231c4537f09af46cf643523e426a9bd7b1a4fa033acd9c2eee1b1b6b2c092606aae41ff062d6510dd4e925b565f8395d44e26 SHA512 8ddd8fb1203be4d2298c9d364cf95a6e51a504530608e3add552cd6480d9901a67f42e299b691cd89f269f57d6000b02b0b2a614d3618f8126d5ba848c2fdfd7
+DIST thunderbird-68.10.0-sl.xpi 590628 BLAKE2B 56acd47de4d31be5ceb61bae54c8685b8961d9a1e35538f1b5725cb3aca044a98319603493500471036bf6f409f456bfa10d29dd4d58abdc6a1d71554694df5c SHA512 34115bf279c3f1798a654583900b0314f4ba7f95ae09a53fec8deda88deda6cc2d9a751fc20304867fc92b322b3f05aaeb693602280c6cee8195f898992a36de
+DIST thunderbird-68.10.0-sq.xpi 598900 BLAKE2B 29a0be425c4b7eb2f09fbae3bfc48685dbcdd029b0e02417c062ad026481cbbd4136e7465938c96266668bc328dc48ce2c3d07cf394bca9cb5f35c21721fcd80 SHA512 730dcef2ed44ea0d2fbe646ba3fcb4606bd4d3532db003be6e60259bf9eccfee55dc69c4ba129b28129c2a7754b934f05304dece9e3af93e5b23d5044655a9c0
+DIST thunderbird-68.10.0-sr.xpi 624898 BLAKE2B a1bbd931e9cf86b706b2b813a2afcf73f82386cc86532abff0e99d09d217a2bf1124449cc7d002a97e1e29e05fc17568bf1b576a527ffb6d60ba8cbbfa49de25 SHA512 a120b5b2ea707a995827c818e7053c1e5aa8bd45b3c0d07d3c86ecea8645b810d83a9a880a3de30b3777b2924b75b76b46ed1c4d6494a5e678a63f6787bce29a
+DIST thunderbird-68.10.0-sv-SE.xpi 591596 BLAKE2B e0abf0f697f5104c1633cc7f3542c25d1f591e2a23154a7955fe467b4c74e506772a42be1ab100a43c7038550d1bb0d75c36416518389e4c6c1a7a74bd771d7d SHA512 4ba07b204e007caf1f8d971de90c8ae380bcf368b1f4c463b7059b0a971ddebf2817e0b7ba91763c9dc11d841517a6ed1b09725f932123237010eb30c1b81b58
+DIST thunderbird-68.10.0-tr.xpi 599707 BLAKE2B fad6027cd7c915d8fbbf1fc4d3cadd02d38156667a170f3e74b6013e68251b5fd1703c001afd6a6cdd3f2bdc38153a6eeba96cd3c1c8693ba9a1a9a4d18be6dc SHA512 e178e3368b3ecc3baafb2928e5f466b4a1078796e4d72ea6b3a28d40eb26070b92c0d6fd07c29d9f03a94dc6278eb3c619228b4116a61ad0dea84d017d39cde3
+DIST thunderbird-68.10.0-uk.xpi 671455 BLAKE2B 7249c39a0d75951fc74f0b6a7b7253243a2d7bf6c5ac8568b964b5de3179596b316bd11870b3d0d8686c009552f64e4271027e8012b349c21d99a203db859c85 SHA512 0b704c62579c0f5b3bcb7bebf43257b904f8048497359b1ed37b046fd7d729abe4b3142c50ce23ceb12d69513b40bb14d4b1b85bf3310a9c0fbd656264a30bfe
+DIST thunderbird-68.10.0-uz.xpi 570418 BLAKE2B 41591ab05bb52aade78ba62e7d4aa49c4dd5296f857d5670fad0e1bd3a8700e5edf6af2d80fdbcba75fd285f3f9117b3b8a316272547f314413bca78de9c2820 SHA512 08de541fba64e86a1a509a691249521a5ba7813871bf9b7d373ae0aec4f2a9750b7ebd0109f6ec8bf9479f995ba6259d722ef7cde52781426874f2b6c76772d1
+DIST thunderbird-68.10.0-vi.xpi 623422 BLAKE2B 8e2557b66c51d6d98c516e58337334f41e77af631f7ae5f6f5636e2936fa19ab584a3843bfd72169b9c13e417b74efe5527b4ede61d365251807a1f9014b0ef5 SHA512 951536c862292476592a4518c812650294f7ad04ccd52a70c311a8793c4610bff22490454d46852a87733d8035d7783389135b11cc64569ad90659f3bb02adaf
+DIST thunderbird-68.10.0-zh-CN.xpi 626820 BLAKE2B 38b6ab9fd731e6edf6b32b77663adf64194117b1a1248881aa3209b631df0a60c90ae742e6bc907a16457df479397af720f94bceaf1095fcf47b6c33eb3362da SHA512 6b5ffbcc6d453573bd8f84ff2c61680e222c354e9b96425349c5de97503acd38c003abd76f748ee36b47fe8627bd232b6489ee6a5f4a9dce2c66c3a87870415e
+DIST thunderbird-68.10.0-zh-TW.xpi 627475 BLAKE2B 9b075bb3ccbd8ed565e27d0ad5364c6def3ffbb9391c766446694fbc37c70bc592688e28288f6739551899ca39385980092e7b97d7404ec74d75f76b7a21a07a SHA512 da25ba5f50510cf3d1e7fc5a5bc3ab825a275702de50c1dd1c517e9f0f45006570b2f8fc0ad7bdbd0613c8e54f7f31bc06c39f9a9b84e5b16a50db6e91b7cf0c
+DIST thunderbird-68.10.0.source.tar.xz 331265676 BLAKE2B 616f545cba194c5752a155a477406b190e15493aefa4c20141291dca049b3b629e28a4acbc89127bc86165f5bc7242e3eb18e928086eee3b4a5e0eda6dc5d7bc SHA512 8db4e363b1542190d647babbeb2bca4f258e6bfe3bb67c4a4c8eedad702f956c6e2e1daaa552a45912b55215fa5f6fe0be77025de324ea6a0082ca849d132c89
 DIST thunderbird-68.9.0-ar.xpi 617168 BLAKE2B 5e51afcba2c207b8951a1f956266ba8510821873e44b213a3a55a98e92495bd4ed3dc56bbb998c8b36d365fdfc86f4cc03c0e4e7edef867f211d355e69f6b495 SHA512 638c99cee69cad7d4fa1ced99b989d751529c03f2c36da8ab76201d75da9deb2005a3f4bd9be3bc7434ece4f6217928388cc1bd34913f422b3832392100a2875
 DIST thunderbird-68.9.0-ast.xpi 551299 BLAKE2B 6af53cf93c9c98a088fc7c88ab3e26d0b336b85bd96bdc30ff2417561936b9db2d94b5eaaa805549568244b74fb6efc628f2e0025b3365616a179cddc451e4cd SHA512 fefedb7262e4abedce010fbdba8a2cddb13ebe42db11914262c9e004d14b9e867e105fbb6236406fdd9fefa9a97eec35a7532e814943c22860dc720fc97b9b28
 DIST thunderbird-68.9.0-be.xpi 646281 BLAKE2B f4f674ebd8633a25761e0635d2776b85d4931856053cefd68102601e906bb4d52e49bdb2b786f9865c04cf613d06e8f11cbcdc9ff7aaf047ee491197dbf0a448 SHA512 677e71470d1117654ca36071afb3cf86c1fc5bd2b567b8740550c47e61418904a526c075adfe2b14b67db6e103d1a2001af4ee61722ff1d82681463bf1b31ffa
@@ -122,5 +183,6 @@ DIST thunderbird-68.9.0-zh-CN.xpi 626819 BLAKE2B 6c5ef075b5e984aaf2d78d445f600dd
 DIST thunderbird-68.9.0-zh-TW.xpi 627475 BLAKE2B 1f7382cab6f95ea5e2d734653163f04bb1095681e354ab9cb42dd65b42a0b1b6a44cd3b6794e83a1e1d4b47af1ab579f85e0aa167403b4732f1f10d4b127e8a0 SHA512 4548b0d3e49aabb36466d97590bdced672611dc3a95aea15f451a58e81cf6c3738aad46b56f9f538c244ec50ba1a6cca8be4af5fe937eecda5883b7378b10cec
 DIST thunderbird-68.9.0.source.tar.xz 332239044 BLAKE2B 55f8e5cc4c78738a3425caa696eee9a8c2549696be4f8ab16fe80f01cbbda09ea07e1f40bc4746944e04b77a6632f2fcb5a13bde1425c8f88d11e28174ba2d7b SHA512 891472c95ba6ff46061131504e89010da512a84b0e1dea0482e603fd4c87f11e099280a245c7dd9fc9320c48229c26602565c089d86f1a1f4271b29b6fc606f0
 EBUILD thunderbird-52.9.1-r1.ebuild 10471 BLAKE2B 5fae71657b2c422ea54ca1e8f14fc1d762ae4997e7b207ccf38307cd368afc7bd108ec88bfba4cff20eaa1b5721c89ff44b85cdb654a2f532eedc4de72fc40c4 SHA512 71af60f486107c6bc87d1cfdce98a2de171cd8e5b9ba885a31ae6440ce0e34c0dbcdf3b2fd5a5cffc7ff97dbb06a07d309c1a396f5fde91d30cda8be2e743911
+EBUILD thunderbird-68.10.0.ebuild 25798 BLAKE2B feb561e7248cad07aefc0dd1b516dcf2a9d5ddfd93eebe8a6f0e546218c7cfe95b235416c970302742be14aed830dc213f1b03ef71ea5690cc4bbf67611816be SHA512 a2315a27e66c87b8d6cf75c1aa85c9af684de1fffdd930ffd5c9a1fabd8eddbd173a46fbc63043b608646a4b4a49b8970ecb4ce0ed0554437c097b74d9a6d941
 EBUILD thunderbird-68.9.0.ebuild 25089 BLAKE2B c1c9f5a15b6ff1021da98430c4a7945fde94f55bd612a7c72bc35b0764a849500c1c121cb418e5addda890a7abac657981a1b6a7a939e377a5af17b936710151 SHA512 4692a2bf292a2e8df427ecc8e6f0aab3565d7ae5d1fef480ecb904099ea2b9575e2231e1064347312620409961b27689c9cc035a0e550637100df7eb6e05fdb5
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.10.0.ebuild b/mail-client/thunderbird/thunderbird-68.10.0.ebuild
new file mode 100644
index 000000000000..a896cbdf76d9
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-68.10.0.ebuild
@@ -0,0 +1,800 @@
+# 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=""
+MOZ_LIGHTNING_VER="6.2.5"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ar ast be bg br ca cak cs cy da de dsb el en en-GB en-US
+es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
+ja ka kab kk ko lt ms nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl
+sq sr sv-SE tr uk uz vi 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
+
+# Patches
+PATCHFF="firefox-68.0-patches-14"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${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="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
+	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon
+	pgo pulseaudio 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/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.44.4
+	>=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
+	>=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.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}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+# 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="4500M"
+	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="4500M"
+	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
+}
+
+src_unpack() {
+	default
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply firefox patchset then apply thunderbird patches
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
+	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
+	eapply "${WORKDIR}/firefox"
+	pushd "${S}"/comm &>/dev/null || die
+	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
+	popd &>/dev/null || die
+
+	# 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}"/comm/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/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}}"
+	mozconfig_annotate '' --with-toolchain-prefix="${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
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --enable-ldap
+	mozconfig_annotate '' --enable-calendar
+
+	# 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() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/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/defaults/pref/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/comm/mail/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/comm/mail/branding/nightly"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/default48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
+	done
+
+	# 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
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+
+		# manifest.json does not allow the addon to load, put install.rdf in place
+		# note, version number needs to be set properly
+		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
+		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
+
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# thunderbird and thunderbird-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
+	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c65a4b104eef..7cad1f7af108 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 16c947cba6d0..18f2584b5993 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,6 +1,6 @@
 AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-DIST exiv2-0.27.3.20-Source.tar.gz 26462789 BLAKE2B 1fab5636f2ff69a6e61b78e29f8f536ef699bc7eb6e32edfd2f643805205df99502a3e1a9654dd8cd60e4f948d1442aa2bf4c4e71a345adaf310746bce5054c5 SHA512 4efd358adf615b924ef5446b68b7b7e260dd243179c8aa290006ea84d2fa08ab7069aa1af80b594858600660e184c80613c9254e66320d47087e00c9eccc8448
+DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
 EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1
-EBUILD exiv2-0.27.3_rc2.ebuild 2491 BLAKE2B 2a24901ccc3a33bda3bccb255ee1e4765b9ae3caa408c37715e5a639542f69e874508054e0bd5d08c5355ac3c14fcafe423b9369c5a7cda465c97c677cda5111 SHA512 fc7c2f129c9c4e3d38dd53d79a8d530694071a9245b9e246dc85e8b63036556478866f5b77a42132936962f53c136fb913e1e250267289cb89b6d71acd39af2f
+EBUILD exiv2-0.27.3.ebuild 2461 BLAKE2B 731b33b83bc92239f23803e278f91ff5c0a300732393394b8ed2c0705ad620f0d14e3ca165f98686781624bc0435725c4846952f42eee1337bb5f3ba35a67723 SHA512 81aab9d3d04d05be26023f247448b155283adbd2c05c1852841f2de4f3f2a00ac2c754d490ea9a41780f80199eadc49a9e9c31ef6d8bfe31546b07f8d4c70428
 MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f
diff --git a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild b/media-gfx/exiv2/exiv2-0.27.3.ebuild
similarity index 88%
rename from media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
rename to media-gfx/exiv2/exiv2-0.27.3.ebuild
index 276e4ea019b6..273b13df3d38 100644
--- a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.3.ebuild
@@ -7,12 +7,13 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
 	inherit git-r3
 else
-	SRC_URI="https://pre-release.exiv2.org/builds/${P/_rc2/.20}-Source.tar.gz"
-# 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}/${P}-Source"
 fi
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
@@ -46,8 +47,6 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
-S="${WORKDIR}/${P/_rc2/.20}-Source"
-
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
index 34af9e1076ea..43d09d21e94e 100644
--- a/media-gfx/uniconvertor/Manifest
+++ b/media-gfx/uniconvertor/Manifest
@@ -4,6 +4,5 @@ AUX uniconvertor-2.0_pre379-import.patch 935 BLAKE2B 5c201dbcac46f297cc2bcb243ee
 AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da10207317a6bcfe5c8c38eefa7d440ad6cc473c973fd41e923367d8b125f6d3fbdbac9df54993d398c040942e00b2730dd9c753fc2 SHA512 ff373151caf0c10e9a833ab68cf153d024706293c8000af248cb11a12582216c20f79e0998bdaabce0cc47d3248f786aa55ce9ba8814b1f4bb33e07670dd3136
 AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db
 DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea
-EBUILD uniconvertor-2.0_pre379-r1.ebuild 1519 BLAKE2B 7b6256848790e4009ee8c63e76d7c859ada926ad5dd465f3a69495eed9dd24e53d80e9807358a656b626116372087eefbad542f8f011ae93ea4a002ead01e719 SHA512 ab5671f8724ed3b1a09d616ac4bf1f58e4cfd29c72717565b4967fc26fac8b5ff2edc0a72efaaa38e2c1a6d13cceb47fa105061093e0702d5db4dfebcce164f1
 EBUILD uniconvertor-2.0_pre379-r2.ebuild 1842 BLAKE2B c90a6f269ad8891c05ff22016b2d1d95316fec86c16e06200679597b804745d4fb18b202196ad5444a40e51d8701a98c33626a532ec88263c2580369e6af2db2 SHA512 65198e23b0f6c3dcd047dd9541d700cfab5104e977679249a80a72feb3042ab213b812f5100587df1283d9833e8252a4dc86da925af9c960d02ec622bbac2bf7
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
deleted file mode 100644
index 70eb7af38ee0..000000000000
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more."
-HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-
-RDEPEND="
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	media-gfx/imagemagick:=
-	media-libs/lcms:2
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/ghostscript-gpl"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-import.patch
-	"${FILESDIR}"/${P}-libimg.patch
-	"${FILESDIR}"/${P}-test.patch
-	)
-
-python_prepare_all() {
-	local wand
-	wand=$(pkg-config --libs MagickWand | sed -e "s:^ *::g" -e "s: *$::g" -e "s:-l:\':g" -e "s: :',:g" -e "s:$:':g" -e "s:,'$::g")
-
-	distutils-r1_python_prepare_all
-
-	sed \
-		-e "/libraries/s:'MagickWand':${wand}:g" \
-		-i setup.py || die
-
-	ln -sf \
-		"${EPREFIX}"/usr/share/imagemagick/sRGB.icm \
-		src/unittests/cms_tests/cms_data/sRGB.icm || die
-}
-
-python_test() {
-	einfo ${PYTHONPATH}
-	#distutils_install_for_testing
-	cd src/unittests || die
-	${EPYTHON} all_tests.py || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e175653d0c49..27c29c63a07b 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 069131c8d7f7..9b20e933222e 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,7 +1,7 @@
 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
-DIST libtgvoip-2.4.4_p20200627.tar.gz 1090601 BLAKE2B 243ee9c85224f903579581c217c7cec818311bd77af0fedb937c1bdb64bf92441c5c0d72515e1fee31b4a89faf59d0a3e3447cdb458303116cfde887e333faa2 SHA512 73a861ea2dba9afcae061e5d8ac0e03d1c65dc7b5e65bcacb3a95d74e816fe96604f24e042e7cf0d67723281c39f85f4337eb2fde275d68e50b0104f29f42271
+DIST libtgvoip-2.4.4_p20200701.tar.gz 1090571 BLAKE2B e1e3bf129e124aa907e15afaefb1ea2ae44fcb7ab6670e7727ac388ef498c21978f668760022ec002fafecdf51b85d872364025f2282acc88532ef3b994c4e14 SHA512 44f650509d0c6d15adcb5bb5a4af66432c808fece5169844f37d4eb3fb25f729a1caa1c2cf68a6764d134e187b156a86e93b383984f2d4dd86a69cb3e9b2b888
 EBUILD libtgvoip-2.4.4_p20200430.ebuild 1039 BLAKE2B 21f3e2037b6d704070f183c1b21a7a82e772c1ee9119530a202063e7606244b9585e41dd39b82de347d6f72d6d4d88a92a4d96e928338a72b06b8f028db7e6c4 SHA512 76558155767123484954b131ff62e85b22f23cc40c4c867fd29aa2e010231ed03bde4dc617e3d2fb8104f3e8677b94faf48854b7912258bb1999a92368dcd1bc
 EBUILD libtgvoip-2.4.4_p20200525.ebuild 1098 BLAKE2B a5d7b79ab969443ec6e61dbcdcb5e5eee3cd97f6d9dd5e42879ab0884573584ee17b11f0e8667ff86c707741c22e27484edb36fb04d51d32ae1c626531c8227b SHA512 c23f91744a01ffccd74eb58fd28d5e048470b19565c903ad00dac2980367ff37251ab8acba3ed5df7aa48c4ecd42b959636e06b5218091a3eb18ba5d0e291e2c
-EBUILD libtgvoip-2.4.4_p20200627-r1.ebuild 1166 BLAKE2B 38462696825bc712e6ed8e101d39b2a0a7f2adf25b8f09c4ca7c1df7871e18ef13c4c77e2e69b4665c42638f48fb62733811e3ff8574b10777adc1792c6e4a79 SHA512 e36e9436162fe639e095131b9bbe67ead7c8c18d13f1f1eb404ee63aa5685b601e72f42f554f0102d2a9d550e429afeddb19afb57dc5adadadc95cd428a1bec1
+EBUILD libtgvoip-2.4.4_p20200701.ebuild 1098 BLAKE2B 74c6d20e2c0a77400a46c27e2e87ff608cd01a9050ed90c1c871f6243c3f8f45ab4323ec531bb1b1ec913a329ec7424dc1354cc522852660d70f66f4051d08af SHA512 8f21d2a4fb4b7fb3643ae0ee70942ad175e3197bb6c40f8842ebacb5ea1236b1ffa8addcc756a26dd935068742890637df8d043c0d6e74c979e868f7aafb3704
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200627-r1.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild
similarity index 89%
rename from media-libs/libtgvoip/libtgvoip-2.4.4_p20200627-r1.ebuild
rename to media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild
index 811ae876ee3a..65f68701687e 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200627-r1.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools
 
-EGIT_COMMIT="d40d077ddab10a81fe619477cea8380cfa7efcea"
+EGIT_COMMIT="ad55e7403ab7f268304ae9045eddef479a574ae5"
 
 DESCRIPTION="VoIP library for Telegram clients"
 HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
@@ -33,7 +33,6 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 src_prepare() {
 	default
 	sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die
-	sed -i '/Requires.private/ s/ alsa libpulse//' tgvoip.pc.in || die
 	eautoreconf
 }
 
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 377daa599892..7face3a14863 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,12 +1,13 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.20.0-crash-in-composite.patch 1261 BLAKE2B 80a5b75f75dde7d5b3f9a502290d3cdf3c41d0a31109aef1ca24ca90c07cd0f640c1895b2dbfcc08bab37a07d49ac16fe0da9ccfa71e0288d2d92329a6a2b4c2 SHA512 203e291f91cbbcf4f320ac84f95a814ea84c2c97c3efe085dcfdc0cc33a983d2292d77081537536837a00f48bd0dd5ecb3848dc5ba7ddc523562276f41f3c2d4
 AUX mlt-6.20.0-crash-w-unsupported-preview-scale.patch 1679 BLAKE2B 7626434796d419f2ffd2a83adb546101a04e7a3d3569cd855dc1795283c909a96d31263c2bebbb93ae63c8eaad5d4da23101580ce02d08b02a95cfe0401156ec SHA512 7948610f2f9fc1ce3b12a053a7b69e17ac2b3c63af48bfd915eb7a10801cf049e4c5845e47fd1ccc18d81deafe57fd69b8871ac0f34d5535fa9876cf79a4528a
+AUX mlt-6.20.0-musl-locale.patch 961 BLAKE2B 8d129581589ddf103ef1588cb184b81ceb5622f75c065e8f0c970dcb331dfaea4a8c6227c29d18d1a2e50d524d9ef317f5e4b11c379dd3c9caa23f06093a1586 SHA512 a010d41ccd777782ef740896ff35464f7e7aea979d2d4425638ec40bdaff02b785506b8e6561d2e820425f30d7933c638274133800bef0b15df9f0d3060487c1
 AUX mlt-6.20.0-no-gtk2.patch 13767 BLAKE2B 8921d0e394fc4eb61ec3a642b6125cfb0ec87d024b207a3beaff46ff4abfe1594d14fca248728400098aa1b5ab2e8e1dc6a95cdca3b7d7acfea11828fab92a6d SHA512 ea62120f92ff7af1cac78959dd225c723bf810fef8fb31ab88e0651dbb8bb2f1ee91dae5a5fe697529203bdc84d165a738699a2de9e83634392437bb125c9742
 AUX mlt-6.20.0-nullpointer-crash.patch 873 BLAKE2B 99b967c4725352b52f5db9598b80c1f441b720ba0a26697785e04cfabd140cecc99e357176fe339c7203e4931c9a069494ab6a5bee1baebdd7a7d1c691b060ca SHA512 e0e39776ce80534299df82e3c4ada584b727029d11dd77d93d36c6cf605546ffb32184fca549dd2243db489d6c27ecf1a69990f463654a580ec8e0bdc8c131fd
 AUX mlt-6.20.0-opencv-double-del-crash.patch 841 BLAKE2B 2527a09828578156815c6c644b59f01d7bc02d9eba978f58a75e26a253375b098727e578270cf24090c38ebebce2be7d61a7245766d1c2ed37f86cf5b386d827 SHA512 2019351d82975f3eb94192d6318f33eff88570a38169bf2cbc32e822ce7f6c80e3051b0d6439b75f4a58e1108f0caef8e150bb3c876adb0cb3a663aa7e104fe5
 AUX mlt-6.20.0-opencv4.patch 1631 BLAKE2B 0b132e30f992bf0d9e19eb1d3946436c981e57c750ad49cac556436c3b74909d22cbb7a3b64071d3804548ab637d4afd69545d4a4a38b764b793bcc15cb561ba SHA512 fce81528abf733e4228fdecb983f0a888ec2712de5723c623f6a1ed083065b151e3f0fb009d488b6d60b577ddb0489ccd35c798c49e9e03f6faf511f40206ef6
 AUX mlt-6.20.0-qt-5.15.patch 1571 BLAKE2B a4d5c1a009399ac0ee4d85fdc8f9f603e69ded9d77320083511a46e1c1a2c7adfa1940a97ecfb6d2ad70dfa624b844260cb0f0249fca861ab25aed8b265e9333 SHA512 2eb8934ba6bca513f7851189428c997380da09b36ea8e27bc4b1a3f69c0feebd8b5d53dbf34658693261cae13dd69e60526b26e64ee56605b3972a79c561e295
 DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
-EBUILD mlt-6.20.0-r2.ebuild 5060 BLAKE2B 0e159c40b1e5ba34a0596273c3dbe9d041d336dd271c6429212bc9430056e0260bd8a22c7aee6bd064785f0e8bfcd602d985720e090df8b70dffe7cd05dd850c SHA512 4bf5f5bbe30749d2a77dc9f3f4ee6fa16f0e1d46c4f8681e9f9cfba5eba043aea6bb49f641189214fcc8ee092b06db689c516e6bfc816dd062ea7c098abda869
+EBUILD mlt-6.20.0-r2.ebuild 5130 BLAKE2B a1660102cf36de424c98b13528814b3d0df0fd485f4eb5f5e67b7e6764249852e49c5591a73d7cb98634caca0d92d2894f5b78570887cc4b49a8559fe3588e48 SHA512 94b6675c75ae3abae1c06af0de79e280dc2cbb314f65e294510fce8a18b1ddc94931ed5464124190a0ec59361c466c661f025387c2ebc9855cf1d30045a8fefb
 EBUILD mlt-6.20.0.ebuild 5340 BLAKE2B c2db005fe50befb993f8154a5f53d8395adebe49e5df102fbd78ecd89f851be944cf16b69fee1b1cd44cfed239219bee3bcb5f5f4b2e184ed06ae32b39459617 SHA512 bdefec68b4a36be06655d5649ca5efd3d94ff501570e8e6a8c0e2fb42bf8907aeaf6727c884c6fb270b31f388bdbf1c8013f3ce784f3ee9c258a16cbf62e21d1
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch
new file mode 100644
index 000000000000..ed206108d2ed
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch
@@ -0,0 +1,34 @@
+From d02611584d4b2f693469c72272fe369413139394 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Sun, 6 Nov 2016 00:45:44 +0100
+Subject: testing/mlt: new aport
+
+---
+ testing/mlt/musl-locale.patch | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+ create mode 100644 testing/mlt/musl-locale.patch
+
+(limited to 'testing/mlt/musl-locale.patch')
+
+diff --git a/testing/mlt/musl-locale.patch b/testing/mlt/musl-locale.patch
+new file mode 100644
+index 0000000000..030bb781d1
+--- /dev/null
++++ b/testing/mlt/musl-locale.patch
+@@ -0,0 +1,13 @@
++--- ./src/framework/mlt_property.h.orig
+++++ ./src/framework/mlt_property.h
++@@ -30,8 +30,8 @@
++ #include <sys/param.h>
++ #endif
++ 
++-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
++-#include <xlocale.h>
+++#if defined(__linux__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+++#include <locale.h>
++ #else
++ typedef char* locale_t;
++ #endif
+-- 
+cgit v1.2.1
+
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index 7c449e85101c..2d15f57bfc5d 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch
 	"${FILESDIR}"/${P}-crash-in-composite.patch
 	"${FILESDIR}"/${P}-opencv-double-del-crash.patch
+	"${FILESDIR}"/${P}-musl-locale.patch # from Alpine, pending upstream
 )
 
 pkg_setup() {
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 5165e448e0d4..7c6cf205b7fb 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index c41ef87c958f..28089ac63f9e 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,5 @@
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 EBUILD xmltv-0.5.70.ebuild 5268 BLAKE2B 46bed06ca83a46fbd2833eadfc549411578b390258fbeb1a10438e6de47cc7a2475c996c23aa9ffea7a04ea48948067546024bc52a183bc91ad0e2383cde85b6 SHA512 c0a326722ffe4b180a5c81627556a80213fbf3c8da80083145089f464c10983fe8f22db0e6f2632f2284b1763e1a05dbdfec07acbe137b559ea7d593dd0a657e
-EBUILD xmltv-0.6.1.ebuild 5921 BLAKE2B feb552d7bce00de7093e60ec99a4f68fdd2265a5a3320ff0113e7c3cf132f0f5cf34fbecfc53b373de4840abcf3e56af6a89268b1c4cdb4b9761a35c35d7da7b SHA512 516f28807ad6142ccdb9cbf16c5afe4881e6786140e226252fae74f290a5ad58d66e54ffd4e8cb091cc8d66d15cf780c8f6ab664ee8fb4f185af3735ba7c9e23
+EBUILD xmltv-0.6.1.ebuild 5926 BLAKE2B 7b3cb3657ba5774d4eb127b0faa3c4cb0eb96daaccd8ed2b8e557d372290a75c0ebb153ca8572775d500c78b0038fd2b00be9c72b1fb377d315e9f8cea4a9cd4 SHA512 bd53499974d7e4d11fc049f61571be55700196e114efc4449a442546106e22e137ffd2be01f4947aca41d28c8049386ca2b88fb6bc1d2ab8fb2d3d3d9ea8e7c2
 MISC metadata.xml 2676 BLAKE2B d7e8c1166118a7622f365c05b7408c8ac8725c5f98b26d792bf89e430dcb6f671e397f6f6f92f7d55a2f4a0756f6ce2e62ea08a8e7f74182ac23b806788aaedf SHA512 52b5419e2c2737c94dd99cad4d412666db10c217dd68e65f9422532d57bcf5c836fa7e94938eb8876739add027477bde8b3a5f269dbc69493c930ae5aaf69a41
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild
index c89237ffcaa8..76f97a89bd11 100644
--- a/media-tv/xmltv/xmltv-0.6.1.ebuild
+++ b/media-tv/xmltv/xmltv-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
 
 IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
 huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1ff27788c1ce..769cf421ec13 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 18c02caef6d7..00f6e1998acb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Jul 2020 09:38:22 +0000
+Thu, 02 Jul 2020 05:38:23 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3954f31b5c84..8d9c500c4c6d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 469226 BLAKE2B 7802023c2e2f34c26e4ab80c5dc66d82df62eae23b930c29c3bebb5b4ded87a3a117438be8d0fe26990389a3a2947f4151a8aecdd768fcd1388a595c78cd7d73 SHA512 c8862da9c01fac7f061d6ed989c78046fca0143f6f6c82ce4d8c8662fe53725e542bc7eb68e3936d66230eedcea6132083a3412ca73bd3a83c42808079029d0e
-TIMESTAMP 2020-07-01T09:38:25Z
+TIMESTAMP 2020-07-02T05:38:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl78WZFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl79ctJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDE/A/9GsFU0qN30t9lysfG4QJZx0APmpl3hmaGMLgbGrIOlDO9tasD3/s2Fj7p
-ctDQHloNvcppWSiMJMTmEI7Y59k2Z3RZ3T9FNvev4PRXtwxs26CLDqL9o2TCtXZR
-lo9bN0afJu3aY7t0PZy08x+LZ0DWc7H8RU7sKSgv1sCo4y1v7LUy06wMdNlTISE2
-a/L8vDa4pWdbnRExEQPaKbB0gCLxQfOlV/GAKqkNjxApFRfII+XBTQd0dlXCk81V
-rblvusW6njyhKsjMLP6fkimkGDnfn+pczolAoq7508wfu65C2henuFFdKbdrl1ND
-wTktEHivlTgCSc6v2J2SXrItSLTlNfTMlcmOO6frm6fMtpQksBP478ze3mWR5uu+
-Y0S9IUZjydc8z+zc0Sx0H+3nBwhsdT2oInfXnf2WmTecSpxaVFBHs43fOENu0a+w
-SxPu/Lw4BjpedleAs482w8eeVJ5Yyd4mbAIqDsNLAFoIQWOrTZPBvte64a8/hO6D
-/fbhj8fbiGyjFx+Cwk0cnh6jv2E0GxqLDUsF6zJ+/UvtjaMYYOjTOqILVT7LhtVN
-w9zggtqoWXnl3eYLguMm07VFw0THdUkM3VIXZ2JB433waFRSIQF5N9KAOVU1/roX
-HSIMVS+1FExoHhxCM87SzXYwb40EY13RNNCWKvXw67WTD2KXxxI=
-=thmc
+klBxZw//Z+HEwYthUNIUtzqxB/kAFHgagqWYZnxf7ncgQriXb9B/DLI5jDToln1T
+/oZq372hlgjq4dMZmVY9LVejNfhgbif/PYliA5D0SNY2gpkUwAVWn/b0TWSWt8AB
+mWo7oHBqrf+u6V5Wa3cUlaUZ+Ygzg6rACYK2Gh10oNwyMkXbPu245eEQrtwBADjH
+2Rz11kdtZO5oYTNmm5x2hjYisUzvJ97h+LANDHPJ4+PHW9+Q6uqgMzmc0dZDy/VV
+UDYVbPGQ8YNZE0E8B2TSGT9+tqnQV9kpxWDvE2/Bt9X5xp3snAlno4xGDpMTFxgy
+iI6CEw8/8DXEgbjcL3U+tCPCCDhuJKcWoTqtHZcvVAicz2vwMefwtrca3kPW6tHU
+Hyx+SFV4b55S8fRK28fjSj4R7/7tN4g8sgwEF1Y0b6Xilpbgl/uoCzM1oPc+Bl78
+X+6Z7nk7R2NkA3J8WM3kpPkdv35FxVatgtXTpasoUfw/dQFlrNVGaRmqmMILsNhl
+5ryeEJ0Asu3hJJyL2Vq36Lo3EMRBgIi39rByycveaUGeHS7+qYTqqbqpJoDUc8rt
+ZBYjUHL1VCmA6SOh7EZJOg/RbzkaIVN43fjkLXB3+HTdhmSAN5If5J0P8bEnbZWW
+/2YcHFtDwgEoRdHXRl+vi6KxUSjgEmSFCVqQH5QiXR2drM5fFDc=
+=4lvO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 18c02caef6d7..00f6e1998acb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Jul 2020 09:38:22 +0000
+Thu, 02 Jul 2020 05:38:23 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f19476551c81..ee2589b9d6ca 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 382d18803d6c..3fb6a5ae95b2 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/maradns-0 b/metadata/md5-cache/acct-group/maradns-0
new file mode 100644
index 000000000000..2f4932e01d66
--- /dev/null
+++ b/metadata/md5-cache/acct-group/maradns-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: maradns
+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_=0b120d9ef47a9b58921447e145cfba83
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index d73b5d97b8bc..8460e0583ff5 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/duende-0 b/metadata/md5-cache/acct-user/duende-0
new file mode 100644
index 000000000000..037903736d75
--- /dev/null
+++ b/metadata/md5-cache/acct-user/duende-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/maradns
+DESCRIPTION=System user: duende
+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/maradns acct-group/maradns
+SLOT=0
+_eclasses_=acct-user	4c04090a102bda57f50a5e6e4f8bd973	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=5395e0bef2c329ca8fcdaf4d76b7ebf0
diff --git a/metadata/md5-cache/acct-user/maradns-0 b/metadata/md5-cache/acct-user/maradns-0
new file mode 100644
index 000000000000..832853d038ad
--- /dev/null
+++ b/metadata/md5-cache/acct-user/maradns-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: maradns
+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/maradns
+SLOT=0
+_eclasses_=acct-user	4c04090a102bda57f50a5e6e4f8bd973	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0d1d57ff842cacbd17ae61bb849a6fa3
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index af9b6688428b..ec7fc723b96a 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/apg-2.3.0b-r7 b/metadata/md5-cache/app-admin/apg-2.3.0b-r7
index c49135208913..ec2e527f35d0 100644
--- a/metadata/md5-cache/app-admin/apg-2.3.0b-r7
+++ b/metadata/md5-cache/app-admin/apg-2.3.0b-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Another Password Generator
 EAPI=7
 HOMEPAGE=http://www.adel.nursat.kz/apg/
 IUSE=cracklib
-KEYWORDS=~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=cracklib? ( sys-libs/cracklib )
 SLOT=0
 SRC_URI=http://www.adel.nursat.kz/apg/download/apg-2.3.0b.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71c724eeae74e1264b0bb0792266a6e6
+_md5_=306bf4772418f104762be608ffcdee9b
diff --git a/metadata/md5-cache/app-admin/rex-9999 b/metadata/md5-cache/app-admin/rex-9999
index 886933ac10f6..f1130255cf31 100644
--- a/metadata/md5-cache/app-admin/rex-9999
+++ b/metadata/md5-cache/app-admin/rex-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 dev-perl/Expect virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-MaybeXS dev-perl/List-MoreUtils virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign virtual/perl-Scalar-List-Utils dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=531214f0fc0ec8bff3e7a94df059667c
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=94be0e96dd9dfe40148c4a8ee3223cb3
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ac2492d87c9c..2e9b59e00f6e 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/tpm2-tss-2.4.1 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
index 8735ce5c6ec2..6bcaa87f1d1f 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
 EAPI=7
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
 IUSE=doc +fapi gcrypt +openssl static-libs test kernel_linux
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.1/tpm2-tss-2.4.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=868cb103ffd7539eade81901512e0bbb
+_md5_=e8bbe03889d1ca93e3529bdc694ad657
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 666aae162331..a59cb9f100a6 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/protontricks-1.4.1-r1 b/metadata/md5-cache/app-emulation/protontricks-1.4.1-r1
index e2abcd105966..d8ed5c6d0336 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.4.1-r1
+++ b/metadata/md5-cache/app-emulation/protontricks-1.4.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( app-emulation/winetricks python_single_target_python3_6? ( dev-python/vdf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+BDEPEND=test? ( app-emulation/winetricks python_single_target_python3_6? ( dev-python/vdf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/vdf[python_targets_python3_9(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DESCRIPTION=app-emulation/winetricks wrapper for Proton (Steam Play) games
 EAPI=7
 HOMEPAGE=https://github.com/Matoking/protontricks
-IUSE=+gui test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+gui test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=app-emulation/winetricks python_single_target_python3_6? ( dev-python/vdf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=app-emulation/winetricks python_single_target_python3_6? ( dev-python/vdf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/vdf[python_targets_python3_9(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Matoking/protontricks/archive/1.4.1.tar.gz -> protontricks-1.4.1.gh.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7eb2aba7826acb07a98db8f98b8d9a77
+_md5_=5482dd3489a6ab52373b962276289ae2
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 616b35514f94..5685b6242ae8 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/byobu-5.130-r1 b/metadata/md5-cache/app-misc/byobu-5.130-r1
index fe0a9b585d6a..fcb642fa0327 100644
--- a/metadata/md5-cache/app-misc/byobu-5.130-r1
+++ b/metadata/md5-cache/app-misc/byobu-5.130-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install prepare setup
 DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
 EAPI=7
-HOMEPAGE=http://byobu.co
+HOMEPAGE=https://byobu.org
 IUSE=screen python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=https://launchpad.net/byobu/trunk/5.130/+download/byobu_5.130.orig.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7949b9257fcd1d76d1b8ca10b19b0d3b
+_md5_=f849ff80739085195be7cb110df4b960
diff --git a/metadata/md5-cache/app-misc/cbrpager-0.9.22 b/metadata/md5-cache/app-misc/cbrpager-0.9.22
deleted file mode 100644
index 97e1e869b972..000000000000
--- a/metadata/md5-cache/app-misc/cbrpager-0.9.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=|| ( app-arch/unrar app-arch/rar ) >=gnome-base/libgnomeui-2 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=a simple comic book pager
-EAPI=6
-HOMEPAGE=http://cbrpager.sourceforge.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( app-arch/unrar app-arch/rar ) >=gnome-base/libgnomeui-2
-SLOT=0
-SRC_URI=mirror://sourceforge/cbrpager/cbrpager-0.9.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8
-_md5_=eb920a40860e50fa8bca654f2873138d
diff --git a/metadata/md5-cache/app-misc/ignuit-2.24.3 b/metadata/md5-cache/app-misc/ignuit-2.24.3
deleted file mode 100644
index f9b2660502cc..000000000000
--- a/metadata/md5-cache/app-misc/ignuit-2.24.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/gnome-doc-utils-0.3.2 dev-libs/glib:2 dev-libs/libxml2:2 >=dev-libs/libxslt-1.1.28 >=gnome-base/libgnomeui-2.24.5 >=gnome-base/gconf-3.2.6:2 gnome-base/libglade:2.0 >=media-libs/gstreamer-1.8.2:1.0 x11-libs/gtk+:2 x11-libs/pango latex? ( app-text/dvipng virtual/latex-base ) >=dev-util/intltool-0.50.0 sys-devel/gettext app-text/gnome-doc-utils >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Memorization aid based on the Leitner flashcard system
-EAPI=6
-HOMEPAGE=http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit
-IUSE=examples latex
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=>=app-text/gnome-doc-utils-0.3.2 dev-libs/glib:2 dev-libs/libxml2:2 >=dev-libs/libxslt-1.1.28 >=gnome-base/libgnomeui-2.24.5 >=gnome-base/gconf-3.2.6:2 gnome-base/libglade:2.0 >=media-libs/gstreamer-1.8.2:1.0 x11-libs/gtk+:2 x11-libs/pango latex? ( app-text/dvipng virtual/latex-base )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~leio/distfiles/ignuit-2.24.3.testing.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f35de1370f6a9deb3cb79f658d586a0f
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index f892ab95fcc8..a7801fb3c10d 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/impressive-0.12.0 b/metadata/md5-cache/app-office/impressive-0.12.0
deleted file mode 100644
index af8f5f9742e8..000000000000
--- a/metadata/md5-cache/app-office/impressive-0.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Stylish way of giving presentations with Python
-EAPI=6
-HOMEPAGE=http://impressive.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-apps/xrandr app-text/mupdf || ( media-fonts/dejavu media-fonts/corefonts )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/impressive/Impressive/0.12.0/Impressive-0.12.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b724647a86d9d0720e14bf5b81e1737
diff --git a/metadata/md5-cache/app-office/impressive-0.13.0_beta2 b/metadata/md5-cache/app-office/impressive-0.13.0_beta2
new file mode 100644
index 000000000000..5aa16a945558
--- /dev/null
+++ b/metadata/md5-cache/app-office/impressive-0.13.0_beta2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Stylish way of giving presentations with Python
+EAPI=7
+HOMEPAGE=http://impressive.sourceforge.net/
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-text/mupdf dev-python/pygame[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-apps/xrandr || ( media-fonts/dejavu media-fonts/corefonts )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://sourceforge/impressive/Impressive/0.13.0-beta2/Impressive-0.13.0-beta2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b6eff04df452de6a834cd203fbe40699
diff --git a/metadata/md5-cache/app-office/scribus-1.5.5_p20200626 b/metadata/md5-cache/app-office/scribus-1.5.5_p20200626
new file mode 100644
index 000000000000..0395b543efdd
--- /dev/null
+++ b/metadata/md5-cache/app-office/scribus-1.5.5_p20200626
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Desktop publishing (DTP) and layout program
+EAPI=7
+HOMEPAGE=https://www.scribus.net/
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
+SLOT=0
+SRC_URI=https://github.com/scribusproject/scribus/archive/aa84120d97003a03d883db33ea9a6ad28550e59a.tar.gz -> scribus-1.5.5_p20200626.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e47ef592f0b2ee7163b52076464b7589
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 8a8174c59dcc..10528921b3af 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=7
 HOMEPAGE=https://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) tk? ( scripts )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4cfdfeb3cd828ac17556eb8a0b9e7a9
+_md5_=53bb1f507a28ac4860c6e637f7d6294a
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index 443d08b9eecd..bccac00e44e5 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/languagetool-3.4 b/metadata/md5-cache/app-officeext/languagetool-3.4
deleted file mode 100644
index 09ab32e3f75b..000000000000
--- a/metadata/md5-cache/app-officeext/languagetool-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm unpack
-DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice[java] app-office/libreoffice-bin[java] ) ) office_implementation_openoffice? ( app-office/openoffice-bin[java] ) app-arch/unzip
-DESCRIPTION=Style and Grammar Checker for libreoffice
-EAPI=5
-HOMEPAGE=https://www.languagetool.org/
-IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.8 office_implementation_libreoffice? ( || ( app-office/libreoffice[java] app-office/libreoffice-bin[java] ) ) office_implementation_openoffice? ( app-office/openoffice-bin[java] )
-REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
-SLOT=0
-SRC_URI=https://www.languagetool.org/download/LanguageTool-3.4.oxt
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	office-ext-r1	c5599254918ad9dfc276c949247566af	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=801b15d0cf765c94839dab065331fee9
diff --git a/metadata/md5-cache/app-officeext/languagetool-3.5 b/metadata/md5-cache/app-officeext/languagetool-5.0
similarity index 56%
rename from metadata/md5-cache/app-officeext/languagetool-3.5
rename to metadata/md5-cache/app-officeext/languagetool-5.0
index 822ac88841cc..c39972d4abb2 100644
--- a/metadata/md5-cache/app-officeext/languagetool-3.5
+++ b/metadata/md5-cache/app-officeext/languagetool-5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst prerm unpack
 DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice[java] app-office/libreoffice-bin[java] ) ) office_implementation_openoffice? ( app-office/openoffice-bin[java] ) app-arch/unzip
 DESCRIPTION=Style and Grammar Checker for libreoffice
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.languagetool.org/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
 KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
+LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8 office_implementation_libreoffice? ( || ( app-office/libreoffice[java] app-office/libreoffice-bin[java] ) ) office_implementation_openoffice? ( app-office/openoffice-bin[java] )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
-SRC_URI=https://www.languagetool.org/download/LanguageTool-3.5.oxt
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	office-ext-r1	c5599254918ad9dfc276c949247566af	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7791e13707f90c5e69df2a062c5b9239
+SRC_URI=https://www.languagetool.org/download/LanguageTool-5.0.oxt
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	office-ext-r1	c5599254918ad9dfc276c949247566af
+_md5_=b71fbfa98ffa5c26089495d75f706ce4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0bcade3c53b2..e273355b455d 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/c2ps-4.0 b/metadata/md5-cache/app-text/c2ps-4.0
index 9774d3a23e05..aa7d695482b5 100644
--- a/metadata/md5-cache/app-text/c2ps-4.0
+++ b/metadata/md5-cache/app-text/c2ps-4.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Generates a beautified ps document from a source file (c/c++)
 EAPI=7
-HOMEPAGE=http://www.cs.technion.ac.il/users/c2ps
+HOMEPAGE=https://www.cs.technion.ac.il/users/c2ps
 KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
+LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://www.cs.technion.ac.il/users/c2ps/c2ps-4.0.tar.gz
+SRC_URI=https://www.cs.technion.ac.il/users/c2ps/c2ps-4.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0104c983006d3565c623de3400f5d762
+_md5_=97c7c9aac1f87addf4938d4bff09213f
diff --git a/metadata/md5-cache/app-text/nuspell-3.1.2 b/metadata/md5-cache/app-text/nuspell-3.1.2
new file mode 100644
index 000000000000..dc4704d862f6
--- /dev/null
+++ b/metadata/md5-cache/app-text/nuspell-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/icu doc? ( app-text/ronn ) test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu]
+DESCRIPTION=Spell checker library and CLI for complex natural languages
+EAPI=7
+HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/icu
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://github.com/nuspell/nuspell/archive/v3.1.2.tar.gz -> nuspell-3.1.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d2a820b74b503155047fc979dd94910
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index ff4ab1129ec8..a69f3dae6f34 100644
Binary files a/metadata/md5-cache/dev-erlang/Manifest.gz and b/metadata/md5-cache/dev-erlang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.23 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.23
new file mode 100644
index 000000000000..81f0ce41f7ce
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=In-memory cache Erlang and Elixir library
+EAPI=6
+HOMEPAGE=https://github.com/processone/cache_tab
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/cache_tab/archive/1.0.23.tar.gz -> cache_tab-1.0.23.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=2f051ec39da7e79a08bd82e808418c14
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.8 b/metadata/md5-cache/dev-erlang/epam-1.0.8
new file mode 100644
index 000000000000..804dda96fe31
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=epam for ejabberd to help with PAM authentication support
+EAPI=6
+HOMEPAGE=https://github.com/processone/epam
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/epam/archive/1.0.8.tar.gz -> epam-1.0.8.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0dbf8e67e261f38ab0983242f4c764d2
diff --git a/metadata/md5-cache/dev-erlang/jiffy-1.0.5 b/metadata/md5-cache/dev-erlang/jiffy-1.0.5
new file mode 100644
index 000000000000..4eb24f56253f
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/jiffy-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=JSON NIFs for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/davisp/jiffy
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT BSD
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/davisp/jiffy/archive/1.0.5.tar.gz -> jiffy-1.0.5.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=1b7392a8951ed671b2676438f6cf54ba
diff --git a/metadata/md5-cache/dev-erlang/lager-3.8.0 b/metadata/md5-cache/dev-erlang/lager-3.8.0
index ea7237698edd..806959c953c4 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.8.0
+++ b/metadata/md5-cache/dev-erlang/lager-3.8.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/erlang-lager/lager
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-20.0 dev-lang/erlang:=
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/erlang-lager/lager/archive/3.8.0.tar.gz -> lager-3.8.0.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=33770935b8535d8c401d2ed8d30de5d6
+_md5_=0c3aa285695073f113d2653b72328e15
diff --git a/metadata/md5-cache/dev-erlang/proper-1.3 b/metadata/md5-cache/dev-erlang/proper-1.3
index cef22c815762..fb2079ee7d26 100644
--- a/metadata/md5-cache/dev-erlang/proper-1.3
+++ b/metadata/md5-cache/dev-erlang/proper-1.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/manopapad/proper
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/manopapad/proper/archive/v1.3.tar.gz -> proper-1.3.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=a727b0504ee082014c44e5ca3c59c418
+_md5_=46d1e16f7372a475d5b0de86a9514438
diff --git a/metadata/md5-cache/dev-erlang/sqlite3-1.1.7 b/metadata/md5-cache/dev-erlang/sqlite3-1.1.7
new file mode 100644
index 000000000000..7c3c5c16bd9a
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/sqlite3-1.1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=SQLite gen_server port for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/processone/erlang-sqlite3
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/erlang-sqlite3/archive/1.1.7.tar.gz -> sqlite3-1.1.7.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=f110e620311d11c9cc1709dbf9632c14
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 75a450e8b495..b3b87b24d1e9 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/cardpics-0.4 b/metadata/md5-cache/dev-games/cardpics-0.4
deleted file mode 100644
index adb3f77b1434..000000000000
--- a/metadata/md5-cache/dev-games/cardpics-0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=set of free cards sets
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/cardpics/
-KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/cardpics/cardpics-0.4.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ccee334f657015b53e5090362edb55e9
diff --git a/metadata/md5-cache/dev-games/cardpics-0.4-r1 b/metadata/md5-cache/dev-games/cardpics-0.4-r1
index 2d9c7121a02a..c1fee3f7cc3a 100644
--- a/metadata/md5-cache/dev-games/cardpics-0.4-r1
+++ b/metadata/md5-cache/dev-games/cardpics-0.4-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=set of free cards sets
 EAPI=6
-HOMEPAGE=http://www.nongnu.org/cardpics/
+HOMEPAGE=https://www.nongnu.org/cardpics/
 KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/cardpics/cardpics-0.4.tar.bz2
-_md5_=70737eb33133c5c930300dbb417626be
+SRC_URI=https://download.savannah.gnu.org/releases/cardpics/cardpics-0.4.tar.bz2
+_md5_=428ad3d9e25e16a0d85a2396952c1b6c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d9ee10902b94..0128f935d911 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/erlang-21.1.1 b/metadata/md5-cache/dev-lang/erlang-21.1.1
index 3c5632b029df..3144d7f41617 100644
--- a/metadata/md5-cache/dev-lang/erlang-21.1.1
+++ b/metadata/md5-cache/dev-lang/erlang-21.1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=6
 HOMEPAGE=https://www.erlang.org/
 IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/21.1.1
 SRC_URI=https://github.com/erlang/otp/archive/OTP-21.1.1.tar.gz -> erlang-21.1.1.tar.gz http://erlang.org/download/otp_doc_man_21.1.tar.gz -> erlang_doc_man_21.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.1.tar.gz -> erlang_doc_html_21.1.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=b13339e34104c931009c4e2a7c42e1a7
+_md5_=3cf337bfd890f3d20901426e8e77023c
diff --git a/metadata/md5-cache/dev-lang/erlang-22.3.2 b/metadata/md5-cache/dev-lang/erlang-22.3.2
index b87df59a3e22..b7534dad376b 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.3.2
+++ b/metadata/md5-cache/dev-lang/erlang-22.3.2
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=7
 HOMEPAGE=https://www.erlang.org/
 IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/22.3.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.3.2.tar.gz -> erlang-22.3.2.tar.gz http://erlang.org/download/otp_doc_man_22.3.tar.gz -> erlang_doc_man_22.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.3.tar.gz -> erlang_doc_html_22.3.tar.gz )
 _eclasses_=elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=f75a9ae54f12da404d8f8f234c936723
+_md5_=66ae759c61c7f83986e98090255a77ad
diff --git a/metadata/md5-cache/dev-lang/erlang-22.3.4 b/metadata/md5-cache/dev-lang/erlang-22.3.4
index ca1b569514a1..ebe170ad225d 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.3.4
+++ b/metadata/md5-cache/dev-lang/erlang-22.3.4
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=7
 HOMEPAGE=https://www.erlang.org/
 IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/22.3.4
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.3.4.tar.gz -> erlang-22.3.4.tar.gz http://erlang.org/download/otp_doc_man_22.3.tar.gz -> erlang_doc_man_22.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.3.tar.gz -> erlang_doc_html_22.3.tar.gz )
 _eclasses_=elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=e0a7098e892f5d277f5c5c029b638e24
+_md5_=efda848b93321bdfbf05193d2cbe872a
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0.1 b/metadata/md5-cache/dev-lang/erlang-23.0.1
index 8e22eb940a7d..4f298ef4af92 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.0.1
+++ b/metadata/md5-cache/dev-lang/erlang-23.0.1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=7
 HOMEPAGE=https://www.erlang.org/
 IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.0.1
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.1.tar.gz -> erlang-23.0.1.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
 _eclasses_=elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=f75a9ae54f12da404d8f8f234c936723
+_md5_=66ae759c61c7f83986e98090255a77ad
diff --git a/metadata/md5-cache/dev-lang/julia-1.4.0-r2 b/metadata/md5-cache/dev-lang/julia-1.4.0-r2
index bc4d22b79eed..e822ce688409 100644
--- a/metadata/md5-cache/dev-lang/julia-1.4.0-r2
+++ b/metadata/md5-cache/dev-lang/julia-1.4.0-r2
@@ -11,4 +11,4 @@ RESTRICT=splitdebug
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.4.0/julia-1.4.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/35b1504507a7a4168caae3d78db54d1121b121e1 -> julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/5c632c57426f2e4246e3b64dd2fd088d3920f9e5 -> julia-utf8proc-5c632c57426f2e4246e3b64dd2fd088d3920f9e5.tar.gz https://api.github.com/repos/libgit2/libgit2/tarball/b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3 -> julia-libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz https://curl.haxx.se/ca/cacert-2020-01-01.pem -> julia-cacert-2020-01-01.pem http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz https://dev.gentoo.org/~tamiko/distfiles/Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz -> julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz !system-llvm? ( http://releases.llvm.org/8.0.1/llvm-8.0.1.src.tar.xz )
 _eclasses_=llvm	78f8b6f29bd3b0263a4c9a3785e5af71	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0056bbcb4643ea7b4347b57cef7679d5
+_md5_=12107603226ecc33e9d6a3786beec5d8
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
index d11d625b53a0..263010157a8c 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) ia64? ( test )
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cac5c66f331cd3fe34f35f79a974811f
+_md5_=9338a8c9877ab0598723918e65c4fd03
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-68.10.0 b/metadata/md5-cache/dev-lang/spidermonkey-68.10.0
new file mode 100644
index 000000000000..6d6b5a664589
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-68.10.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/python:2.7 test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-63.1:= >=dev-libs/nspr-4.21 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=7
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+IUSE=debug +jit test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-63.1:= >=dev-libs/nspr-4.21 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
+RESTRICT=!test? ( test )
+SLOT=68
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/source/firefox-68.10.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-14.tar.xz https://dev.gentoo.org/~whissi/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/~axs/mozilla/patchsets/firefox-68.0-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-68.6.0-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-68.6.0-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-68.6.0-patches-03.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=24bc585107a2e8cd4ed681702cb73660
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ad61be2e89ce..36cd40ed76da 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/gf2x-1.3.0 b/metadata/md5-cache/dev-libs/gf2x-1.3.0
index 8d1912a7023b..28a5562ab81c 100644
--- a/metadata/md5-cache/dev-libs/gf2x-1.3.0
+++ b/metadata/md5-cache/dev-libs/gf2x-1.3.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
 DESCRIPTION=C/C++ routines for fast arithmetic in GF(2)[x]
 EAPI=7
-HOMEPAGE=https://gitlab.inria.fr/thome/gf2x/ http://gforge.inria.fr/projects/gf2x/
+HOMEPAGE=https://gitlab.inria.fr/thome/gf2x/ https://gforge.inria.fr/projects/gf2x/
 IUSE=fft static-libs custom-tune cpu_flags_x86_pclmul cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0/3
 SRC_URI=https://gforge.inria.fr/frs/download.php/38243/gf2x-1.3.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=34875bdf5bc1914e7e21cb6d09d6a4a2
+_md5_=aad9374515ebbb9398da35aaa2ac1bb8
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.3-r1 b/metadata/md5-cache/dev-libs/libjcat-0.1.3-r1
new file mode 100644
index 000000000000..35e1ab7ea83a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] dev-python/setuptools[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] dev-python/setuptools[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) gtk-doc? ( dev-util/gtk-doc ) man? ( sys-apps/help2man ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
+DESCRIPTION=Library and tool for reading and writing Jcat files
+EAPI=7
+HOMEPAGE=https://github.com/hughsie/libjcat
+IUSE=gpg gtk-doc +introspection +man pkcs7 test vala
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.3.tar.gz -> libjcat-0.1.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	8f7dc8ed2d76af0b33328789c017e677	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66ed191b667154622f6dcae62ff05137
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.8.0 b/metadata/md5-cache/dev-libs/libnfc-1.8.0
new file mode 100644
index 000000000000..5358011dcaa8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnfc-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DESCRIPTION=Near Field Communications (NFC) library
+EAPI=7
+HOMEPAGE=http://www.libnfc.org/
+IUSE=doc pcsc-lite readline static-libs usb
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
+SLOT=0
+SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.8.0/libnfc-1.8.0.tar.bz2
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=31e40afafe61f9bc951ca40f44827ff2
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r2 b/metadata/md5-cache/dev-libs/stfl-0.24-r2
index 40af0a9ece6e..a6fbef70028a 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r2
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A library which implements a curses-based widget set for text termin
 EAPI=7
 HOMEPAGE=http://www.clifford.at/stfl/
 IUSE=examples perl python ruby static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ec025f8d0e26c0c4ecabfca731f5890
+_md5_=e13977369ea150f38aaa0d629f996c44
diff --git a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r3 b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r3
new file mode 100644
index 000000000000..d34b9489ebd2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Class-Mix-0.1.0 virtual/perl-Exporter >=virtual/perl-MIME-Base64-2.210.0 virtual/perl-XSLoader virtual/perl-parent dev-perl/Module-Build >=virtual/perl-ExtUtils-CBuilder-0.15 test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=the Eksblowfish block cipher
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-Eksblowfish
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Class-Mix-0.1.0 virtual/perl-Exporter >=virtual/perl-MIME-Base64-2.210.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=587139d13d3f93d8a9798e77309a1d65
diff --git a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0-r2 b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0-r2
new file mode 100644
index 000000000000..3604d6565c6c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An implementation of the IDEA symmetric-key block cipher
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-IDEA
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Crypt-IDEA
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=647077c03e296bf289801ed3c7ee477c
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0-r1 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0-r1
new file mode 100644
index 000000000000..7d8a7d599468
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/perl
+DESCRIPTION=OpenSSL's multiprecision integer arithmetic
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Bignum
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=71a3052a6afd261f788a687e41f42098
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.190.0-r2 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.190.0-r2
new file mode 100644
index 000000000000..74166a9f4ae3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.190.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( >=dev-libs/libressl-2.7.2 ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( >=dev-libs/libressl-2.7.2 ) dev-lang/perl
+DESCRIPTION=Digital Signature Algorithm using OpenSSL
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-DSA
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( >=dev-libs/libressl-2.7.2 ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-DSA-0.19.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=704f24a1321b669aa03eeba015ae27e8
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.320.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.320.0
new file mode 100644
index 000000000000..1b48559ec57d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.320.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.40.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl
+DESCRIPTION=Perl extension for OpenSSL EC (Elliptic Curves) library
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-EC
+IUSE=test libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.40.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Crypt-OpenSSL-EC-1.32.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=ae4ea76d1f98b691758edb273cc9d749
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r3 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r3
new file mode 100644
index 000000000000..8d3f2c6a7a05
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-perl/Crypt-OpenSSL-EC-0.50.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl
+DESCRIPTION=OpenSSL ECDSA (Elliptic Curve Digital Signature Algorithm) Perl extension
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-ECDSA
+IUSE=libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Crypt-OpenSSL-EC-0.50.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Crypt-OpenSSL-ECDSA-0.08.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=c9a575a25bd485298bdc7c682a4932c0
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
new file mode 100644
index 000000000000..47b7a034a42e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl
+DESCRIPTION=Guess OpenSSL include path
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Guess
+IUSE=libressl test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=8dfef69fafaa8726be08864a6d3927fa
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
new file mode 100644
index 000000000000..91c76bbf4f69
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=dev-perl/Crypt-OpenSSL-Guess-0.110.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl
+DESCRIPTION=RSA encoding and decoding using the OpenSSL libraries
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-RSA
+IUSE=libressl test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=74721f1084c93dfb4016119299a79654
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index dd73c7e9ba1d..bb83bf39158e 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-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 30538e55395c..05ab5f4c1058 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/argcomplete-1.11.1-r1 b/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
index 1f5be49b1f58..eb12fa7b32f9 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Bash tab completion for argparse
 EAPI=7
 HOMEPAGE=https://pypi.org/project/argcomplete/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.11.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=678a00e6ad16186a6528aa5a6bc7cd00
+_md5_=58dfedd17b5be20048ed5171cb13e7d9
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index 98d6586cd877..2174c4529695 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -5,7 +5,7 @@ DESCRIPTION=python-requests HTTP exchanges recorder
 EAPI=7
 HOMEPAGE=https://github.com/betamaxpy/betamax
 IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=737bab7d89abf77b5f56fe54e1cee54f
+_md5_=c4e6364d3fe200eceeb4638f4c73fd2d
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 1ad42a865697..733aab387466 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 ~arm ~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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6dcd9f5914c4845f879f933dd431ce4f
+_md5_=c5710f7946a782c7d73f5153dde70cbc
diff --git a/metadata/md5-cache/dev-python/django-2.2.14 b/metadata/md5-cache/dev-python/django-2.2.14
new file mode 100644
index 000000000000..1fdc80bb5594
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.2.14
@@ -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 ~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-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/2.2/Django-2.2.14.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f21960358919f5b2eaf608264e92aae2
diff --git a/metadata/md5-cache/dev-python/django-3.0.8 b/metadata/md5-cache/dev-python/django-3.0.8
new file mode 100644
index 000000000000..51b6a5749f50
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.0.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( dev-python/sphinx ) 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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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 python_targets_python3_9
+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_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.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[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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://www.djangoproject.com/m/releases/3.0/Django-3.0.8.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=36b0811f7710782fe8ebe8148b5b50f8
diff --git a/metadata/md5-cache/dev-python/gevent-1.4.0 b/metadata/md5-cache/dev-python/gevent-1.4.0
index 35cb7c9310d3..e755a9007258 100644
--- a/metadata/md5-cache/dev-python/gevent-1.4.0
+++ b/metadata/md5-cache/dev-python/gevent-1.4.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libev-4.23 >=net-dns/c-ares-1.12 >=dev-python/greenlet-0.4.14 virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
-HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.4.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=36c855aa698755ce5561ab5563316a84
+_md5_=c4d3c8f4e22b8235238dbb699c78c2f3
diff --git a/metadata/md5-cache/dev-python/gevent-20.5.1 b/metadata/md5-cache/dev-python/gevent-20.5.1
index 1cd3720cd98c..ff7628039885 100644
--- a/metadata/md5-cache/dev-python/gevent-20.5.1
+++ b/metadata/md5-cache/dev-python/gevent-20.5.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libev-4.23 >=net-dns/c-ares-1.12 >=dev-python/greenlet-0.4.14 virtual/python-greenlet[python_targets_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(-)] test? ( dev-python/psutil[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/requests[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-event[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[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
-HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
 IUSE=doc examples test 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-20.5.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9eaba15f7f193769c2a574c7ecb1249
+_md5_=83766902ab85c50e7141ec1662432f0f
diff --git a/metadata/md5-cache/dev-python/gevent-20.5.2 b/metadata/md5-cache/dev-python/gevent-20.5.2
index eb123e67a062..d36a69805fb4 100644
--- a/metadata/md5-cache/dev-python/gevent-20.5.2
+++ b/metadata/md5-cache/dev-python/gevent-20.5.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libev-4.23:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.14 virtual/python-greenlet[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(-)] test? ( dev-python/psutil[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/requests[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-event[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[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
-HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
 IUSE=doc examples test 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-20.5.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e370f1241615442ccc635509a5f6b25
+_md5_=c449f6afc12ade285dfc0f5f1caf6f4d
diff --git a/metadata/md5-cache/dev-python/gevent-20.6.0 b/metadata/md5-cache/dev-python/gevent-20.6.0
index 0fbd9e78a97f..20296c40f44e 100644
--- a/metadata/md5-cache/dev-python/gevent-20.6.0
+++ b/metadata/md5-cache/dev-python/gevent-20.6.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libev-4.23:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.14 virtual/python-greenlet[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(-)] test? ( dev-python/psutil[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/requests[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-event[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[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
-HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
 IUSE=doc examples test 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-20.6.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e370f1241615442ccc635509a5f6b25
+_md5_=c449f6afc12ade285dfc0f5f1caf6f4d
diff --git a/metadata/md5-cache/dev-python/gevent-20.6.1 b/metadata/md5-cache/dev-python/gevent-20.6.1
index f74ab0ed2610..01f153bb4728 100644
--- a/metadata/md5-cache/dev-python/gevent-20.6.1
+++ b/metadata/md5-cache/dev-python/gevent-20.6.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libev-4.23:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.14 virtual/python-greenlet[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(-)] test? ( dev-python/psutil[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/requests[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-event[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[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
-HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
 IUSE=doc examples test 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-20.6.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e370f1241615442ccc635509a5f6b25
+_md5_=c449f6afc12ade285dfc0f5f1caf6f4d
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.19.0 b/metadata/md5-cache/dev-python/hypothesis-5.19.0
new file mode 100644
index 000000000000..b12fb1dc5bc6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.19.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.19.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3a77c193ba2817b6a68d8c55195da54
diff --git a/metadata/md5-cache/dev-python/jupyter_client-6.1.5 b/metadata/md5-cache/dev-python/jupyter_client-6.1.5
new file mode 100644
index 000000000000..f34cf401d569
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_client-6.1.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-14.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(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-14.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(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=Jupyter protocol implementation and client libraries
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-14.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(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-6.1.5.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=658c387ccce599f4aed677536e3534c2
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.0.1 b/metadata/md5-cache/dev-python/keystoneauth-4.0.1
new file mode 100644
index 000000000000..862acb9e8bdd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.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(-)] >=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=This package contains tools for authenticating to an OpenStack-based cloud.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/keystoneauth
+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/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-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/k/keystoneauth1/keystoneauth1-4.0.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d003dd6505d91fd258a123686279375c
diff --git a/metadata/md5-cache/dev-python/networkx-2.4-r1 b/metadata/md5-cache/dev-python/networkx-2.4-r1
index 120d294c72e7..480781d9f9be 100644
--- a/metadata/md5-cache/dev-python/networkx-2.4-r1
+++ b/metadata/md5-cache/dev-python/networkx-2.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/decorator-4.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/matplotlib-2.2.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(-)] extras? ( >=dev-python/pydot-1.2.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-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) pandas? ( >=dev-python/pandas-0.23.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(-)] ) scipy? ( >=sci-libs/scipy-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(-)] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=test? ( >=sci-libs/scipy-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(-)] ) test? ( >=dev-python/decorator-4.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/matplotlib-2.2.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(-)] extras? ( >=dev-python/pydot-1.2.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-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) pandas? ( >=dev-python/pandas-0.23.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(-)] ) scipy? ( >=sci-libs/scipy-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(-)] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.4.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=ace33a3fe97b0fc3ceb782436fb35e10
+_md5_=9fa0c3fe0530c50af0339eb93566d76f
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.2 b/metadata/md5-cache/dev-python/passlib-1.7.2
index fee647975bd6..b54da72b97d7 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.2
+++ b/metadata/md5-cache/dev-python/passlib-1.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Password hashing framework supporting over 20 schemes
 EAPI=7
 HOMEPAGE=https://foss.heptapod.net/python-libs/passlib/wikis/home
 IUSE=+bcrypt doc +scrypt +totp test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 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=BSD-2
 RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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(-)] ) totp? ( dev-python/cryptography[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(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ea2df9fa30c5ddb280b8b8f161beb9f
+_md5_=1907bd95e1bb597fe78d667f843b8c08
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.2.0 b/metadata/md5-cache/dev-python/pyclipper-1.2.0
new file mode 100644
index 000000000000..a9a30684b6d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyclipper-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cython wrapper for the C++ translation of the Angus Johnson's Clipper library
+EAPI=7
+HOMEPAGE=https://github.com/fonttools/pyclipper
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~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 ) 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/fonttools/pyclipper/archive/1.2.0.tar.gz -> pyclipper-1.2.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7df342e58c764f61ee4a3915ca6e1fd
diff --git a/metadata/md5-cache/dev-python/pyicu-2.5 b/metadata/md5-cache/dev-python/pyicu-2.5
index ea7c70842034..1c20b766f3d4 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.5
+++ b/metadata/md5-cache/dev-python/pyicu-2.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-libs/icu:= >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-libs/icu:= >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/icu:=
 DESCRIPTION=Python bindings for dev-libs/icu
 EAPI=7
 HOMEPAGE=https://github.com/ovalhub/pyicu
-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
 LICENSE=MIT
-RDEPEND=dev-libs/icu:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-libs/icu:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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/PyICU/PyICU-2.5.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=44cfdb6d262650b78ca215746dcda96b
+_md5_=8a4b0f0c9f06de4df2fce1038f204875
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.3.2 b/metadata/md5-cache/dev-python/pypiserver-1.3.2
index 57d27fa6a9c4..663828dddbbe 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.3.2
+++ b/metadata/md5-cache/dev-python/pypiserver-1.3.2
@@ -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 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=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_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypiserver/pypiserver/archive/v1.3.2.tar.gz -> pypiserver-1.3.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2df52329582ce978ec1d4a6ba0b063cd
+_md5_=4397a5f6318508ccc4674e8bdbd4348f
diff --git a/metadata/md5-cache/dev-python/pytest-4.6.11 b/metadata/md5-cache/dev-python/pytest-4.6.11
index b0c8b776dbd6..089e966990d5 100644
--- a/metadata/md5-cache/dev-python/pytest-4.6.11
+++ b/metadata/md5-cache/dev-python/pytest-4.6.11
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=http://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.6.11.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a8a1a9f7fe4a7a85a145cf1dce506c87
+_md5_=c78e61ca7e789a9c70c3c05f00cbfd88
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0 b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
index 689408c81b23..89fbea436121 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Py.test plugin to test server connections locally
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-localserver/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/werkzeug-0.10[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-localserver/pytest-localserver-0.5.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=600645c7eb88387fd89a7fd0f3b6e0ee
+_md5_=a9fa8639f7a881a594f3da65796bb363
diff --git a/metadata/md5-cache/dev-python/readme_renderer-25.0 b/metadata/md5-cache/dev-python/readme_renderer-25.0
index 4dd8ed049633..f498c565533c 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 ~arm ~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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=144d8d1bcec041b251a02610e86c1c4a
+_md5_=534e48aebc27587d440489a13d90ad93
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
index 544bc83dae26..13014a8e2090 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=A utility belt for advanced users of python-requests
 EAPI=7
 HOMEPAGE=https://toolbelt.readthedocs.org/
 IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ea6a1aeef247db71fa959bb7b1a0062
+_md5_=3df24d2a40e47224212bdfe10bca4a80
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.13-r2 b/metadata/md5-cache/dev-python/scrypt-0.8.13-r2
index abc8ff70051e..5f0e262c6c9f 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.13-r2
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.13-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Bindings for the scrypt key derivation function library
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mhallin/py-scrypt/wiki/Home/
 IUSE=libressl 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 ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) 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/s/scrypt/scrypt-0.8.13.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3173cb8ecca95e7d6bbd213eb002e4ad
+_md5_=a69c19f3bbfb3a9bb7c2b077ad54746f
diff --git a/metadata/md5-cache/dev-python/towncrier-19.2.0 b/metadata/md5-cache/dev-python/towncrier-19.2.0
index 4b613896e62b..39f9fa9280e3 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 ~arm ~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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13625be99cae7256e6f06b47750bb8cf
+_md5_=9d0d351c1493fcf21cabac5659a2f395
diff --git a/metadata/md5-cache/dev-python/tox-3.16.1 b/metadata/md5-cache/dev-python/tox-3.16.1
new file mode 100644
index 000000000000..a6d01986f3e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.16.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] =dev-python/tox-3.16.1-r0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/3.16.1.tar.gz -> tox-3.16.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=93b612b08cead505859117273a2f8776
diff --git a/metadata/md5-cache/dev-python/tqdm-4.45.0 b/metadata/md5-cache/dev-python/tqdm-4.45.0
index be6986530dd2..3fd64cbeaec0 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 ~arm ~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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=302090a28a93dc147be2f233ecf49036
+_md5_=a05550f3867357fd5a43ee8b62d7ae4b
diff --git a/metadata/md5-cache/dev-python/twine-1.15.0 b/metadata/md5-cache/dev-python/twine-1.15.0
index fc7e6c7bcd50..7af89b1d24fb 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a195a52b402abe95ff81adca8ef4c7d2
+_md5_=f082758c80b22da518b450b2e213dab9
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.7.10 b/metadata/md5-cache/dev-python/virtualenv-16.7.10
index 990afcfc7b33..bf1297e2786e 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 ~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/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	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=478e7aa503c8e3bbffa12e880a60655d
+_md5_=974773905c6e34961c45bb2dadbab5f7
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.35 b/metadata/md5-cache/dev-python/webtest-2.0.35
index f43563203fc3..d3cd9225f074 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.35
+++ b/metadata/md5-cache/dev-python/webtest-2.0.35
@@ -4,7 +4,7 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/WebTest/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/paste[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/pastedeploy[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/webob-1.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/waitress-0.8.5[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/beautifulsoup: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= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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 ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.35.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f9de0b9a50d73932f8df5aedca53c244
+_md5_=44e740760c19442bb2adf478ec9d987a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index cd2158aa5a04..e4d60ec77134 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/zeitwerk-2.3.1 b/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
new file mode 100644
index 000000000000..2627daaf671b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Efficient and thread-safe code loader for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/fxn/zeitwerk
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.3.1.tar.gz -> zeitwerk-2.3.1.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9597854c2018b209449ec5bf6b21b294
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b72e2cedeac1..663d863b666c 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/bear-2.4.3 b/metadata/md5-cache/dev-util/bear-2.4.3
new file mode 100644
index 000000000000..c467bc33e8e5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bear-2.4.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( app-shells/bash python_single_target_python3_7? ( dev-python/lit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) )
+DESCRIPTION=Build EAR generates a compilation database for clang tooling
+EAPI=7
+HOMEPAGE=https://github.com/rizsotto/Bear
+IUSE=test python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rizsotto/Bear/archive/v2.4.3.tar.gz -> bear-2.4.3.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=98d00fd4d1452bc674a00b58c2294074
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.0_rc2 b/metadata/md5-cache/dev-util/cmake-3.18.0_rc3
similarity index 96%
rename from metadata/md5-cache/dev-util/cmake-3.18.0_rc2
rename to metadata/md5-cache/dev-util/cmake-3.18.0_rc3
index 8f71214233b1..4987b20b9d19 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.0_rc2
+++ b/metadata/md5-cache/dev-util/cmake-3.18.0_rc3
@@ -9,6 +9,6 @@ LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.0-rc2.tar.gz
+SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.0-rc3.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	19b0421555865baefd505831dd4303e3	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4071029ec824524aabd6bfd07ab2df3f
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 1be0019640fa..532d5ee97526 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/teeworlds-0.7.5 b/metadata/md5-cache/games-action/teeworlds-0.7.5
new file mode 100644
index 000000000000..245ac05654fb
--- /dev/null
+++ b/metadata/md5-cache/games-action/teeworlds-0.7.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!dedicated? ( app-arch/bzip2:= media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/pnglite media-sound/wavpack virtual/glu virtual/opengl x11-libs/libX11 ) dev-libs/openssl:0= sys-libs/zlib || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Online multi-player platform 2D shooter
+EAPI=7
+HOMEPAGE=https://www.teeworlds.com/
+IUSE=debug dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=!dedicated? ( app-arch/bzip2:= media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/pnglite media-sound/wavpack virtual/glu virtual/opengl x11-libs/libX11 ) dev-libs/openssl:0= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png https://github.com/teeworlds/teeworlds/archive/0.7.5.tar.gz -> teeworlds-0.7.5.tar.gz https://github.com/teeworlds/teeworlds-maps/archive/1d3401a37a3334e311faf18a22aeff0e0ac9ee65.tar.gz -> teeworlds-0.7.5-maps.tar.gz https://github.com/teeworlds/teeworlds-translation/archive/4ba6f824e9c34565e61340d25bc8c3cc004d40fb.tar.gz -> teeworlds-0.7.5-translation.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb47c749a64b611aac0d7573adf462b3
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index d2c9e5dfe666..266bad0f95fc 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/pioneers-15.3-r1 b/metadata/md5-cache/games-board/pioneers-15.5
similarity index 57%
rename from metadata/md5-cache/games-board/pioneers-15.3-r1
rename to metadata/md5-cache/games-board/pioneers-15.5
index 499c6a5dfa29..260fcd1a7d32 100644
--- a/metadata/md5-cache/games-board/pioneers-15.3-r1
+++ b/metadata/md5-cache/games-board/pioneers-15.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.26:2 !dedicated? ( >=x11-libs/gtk+-3.4:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/rarian >=gnome-base/libgnome-2.10 ) ) nls? ( virtual/libintl ) dev-util/gob:2 virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A clone of the popular board game The Settlers of Catan
+DEPEND=>=dev-libs/glib-2.28:2 !dedicated? ( >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/yelp-tools ) ) nls? ( virtual/libintl ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clone of the popular board game The Settlers of Catan
 EAPI=6
 HOMEPAGE=http://pio.sourceforge.net/
 IUSE=dedicated help nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 CC-BY-SA-4.0
-RDEPEND=>=dev-libs/glib-2.26:2 !dedicated? ( >=x11-libs/gtk+-3.4:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/rarian >=gnome-base/libgnome-2.10 ) ) nls? ( virtual/libintl )
+RDEPEND=>=dev-libs/glib-2.28:2 !dedicated? ( >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/yelp-tools ) ) nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=mirror://sourceforge/pio/pioneers-15.3.tar.gz
+SRC_URI=mirror://sourceforge/pio/pioneers-15.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec6675169fcbd29976d1f8c7eec21c94
+_md5_=e211ee475dc69450cb037f086f53b7f0
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 72f01f3c918c..ecdf975bdb80 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/alpine-2.22 b/metadata/md5-cache/mail-client/alpine-2.22
deleted file mode 100644
index 24d2e4760ad5..000000000000
--- a/metadata/md5-cache/mail-client/alpine-2.22
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=An easy to use text-based based mail and news client
-EAPI=7
-HOMEPAGE=http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/
-IUSE=doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-misc/mime-types
-SLOT=0
-SRC_URI=http://alpine.x10host.com/alpine/release/src/alpine-2.22.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a416f94d24890f5d9c33a2ee61c8c0b4
diff --git a/metadata/md5-cache/mail-client/alpine-2.22-r1 b/metadata/md5-cache/mail-client/alpine-2.22-r1
deleted file mode 100644
index 82b0192baf48..000000000000
--- a/metadata/md5-cache/mail-client/alpine-2.22-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=An easy to use text-based based mail and news client
-EAPI=7
-HOMEPAGE=http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/
-IUSE=+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-misc/mime-types
-SLOT=0
-SRC_URI=http://alpine.x10host.com/alpine/release/src/alpine-2.22.tar.xz chappa? ( http://alpine.x10host.com/alpine/patches/alpine-2.22/all.patch.gz -> alpine-2.22-chappa.patch.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b22a94616573b0c9f3392a6d1023ed0b
diff --git a/metadata/md5-cache/mail-client/thunderbird-68.10.0 b/metadata/md5-cache/mail-client/thunderbird-68.10.0
new file mode 100644
index 000000000000..7ed93df1b1ea
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-68.10.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.44.4 >=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 >=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.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.9[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=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free +gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo pulseaudio 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_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.44.4 >=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 >=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.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_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ar.xpi -> thunderbird-68.10.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ast.xpi -> thunderbird-68.10.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/be.xpi -> thunderbird-68.10.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/bg.xpi -> thunderbird-68.10.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/br.xpi -> thunderbird-68.10.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ca.xpi -> thunderbird-68.10.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/cak.xpi -> thunderbird-68.10.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/cs.xpi -> thunderbird-68.10.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/cy.xpi -> thunderbird-68.10.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/da.xpi -> thunderbird-68.10.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/de.xpi -> thunderbird-68.10.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/dsb.xpi -> thunderbird-68.10.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/el.xpi -> thunderbird-68.10.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.10.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.10.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.10.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/et.xpi -> thunderbird-68.10.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/eu.xpi -> thunderbird-68.10.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/fi.xpi -> thunderbird-68.10.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/fr.xpi -> thunderbird-68.10.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.10.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.10.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/gd.xpi -> thunderbird-68.10.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/gl.xpi -> thunderbird-68.10.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/he.xpi -> thunderbird-68.10.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hr.xpi -> thunderbird-68.10.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.10.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hu.xpi -> thunderbird-68.10.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.10.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/id.xpi -> thunderbird-68.10.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/is.xpi -> thunderbird-68.10.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/it.xpi -> thunderbird-68.10.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ja.xpi -> thunderbird-68.10.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ka.xpi -> thunderbird-68.10.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/kab.xpi -> thunderbird-68.10.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/kk.xpi -> thunderbird-68.10.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ko.xpi -> thunderbird-68.10.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/lt.xpi -> thunderbird-68.10.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ms.xpi -> thunderbird-68.10.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.10.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/nl.xpi -> thunderbird-68.10.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.10.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/pl.xpi -> thunderbird-68.10.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.10.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.10.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/rm.xpi -> thunderbird-68.10.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ro.xpi -> thunderbird-68.10.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ru.xpi -> thunderbird-68.10.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/si.xpi -> thunderbird-68.10.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sk.xpi -> thunderbird-68.10.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sl.xpi -> thunderbird-68.10.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sq.xpi -> thunderbird-68.10.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sr.xpi -> thunderbird-68.10.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.10.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/tr.xpi -> thunderbird-68.10.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/uk.xpi -> thunderbird-68.10.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/uz.xpi -> thunderbird-68.10.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/vi.xpi -> thunderbird-68.10.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.10.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.10.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/source/thunderbird-68.10.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.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	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=884498db9e5e3f4b0d72820c91918c87
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-68.10.0 b/metadata/md5-cache/mail-client/thunderbird-bin-68.10.0
new file mode 100644
index 000000000000..667c84969928
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-68.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=app-arch/unzip app-arch/zip app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ar.xpi -> thunderbird-68.10.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ast.xpi -> thunderbird-68.10.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/be.xpi -> thunderbird-68.10.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/bg.xpi -> thunderbird-68.10.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/br.xpi -> thunderbird-68.10.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ca.xpi -> thunderbird-68.10.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/cs.xpi -> thunderbird-68.10.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/cy.xpi -> thunderbird-68.10.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/da.xpi -> thunderbird-68.10.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/de.xpi -> thunderbird-68.10.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/el.xpi -> thunderbird-68.10.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.10.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.10.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.10.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/et.xpi -> thunderbird-68.10.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/eu.xpi -> thunderbird-68.10.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/fi.xpi -> thunderbird-68.10.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/fr.xpi -> thunderbird-68.10.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.10.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.10.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/gd.xpi -> thunderbird-68.10.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/gl.xpi -> thunderbird-68.10.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/he.xpi -> thunderbird-68.10.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hr.xpi -> thunderbird-68.10.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.10.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hu.xpi -> thunderbird-68.10.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.10.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/id.xpi -> thunderbird-68.10.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/is.xpi -> thunderbird-68.10.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/it.xpi -> thunderbird-68.10.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ja.xpi -> thunderbird-68.10.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ko.xpi -> thunderbird-68.10.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/lt.xpi -> thunderbird-68.10.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.10.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/nl.xpi -> thunderbird-68.10.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.10.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/pl.xpi -> thunderbird-68.10.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.10.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.10.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/rm.xpi -> thunderbird-68.10.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ro.xpi -> thunderbird-68.10.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/ru.xpi -> thunderbird-68.10.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/si.xpi -> thunderbird-68.10.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sk.xpi -> thunderbird-68.10.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sl.xpi -> thunderbird-68.10.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sq.xpi -> thunderbird-68.10.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sr.xpi -> thunderbird-68.10.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.10.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/tr.xpi -> thunderbird-68.10.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/uk.xpi -> thunderbird-68.10.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/vi.xpi -> thunderbird-68.10.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.10.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.10.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-US/thunderbird-68.10.0.tar.bz2 -> thunderbird-bin_x86_64-68.10.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-US/thunderbird-68.10.0.tar.bz2 -> thunderbird-bin_i686-68.10.0.tar.bz2 ) https://dev.gentoo.org/~juippis/distfiles/lightning-68.0b6.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	798d8c84c9e7a8105e56c9eb6626e643	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	2477ebe553d3e4d2c606191fe6c33602	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b14573edb3068ddd29b474a1dbdb9ba1
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6eb2901d9668..8737400a7d19 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/exiv2-0.27.3_rc2 b/metadata/md5-cache/media-gfx/exiv2-0.27.3
similarity index 87%
rename from metadata/md5-cache/media-gfx/exiv2-0.27.3_rc2
rename to metadata/md5-cache/media-gfx/exiv2-0.27.3
index 102c8645ef40..080b7d5c150d 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.3_rc2
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.3
@@ -1,13 +1,14 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( >net-libs/libssh-0.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
 EAPI=7
 HOMEPAGE=https://www.exiv2.org/
 IUSE=doc examples nls +png webready +xmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( >net-libs/libssh-0.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/27
-SRC_URI=https://pre-release.exiv2.org/builds/exiv2-0.27.3.20-Source.tar.gz
+SRC_URI=https://exiv2.org/builds/exiv2-0.27.3-Source.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c0438137bc84cc9e5b3fc4df9544d18
+_md5_=1db477ac43b43890d4969007936a6bc8
diff --git a/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1 b/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
deleted file mode 100644
index 2515912ec4d5..000000000000
--- a/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/imagemagick:= media-libs/lcms:2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig app-text/ghostscript-gpl python_targets_python2_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=Convert vector graphic file formats like .cdr, .svg, wmf and more.
-EAPI=6
-HOMEPAGE=https://sk1project.net/modules.php?name=Products&product=uniconvertor
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/imagemagick:= media-libs/lcms:2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/uniconvertor-2.0_pre379.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aaffadff34c3f6913b664d592c0462ae
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8e17b3d246ee..df455431d564 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/libtgvoip-2.4.4_p20200627-r1 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200701
similarity index 84%
rename from metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200627-r1
rename to metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200701
index efe14380bdb7..972e11451556 100644
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200627-r1
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200701
@@ -10,6 +10,6 @@ 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/d40d077ddab10a81fe619477cea8380cfa7efcea.tar.gz -> libtgvoip-2.4.4_p20200627.tar.gz
+SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/ad55e7403ab7f268304ae9045eddef479a574ae5.tar.gz -> libtgvoip-2.4.4_p20200701.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fdac75f012d39452df775b808fa829e8
+_md5_=5f5babebae5bc9c388bc18eb61c99f74
diff --git a/metadata/md5-cache/media-libs/mlt-6.20.0-r2 b/metadata/md5-cache/media-libs/mlt-6.20.0-r2
index 7c663c45b7fc..e8af15deae8a 100644
--- a/metadata/md5-cache/media-libs/mlt-6.20.0-r2
+++ b/metadata/md5-cache/media-libs/mlt-6.20.0-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.20.0/mlt-6.20.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40c7c2c3261e863124ee8ac221a3aeac
+_md5_=472756cc69796ec468b1d3f825f00653
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index ddfc238211f5..a380a3dde0dd 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/xmltv-0.6.1 b/metadata/md5-cache/media-tv/xmltv-0.6.1
index 4da3a36ce5c7..5ff245a17c86 100644
--- a/metadata/md5-cache/media-tv/xmltv-0.6.1
+++ b/metadata/md5-cache/media-tv/xmltv-0.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
 EAPI=7
 HOMEPAGE=http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv
 IUSE=ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite
-KEYWORDS=~amd64 ~arm64 ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/File-Slurp dev-perl/JSON dev-perl/libwww-perl dev-perl/Lingua-Preferred dev-perl/PerlIO-gzip dev-perl/Term-ProgressBar dev-perl/TermReadKey dev-perl/XML-Parser dev-perl/XML-TreePP dev-perl/XML-Twig dev-perl/XML-Writer dev-perl/Unicode-String virtual/perl-Memoize virtual/perl-Storable virtual/perl-IO-Compress ar? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) ch-search? ( dev-perl/HTML-Tree dev-perl/HTML-Parser dev-perl/HTTP-Cookies dev-perl/URI ) dk? ( dev-perl/DateTime dev-perl/IO-stringy ) dtvla? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) eu-dotmedia? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) eu-epgdata? ( dev-perl/Archive-Zip dev-perl/DateTime dev-perl/DateTime-Format-Strptime dev-perl/HTML-Parser dev-perl/HTTP-Message ) eu-xmltvse? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree dev-perl/LWP-Protocol-https dev-perl/URI ) fi-sv? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/IO-stringy ) fr? ( dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/HTML-Parser dev-perl/HTML-Tree ) huro? ( dev-perl/HTML-Parser dev-perl/HTML-Tree ) il? ( dev-perl/DateTime ) is? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI dev-perl/XML-DOM dev-perl/XML-LibXSLT ) it? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI ) na-dd? ( dev-perl/SOAP-Lite ) na-dtv? ( dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/URI ) na-tvmedia? ( dev-perl/XML-LibXML ) pt-meo? ( dev-perl/DateTime dev-perl/XML-LibXML ) pt-vodafone? ( dev-perl/DateTime dev-perl/URI dev-perl/XML-LibXML ) se-swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML ) se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) tr? ( dev-perl/DateTime dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) uk-bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy ) uk-tvguide? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) zz-sdjson? ( dev-lang/perl dev-perl/DateTime virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny ) zz-sdjson-sqlite? ( dev-lang/perl dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-SQLite dev-perl/DateTime-TimeZone dev-perl/DBD-SQLite dev-perl/DBI virtual/perl-Digest-SHA dev-perl/File-HomeDir dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined ) tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv-combiner? ( dev-perl/XML-LibXML ) tv-pick-cgi? ( dev-perl/CGI ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/XMLTV/xmltv/archive/v0.6.1.tar.gz -> xmltv-0.6.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=396bc11241ffa080298978cd53c27e30
+_md5_=8808e29b9f784ec013632018fa3a164a
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ec2d3b0b120f..9e4c5b210a74 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/netdata-1.23.1 b/metadata/md5-cache/net-analyzer/netdata-1.23.1
new file mode 100644
index 000000000000..e851e9d2f5fe
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.23.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 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=7
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IUSE=caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/archive/v1.23.1.tar.gz -> netdata-1.23.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=87d2dca0438a500f229045bb6ff05f52
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
new file mode 100644
index 000000000000..4a0add2ed856
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 system to store and display time-series data
+EAPI=6
+HOMEPAGE=https://oss.oetiker.ch/rrdtool/
+IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
+RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0/8.0.0
+SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95f483fd60250db6aa3c4127a37ecf6a
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.5 b/metadata/md5-cache/net-analyzer/wireshark-3.2.5
new file mode 100644
index 000000000000..0343228a481a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.2.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=plugin-ifdemo? ( plugins )
+RESTRICT=test
+SLOT=0/3.2.5
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.5.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b3a1dc0ab8e2dc32f8f315c78cc5421
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 909e0d16c2a8..7f16b3e666f4 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/maradns-2.0.09-r2 b/metadata/md5-cache/net-dns/maradns-2.0.09-r2
deleted file mode 100644
index 55168969143d..000000000000
--- a/metadata/md5-cache/net-dns/maradns-2.0.09-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A security-aware DNS server
-EAPI=6
-HOMEPAGE=http://www.maradns.org/
-IUSE=authonly examples ipv6
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=BSD-2 GPL-2
-SLOT=0
-SRC_URI=http://www.maradns.org/download/2.0/2.0.09/maradns-2.0.09.tar.bz2
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=71d3304af097f4f44688844b8e13d9c5
diff --git a/metadata/md5-cache/net-dns/maradns-2.0.14 b/metadata/md5-cache/net-dns/maradns-2.0.14
deleted file mode 100644
index 47237b9ca4bf..000000000000
--- a/metadata/md5-cache/net-dns/maradns-2.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig
-DESCRIPTION=A security-aware DNS server
-EAPI=6
-HOMEPAGE=http://www.maradns.org/
-IUSE=authonly examples ipv6 +python_single_target_python2_7
-KEYWORDS=~amd64 ~mips ~ppc ~x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://www.maradns.org/download/2.0/2.0.14/maradns-2.0.14.tar.bz2
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f6a5a7d1eef29e5dbe866ce66256565f
diff --git a/metadata/md5-cache/net-dns/maradns-3.5.0005 b/metadata/md5-cache/net-dns/maradns-3.5.0005
new file mode 100644
index 000000000000..38efc278dc8a
--- /dev/null
+++ b/metadata/md5-cache/net-dns/maradns-3.5.0005
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=A security-aware DNS server
+EAPI=7
+HOMEPAGE=http://www.maradns.org/
+IUSE=examples ipv6
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) acct-user/maradns acct-group/maradns acct-user/duende dev-lang/perl
+SLOT=0
+SRC_URI=https://maradns.samiam.org/download/3.5/3.5.0005/maradns-3.5.0005.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e3ed9a8fcaeab253dc1dbaa083254cfa
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.3.2 b/metadata/md5-cache/net-dns/pdns-recursor-4.3.2
new file mode 100644
index 000000000000..302f8756d4f2
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.3.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug dnstap libressl luajit protobuf snmp sodium systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
+REQUIRED_USE=dnstap? ( protobuf )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.3.2.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=65fa21187968886a59f16c5bc3d961a3
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 01c4b23c7357..dff69649284c 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
new file mode 100644
index 000000000000..9eb30d8c73bd
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+DESCRIPTION=Single Packet Authorization and Port Knocking application
+EAPI=7
+HOMEPAGE=https://www.cipherdyne.org/fwknop/
+IUSE=+client extras firewalld gdbm gpg +iptables nfqueue +server static-libs udp-server kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+REQUIRED_USE=nfqueue? ( server ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
+SLOT=0
+SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3f62fa04861060ff83dd9cc8d6a0a74f
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 208dac755ada..8d4aa117d84a 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/telegram-desktop-2.1.14 b/metadata/md5-cache/net-im/telegram-desktop-2.1.16
similarity index 92%
rename from metadata/md5-cache/net-im/telegram-desktop-2.1.14
rename to metadata/md5-cache/net-im/telegram-desktop-2.1.16
index ec87c3011bf3..03d7f2ab6581 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.1.14
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.16
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) !net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,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_p20200627[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:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2[jpeg,X?] x11-libs/gtk+:3[X?,wayland?] x11-libs/libX11 ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3*
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) !net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,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_p20200701[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:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2[jpeg,X?] x11-libs/gtk+:3[X?,wayland?] x11-libs/libX11 ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3*
 DESCRIPTION=Official desktop client for Telegram
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
 IUSE=+alsa +dbus enchant +gtk +hunspell libressl pulseaudio +spell wayland +X
 KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-3-with-openssl-exception
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,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_p20200627[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:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2[jpeg,X?] x11-libs/gtk+:3[X?,wayland?] x11-libs/libX11 ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,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_p20200701[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:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2[jpeg,X?] x11-libs/gtk+:3[X?,wayland?] x11-libs/libX11 ) 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.14/tdesktop-2.1.14-full.tar.gz
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.1.16/tdesktop-2.1.16-full.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f412ba90c99491b6ffeeb8b97b350d2
+_md5_=a36ab47f3fb42f76d38af757f6fe39b1
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index ab1807637bd6..153d3de163c0 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/weechat-2.7.1 b/metadata/md5-cache/net-irc/weechat-2.7.1
deleted file mode 100644
index 2328cc7e0097..000000000000
--- a/metadata/md5-cache/net-irc/weechat-2.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ppc64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://weechat.org/files/src/weechat-2.7.1.tar.xz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=378f87702f6de3595b763d36f041d6c1
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 625bf9a6f351..0eda860ae09b 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0 ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
-IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc man nls test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0 ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=549a3f9fd180c44f533e617827bdb2dd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4036f1a52a0b93c1efa2d9719850e01f
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c1463e1844e9..7b7727a732f9 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/rpcsvc-proto-1.4.2 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.2
new file mode 100644
index 000000000000..060c8c4bc59c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=sys-devel/gettext
+DESCRIPTION=rpcsvc protocol definitions from glibc
+EAPI=7
+HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD
+RDEPEND=!<sys-libs/glibc-2.26 virtual/libintl
+SLOT=0
+SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.2.tar.gz -> rpcsvc-proto-1.4.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=08319a7511c91e4ea56e803cc5f52ca2
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 61170be3d76d..0b8f54dc00b3 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/geoipupdate-4.3.0 b/metadata/md5-cache/net-misc/geoipupdate-4.3.0
index 64e82392c978..c0f547b77ab3 100644
--- a/metadata/md5-cache/net-misc/geoipupdate-4.3.0
+++ b/metadata/md5-cache/net-misc/geoipupdate-4.3.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=ISC BSD BSD-2 MIT Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.3.0.tar.gz -> geoipupdate-4.3.0.tar.gz mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/maxmind/geoipupdate/@v/v4.0.2+incompatible.zip -> github.com%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	go-module	45394825d9260b479aa1cf252ea58e01
-_md5_=e88c665faae9a2f5050a20abab0ab4a4
+_md5_=262af61d3a7c5762d8696ab2bdc2f895
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.4 b/metadata/md5-cache/net-misc/icecast-2.4.4
index ff3eb69512a7..6b3db611f16f 100644
--- a/metadata/md5-cache/net-misc/icecast-2.4.4
+++ b/metadata/md5-cache/net-misc/icecast-2.4.4
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
 DESCRIPTION=Opensource alternative to shoutcast that supports mp3, ogg and aac streaming
 EAPI=7
-HOMEPAGE=http://www.icecast.org/
+HOMEPAGE=https://www.icecast.org/
 IUSE=kate libressl logrotate +speex +ssl +theora +yp
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
 SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
+SRC_URI=https://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=70d8b0334afd12e19c80de652550b669
+_md5_=d5a29dd7e17f0a1f7a7ef301807528e8
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.2_pre2 b/metadata/md5-cache/net-misc/rsync-3.2.2_pre3
similarity index 99%
rename from metadata/md5-cache/net-misc/rsync-3.2.2_pre2
rename to metadata/md5-cache/net-misc/rsync-3.2.2_pre3
index ba81b492038d..e837d2257d97 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.2_pre2
+++ b/metadata/md5-cache/net-misc/rsync-3.2.2_pre3
@@ -8,6 +8,6 @@ IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr x
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.2pre2.tar.gz
+SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.2pre3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6bc22331739a51ac68e663d3881ce0df
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 1d84ec565941..be61c5f8bbf7 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 fe56723522dd..a45ad2006ef4 100644
--- a/metadata/md5-cache/net-news/newsboat-2.19-r1
+++ b/metadata/md5-cache/net-news/newsboat-2.19-r1
@@ -5,10 +5,10 @@ DESCRIPTION=An RSS/Atom feed reader for text terminals
 EAPI=7
 HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
 IUSE=libressl debug
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 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	59ecae2c29d723be70671fd182038195	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=12fbd1c9e1213a225fa48e04b77b9633
+_md5_=74c8f37159bb2590ede5974bd936df66
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 402b3630046c..09c237a068f2 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/deluge-2.0.3-r7 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
new file mode 100644
index 000000000000..0f5ee60d924d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/wheel[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=7
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] dev-python/rencode[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)] ) dev-python/pygobject:3[python_targets_python3_6(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=300b4d7b5b13fc4d6e2a4a56f1782b14
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index 08d4b884304d..65c9a40cf925 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ccf9f44dd35e2189716baf531575d183
+_md5_=300b4d7b5b13fc4d6e2a4a56f1782b14
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index e6aeb09f6d1a..651f28e73ac0 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/mfoc-0.10.7 b/metadata/md5-cache/net-wireless/mfoc-0.10.7-r1
similarity index 61%
rename from metadata/md5-cache/net-wireless/mfoc-0.10.7
rename to metadata/md5-cache/net-wireless/mfoc-0.10.7-r1
index 75f1c77e287d..94881dd2b61b 100644
--- a/metadata/md5-cache/net-wireless/mfoc-0.10.7
+++ b/metadata/md5-cache/net-wireless/mfoc-0.10.7-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/libnfc-1.7.0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libnfc-1.7.0:= >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mifare Classic Offline Cracker
 EAPI=6
 HOMEPAGE=https://github.com/nfc-tools/mfoc
 KEYWORDS=~amd64
 LICENSE=GPL-2 GPL-2+ BSD-2
-RDEPEND=>=dev-libs/libnfc-1.7.0
+RDEPEND=>=dev-libs/libnfc-1.7.0:=
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/mfoc/archive/mfoc-0.10.7.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6949d956015807ff41a1941d2f6576a2
+_md5_=787089e53c6db07c702038302493fda8
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
index 091af83afd64..ffbf60d1679a 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
@@ -9,4 +9,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.3_p20170919.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d17ce99bde512a60b3f235d4b87cda7
+_md5_=d8412883fbb5bd695abb922aca1634f3
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
index 72f0671495f3..e3a0a53dc867 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
@@ -9,4 +9,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.4.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dfdc4010f6838d449308d69cc02513e
+_md5_=5689ac630a6c78c4fb08ef94748f9270
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
index 796a4634a1d4..f7ae41a4603d 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
@@ -9,4 +9,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/steve-m/librtlsdr/archive/0.6.0.tar.gz -> rtl-sdr-0.6.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=559ad99b0d2face072ff87b94723f8c7
+_md5_=66afca72bf5e61ad261218db145ded89
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index 657b07b16d52..3b5878b1a592 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=964c228831296ac462e195472fc090c8
+_md5_=4ec7f803905f027945f0b44c42fa298d
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 6e8f71b07dad..c2770312d189 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/gr-0.50.0-r1 b/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
index f2b00d9107b3..4edc3d11a60f 100644
--- a/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
+++ b/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw media-libs/libjpeg-turbo media-libs/libpng media-libs/qhull sys-libs/zlib virtual/opengl cairo? ( x11-libs/cairo ) ffmpeg? ( media-video/ffmpeg ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype ) X? ( x11-libs/libX11 )
 DESCRIPTION=Universal framework for cross-platform visualization applications
 EAPI=7
-HOMEPAGE=http://gr-framework.org/
+HOMEPAGE=https://gr-framework.org/
 IUSE=cairo ffmpeg postscript tiff truetype X
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw media-libs/libjpeg-
 SLOT=0
 SRC_URI=https://github.com/sciapp/gr/archive/v0.50.0.tar.gz -> gr-0.50.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5655dee37e5bda302aa54e3408431edf
+_md5_=e7473c5e2fee1f63c45308855e6a182c
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.8.0-r3 b/metadata/md5-cache/sci-visualization/paraview-5.8.0-r3
index 65d1245422d6..8286e7a21a11 100644
--- a/metadata/md5-cache/sci-visualization/paraview-5.8.0-r3
+++ b/metadata/md5-cache/sci-visualization/paraview-5.8.0-r3
@@ -13,4 +13,4 @@ RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://www.paraview.org/files/v5.8/ParaView-v5.8.0.tar.xz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63c632a817a02063a52b30dd5b19695d
+_md5_=4d1351dac6f17862ae3e133064b6c46e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index da83cbba6f5d..37afcc2a2651 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/gentoo-sources-4.14.187 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.187
new file mode 100644
index 000000000000..edc63ea63307
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.187
@@ -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.187
+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-197.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-197.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-197.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-197.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-197.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-197.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-197.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-197.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-197.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=773c70b939c0c8baa174f327dd1f9f7a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.131 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.131
new file mode 100644
index 000000000000..0a0b741c21e5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.131
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.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.131
+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-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-130.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-130.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-130.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-130.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-130.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-130.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-130.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-130.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8afef504ce3a94a73d74be586a3659d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.229 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.229
new file mode 100644
index 000000000000..4f487b5596c8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.229
@@ -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.229
+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-230.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-230.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-230.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-230.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-230.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-230.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-230.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-230.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-230.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=06f29479d310d6255054018227b1c613
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.229 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.229
new file mode 100644
index 000000000000..d22ce70987e9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.229
@@ -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.229
+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-233.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-233.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-233.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-233.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-233.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-233.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-233.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-233.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-233.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ff8df4901d0f86c3bf8dbad95b89cea7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.50 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.50
new file mode 100644
index 000000000000..6d170d0f716c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.50
@@ -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.50
+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-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-50.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-50.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-50.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-50.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-50.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-50.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-50.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-50.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5c5e737aa9ddeaffb8376c34a00226f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.7
new file mode 100644
index 000000000000..44297892ffec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.7 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.7.7
+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-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-8.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	62ce5abb4a3cde62969c4314bbf96d6f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5094d31e507cd551c64d043fdfeec47f
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2a81368fd002..0158e454d1eb 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libsepol-3.0 b/metadata/md5-cache/sys-libs/libsepol-3.0
index dfc9c029385b..48a71ffcaa6f 100644
--- a/metadata/md5-cache/sys-libs/libsepol-3.0
+++ b/metadata/md5-cache/sys-libs/libsepol-3.0
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20191204/libsepol-3.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=604ae0028d0812a657b6dd962a78fc89
+_md5_=1830731248296e1cbc4366a4277cb7af
diff --git a/metadata/md5-cache/sys-libs/libsepol-9999 b/metadata/md5-cache/sys-libs/libsepol-9999
index 312c0895be0e..9b953edf470f 100644
--- a/metadata/md5-cache/sys-libs/libsepol-9999
+++ b/metadata/md5-cache/sys-libs/libsepol-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bd497ce98cf181e00cd1cef6c147318f
+_md5_=c429f13e3660a87e68bc8224da8b1ad6
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index dbd920003a61..db6a41353377 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/firefox-68.10.0 b/metadata/md5-cache/www-client/firefox-68.10.0
index 000e3e8ea614..e78655cdebbe 100644
--- a/metadata/md5-cache/www-client/firefox-68.10.0
+++ b/metadata/md5-cache/www-client/firefox-68.10.0
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ach.xpi -> firefox-68.10.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/af.xpi -> firefox-68.10.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/an.xpi -> firefox-68.10.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ar.xpi -> firefox-68.10.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ast.xpi -> firefox-68.10.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/az.xpi -> firefox-68.10.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/be.xpi -> firefox-68.10.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/bg.xpi -> firefox-68.10.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/bn.xpi -> firefox-68.10.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/br.xpi -> firefox-68.10.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/bs.xpi -> firefox-68.10.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ca.xpi -> firefox-68.10.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/cak.xpi -> firefox-68.10.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/cs.xpi -> firefox-68.10.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/cy.xpi -> firefox-68.10.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/da.xpi -> firefox-68.10.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/de.xpi -> firefox-68.10.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.10.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/el.xpi -> firefox-68.10.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.10.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.10.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/eo.xpi -> firefox-68.10.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.10.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.10.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.10.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.10.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/et.xpi -> firefox-68.10.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/eu.xpi -> firefox-68.10.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/fa.xpi -> firefox-68.10.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ff.xpi -> firefox-68.10.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/fi.xpi -> firefox-68.10.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/fr.xpi -> firefox-68.10.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.10.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.10.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/gd.xpi -> firefox-68.10.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/gl.xpi -> firefox-68.10.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/gn.xpi -> firefox-68.10.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.10.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/he.xpi -> firefox-68.10.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.10.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/hr.xpi -> firefox-68.10.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.10.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/hu.xpi -> firefox-68.10.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.10.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ia.xpi -> firefox-68.10.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/id.xpi -> firefox-68.10.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/is.xpi -> firefox-68.10.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/it.xpi -> firefox-68.10.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ja.xpi -> firefox-68.10.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ka.xpi -> firefox-68.10.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/kab.xpi -> firefox-68.10.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/kk.xpi -> firefox-68.10.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/km.xpi -> firefox-68.10.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/kn.xpi -> firefox-68.10.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ko.xpi -> firefox-68.10.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/lij.xpi -> firefox-68.10.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/lt.xpi -> firefox-68.10.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/lv.xpi -> firefox-68.10.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/mk.xpi -> firefox-68.10.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/mr.xpi -> firefox-68.10.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ms.xpi -> firefox-68.10.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/my.xpi -> firefox-68.10.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.10.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/nl.xpi -> firefox-68.10.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.10.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/oc.xpi -> firefox-68.10.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.10.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/pl.xpi -> firefox-68.10.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.10.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.10.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/rm.xpi -> firefox-68.10.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ro.xpi -> firefox-68.10.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ru.xpi -> firefox-68.10.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/si.xpi -> firefox-68.10.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/sk.xpi -> firefox-68.10.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/sl.xpi -> firefox-68.10.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/son.xpi -> firefox-68.10.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/sq.xpi -> firefox-68.10.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/sr.xpi -> firefox-68.10.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.10.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ta.xpi -> firefox-68.10.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/te.xpi -> firefox-68.10.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/th.xpi -> firefox-68.10.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/tr.xpi -> firefox-68.10.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/uk.xpi -> firefox-68.10.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/ur.xpi -> firefox-68.10.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/uz.xpi -> firefox-68.10.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/vi.xpi -> firefox-68.10.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/xh.xpi -> firefox-68.10.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.10.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.10.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.10.0esr/source/firefox-68.10.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	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b857de7e365ce9c11b5c6bf464efb859
+_md5_=057cb453229ff9a569b96ab0cacb7381
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 767c063f1a5f..cd4db93097a5 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
index d397e3e85eb4..bd1069303b2d 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.108/NVIDIA-FreeBSD-x86_64-340.108.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.108/NVIDIA-FreeBSD-x86-340.108.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=028eb4f7fafadb0e43dfc5f9967f0e4f
+_md5_=27c8d54b72aa94f77a1ea2695ce65c7b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
index aa53deb952ee..ee07845b5cd4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=f163cb71e0138dcf1341f9eafa3537c8
+_md5_=4213186879b7f146ed3a262de62c9110
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
index a2fafde2a044..e78f2ca3f9bb 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=cd4c4c19d9b41c2881a573cf37db3eb4
+_md5_=29cfe93bb57e90ace1fbe305a9630105
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
index bbe2d25d32eb..8d1742f3443e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=4b3b4e9ef8d7fd2a1701a830596d9ecf
+_md5_=6bbe60c62d63c3b98f001d79911e6c39
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
index e6cf3db28dec..d0de7c4bbb4b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/430
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/430.64/NVIDIA-FreeBSD-x86_64-430.64.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/430.64/NVIDIA-Linux-x86_64-430.64.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.64.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=7dee2d175cd7f31d8133363451664a6e
+_md5_=dae88d7b17bc684368560ece37250816
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
index 8a2b551abeb6..576942986bdf 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=d361a43e233c8497daeecf4e655bc850
+_md5_=aeee2bf3fbee9c3a1c1103e11eff77b2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
index 842c7b1ce90b..227ffcca0567 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=a900cf3349fc91566312218fbdc6f692
+_md5_=b516a49ef8c9c7136f05d38016a11590
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
index 67886cb7b371..559f5bffb388 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.51/NVIDIA-FreeBSD-x86_64-450.51.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.51/NVIDIA-Linux-x86_64-450.51.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.51.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=32e1b0b3ae15120420837501a94a2618
+_md5_=ca415b5e1581e0876d4ddaee139e9e5d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 7c9b7b48111a..0972bea689dc 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/sunflower-0.2_alpha59 b/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
index 7689abcf33d8..2ea052dbecda 100644
--- a/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
+++ b/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Small and highly customizable twin-panel file manager with plugin-support
 EAPI=6
-HOMEPAGE=https://github.com/MeanEYE/Sunflower http://sunflower-fm.org/
+HOMEPAGE=https://github.com/MeanEYE/Sunflower https://sunflower-fm.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://sunflower-fm.org/pub/sunflower-0.2-59.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5cebc45cc41e872723e7da6aa040b9d
+_md5_=12d6c10e7b567a95fe758c71446d16a9
diff --git a/metadata/md5-cache/x11-misc/sunflower-0.3.61 b/metadata/md5-cache/x11-misc/sunflower-0.3.61
index a01c5ce885da..4c16d0769d0f 100644
--- a/metadata/md5-cache/x11-misc/sunflower-0.3.61
+++ b/metadata/md5-cache/x11-misc/sunflower-0.3.61
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Small and highly customizable twin-panel file manager with plugin-support
 EAPI=7
-HOMEPAGE=https://github.com/MeanEYE/Sunflower http://sunflower-fm.org/
+HOMEPAGE=https://github.com/MeanEYE/Sunflower https://sunflower-fm.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/MeanEYE/Sunflower/archive/0.3-61.tar.gz -> sunflower-0.3.61.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cde8b4f2405e290da841019678f54ff8
+_md5_=9ee5d2af70a531b1fb9f433b1b9868a6
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 118ea21b9477..fab56aa6f8bf 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/dwm-6.1-r1 b/metadata/md5-cache/x11-wm/dwm-6.1-r1
deleted file mode 100644
index 95cce3edb139..000000000000
--- a/metadata/md5-cache/x11-wm/dwm-6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-base/xorg-proto )
-DESCRIPTION=a dynamic window manager for X11
-EAPI=6
-HOMEPAGE=https://dwm.suckless.org/
-IUSE=xinerama savedconfig
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://dl.suckless.org/dwm/dwm-6.1.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ff9a4b07a34207d6e3be801caf998d8
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index cd3a491cb945..c72e77b164a1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12044 BLAKE2B 547415c33cd1d5d0e90a80f7a59574b3586b17cced894eeab2dd80042c3bb6aca4b85cda93f72c8edb89d80a5480978ea22a242f346c7a98fad2a95a214b4874 SHA512 a55a6789e7d66503ccbe69d73f70534bb16956cbc073435959464fead34e7db53e6daf9c756eb92e635e27550f6e05cf0aab7bd9d83a005f5e26dc0513b3d06f
-TIMESTAMP 2020-07-01T09:38:25Z
+TIMESTAMP 2020-07-02T05:38:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl78WZFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl79ctJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBiYQ//fEtVZirjjYL43vWwvnwqAswqO4eMn7IeBRC+MyLG3MItBbcPfYkwu5y8
-cuxmn5BQnu8RCj06IjVkuStGtk/XvVyd487eWzvP2pWQd9ZBLQZbVQcAr0BmUmpG
-zWxHChLTdVXkuAXIEbDnc+evsul6HkHOxTi/GO1dVl7Vb3m8bMM1pF2waMTbf6V/
-+PZ4K/NzR+mn8XZOZaV5+B3RLIlGNUE1wGaR0zaEHPY+rcmPvcyt8s+8EDwT8c5B
-EwKxySv83x3nN17owNRl1b1QLps9tLXviQXTxFvWbgg2ZrfsiSP/EZOdr9DTjy+S
-IET5oTm0tHmueeVzV7prxj7zL4M8yYD/fe5hLK6tzlapus+ygKO6DsGHSOF1IBek
-6Ej/FwwSRwDQfUy7o6SsMCkV9Du9Bcnlb0X9kEkVJGmMaqmPsgfzhBg1qVyYHlW3
-k9BHrnJFXN96YoLRl1b4XOhC6C1+96Bd8ZQm9xQmXBZPQXsBzBtRFosiZeplNgGt
-/I91V5/qgDsEWXoPJ6A4FUdzHxpzERtbgapdLTMvQahlKmEgijGs6qRySijbPc6F
-sglOkNgQa4oM/jX9OsVzb1FOfoTUsGUHD9nheJo0tu4XXFYU5Wi3+s4v+maHaWBc
-0q0u0KGHzAhsbCpC44xfd7PxlMUUe9tCdgMJr3Kui+k6JhGV/Tc=
-=MDYI
+klDL3A//cEb/cxI6gTfoFJ5B5Y9WP82a9MX3ZeiIN1S2k+5fPrR50wB31cxKjg9x
+HruKNix82DnGhBdAV4AGPw62dfr2DEHsu60B2Yvp+VNXyG9IyJ0t3tHyrbkYVKen
+6zB7sKHHcn0e7uOZC83k/5uDimoTk/ouBbiCNRoNWtMpO+/auvclGq8EdTQvB0Am
+1poE0S56/g2cBQ7fUwiSXvyIYl9d3fp9eP5nzNqsqw7WkSGJ79cpB+32rsSaxZCV
+V4unPTFy6dLzQ04qmkQ5geFqRRfnISlXyEayRtE0ms3e/ig52p8YJFiXouhwNYI/
+N2LxAvPcc1YZ5JhoGX3HwnuusIBPOksQjQ5zUvyca4+TgnhE8oiVI2Y5EkrYvm/S
+DZszzXQd2Zyajc1Zge/RuGujDXB8e8Urhi/d/9ESLtWM6QfFwjVpxTKO8e0NN0qh
+c8SksUGLkoDF3KHhpmTAoTeCJKhkqS5zHQaQgPDjtp9PT0pJoq3UoJljoFO/Bq6T
+nZqNUENhPdPG6jvFB/hc8mHJRsrDQz84R7QyqLbu9qt0jJYS9HEXObW1kaqKRJ7x
+LdQBBxPQZtNl4Eto6kuN2NTBDW15Jp18wh8jygppi7aoEmhZd4npaDM/7RgTznfL
+pLaKCPICTe9vn+b8A2YjFqpiqzfHxIsf/k3iqR8D5412YiWQ+QA=
+=eXoo
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 18c02caef6d7..00f6e1998acb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Jul 2020 09:38:22 +0000
+Thu, 02 Jul 2020 05:38:23 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d872c7000445..c2019da64905 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed 01 Jul 2020 09:38:22 AM UTC
+Thu 02 Jul 2020 05:38:23 AM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 590c81061abd..f27d1db0247d 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -205,6 +205,7 @@
 2006180409 ./acct-group/fvwm-crystal/fvwm-crystal-0.ebuild
 2006261638 ./acct-group/cvmfs/cvmfs-0.ebuild
 2006281609 ./acct-group/sabnzbd/sabnzbd-0.ebuild
+2007020109 ./acct-group/maradns/maradns-0.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -391,6 +392,8 @@
 2006121439 ./acct-user/znc/znc-0.ebuild
 2006261638 ./acct-user/cvmfs/cvmfs-0.ebuild
 2006281609 ./acct-user/sabnzbd/sabnzbd-0.ebuild
+2007020109 ./acct-user/duende/duende-0.ebuild
+2007020109 ./acct-user/maradns/maradns-0.ebuild
 1704191101 ./app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
 2001051415 ./app-accessibility/accerciser/accerciser-3.22.0.ebuild
 2006132027 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
@@ -453,7 +456,7 @@
 1802132008 ./app-admin/apachetop/apachetop-0.17.4.ebuild
 2001140609 ./app-admin/apachetop/apachetop-0.18.4.ebuild
 2001140609 ./app-admin/apachetop/apachetop-0.19.7.ebuild
-1808231539 ./app-admin/apg/apg-2.3.0b-r7.ebuild
+2007020109 ./app-admin/apg/apg-2.3.0b-r7.ebuild
 1912081139 ./app-admin/augeas/augeas-1.12.0.ebuild
 2004032241 ./app-admin/augeas/augeas-1.11.0-r1.ebuild
 2004032241 ./app-admin/augeas/augeas-1.11.0.ebuild
@@ -730,8 +733,8 @@
 2006080038 ./app-admin/restart-services/restart-services-0.15.2.ebuild
 2004222339 ./app-admin/rex/rex-1.9.0.ebuild
 2005121139 ./app-admin/rex/rex-1.10.0.ebuild
-2005121139 ./app-admin/rex/rex-9999.ebuild
 2006132339 ./app-admin/rex/rex-1.11.0.ebuild
+2007020109 ./app-admin/rex/rex-9999.ebuild
 2002151310 ./app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
 2006201339 ./app-admin/rsyslog/rsyslog-8.2004.0.ebuild
 2006260109 ./app-admin/rsyslog/rsyslog-8.2006.0.ebuild
@@ -1428,7 +1431,7 @@
 2006241739 ./app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
 2006221938 ./app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
 2005160039 ./app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild
-2006251009 ./app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
+2007020109 ./app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
 2006251138 ./app-crypt/trousers/trousers-0.3.14-r2.ebuild
 1809201939 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
 1912261609 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
@@ -2595,7 +2598,7 @@
 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
-2004230309 ./app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
+2007020109 ./app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
 2002112051 ./app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
 2004211009 ./app-eselect/eselect-awk/eselect-awk-0.2.ebuild
 2005170009 ./app-eselect/eselect-awk/eselect-awk-0.3.ebuild
@@ -3062,7 +3065,7 @@
 2006062109 ./app-misc/boxes/boxes-1.1.2-r3.ebuild
 2002230339 ./app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
 1908281739 ./app-misc/btail/btail-0.3-r1.ebuild
-2006251508 ./app-misc/byobu/byobu-5.130-r1.ebuild
+2007020109 ./app-misc/byobu/byobu-5.130-r1.ebuild
 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
@@ -3073,7 +3076,6 @@
 1810181939 ./app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
 1902221139 ./app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
 1910261339 ./app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
-1712280139 ./app-misc/cbrpager/cbrpager-0.9.22.ebuild
 1907151839 ./app-misc/cbview/cbview-0.06-r1.ebuild
 1912210209 ./app-misc/cdargs/cdargs-1.35-r2.ebuild
 1810041139 ./app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -3207,7 +3209,6 @@
 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
-1702282250 ./app-misc/ignuit/ignuit-2.24.3.ebuild
 1808230009 ./app-misc/imgurbash2/imgurbash2-9999.ebuild
 2001100909 ./app-misc/imgurbash2/imgurbash2-3.1.ebuild
 2006202339 ./app-misc/imgurbash2/imgurbash2-3.2.ebuild
@@ -3518,8 +3519,8 @@
 2006251009 ./app-office/homebank/homebank-5.2.8.ebuild
 1705171809 ./app-office/hourglass/hourglass-0.7.2-r1.ebuild
 1702282250 ./app-office/ical/ical-3.0-r2.ebuild
-1802051008 ./app-office/impressive/impressive-0.12.0.ebuild
 1912271409 ./app-office/impressive/impressive-0.13.0_beta1.ebuild
+2007020109 ./app-office/impressive/impressive-0.13.0_beta2.ebuild
 2001122109 ./app-office/kexi/kexi-3.2.0-r1.ebuild
 2005280039 ./app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
 2006282009 ./app-office/kmymoney/kmymoney-5.1.0.ebuild
@@ -3553,8 +3554,9 @@
 2004202139 ./app-office/planner/planner-0.14.6_p20130520-r2.ebuild
 1912111539 ./app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
 2002230040 ./app-office/sc/sc-7.16-r2.ebuild
-2004032339 ./app-office/scribus/scribus-9999.ebuild
 2005301239 ./app-office/scribus/scribus-1.5.5-r1.ebuild
+2007020109 ./app-office/scribus/scribus-1.5.5_p20200626.ebuild
+2007020109 ./app-office/scribus/scribus-9999.ebuild
 2005181839 ./app-office/skrooge/skrooge-2.22.1.ebuild
 2003262109 ./app-office/taskcoach/taskcoach-1.4.6.ebuild
 1906290909 ./app-office/texmacs/texmacs-1.99.10.ebuild
@@ -3579,8 +3581,7 @@
 2006041239 ./app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
 1905201439 ./app-officeext/ct2n/ct2n-1.5.0.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
+2007020109 ./app-officeext/languagetool/languagetool-5.0.ebuild
 1702282250 ./app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild
 2002241609 ./app-officeext/ooofbtools/ooofbtools-2.56.ebuild
 1702282250 ./app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild
@@ -3856,7 +3857,7 @@
 2005312238 ./app-text/blogc/blogc-0.19.0.ebuild
 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
+2007020309 ./app-text/c2ps/c2ps-4.0.ebuild
 2005270639 ./app-text/calibre/calibre-4.17.0-r1.ebuild
 2006040208 ./app-text/calibre/calibre-4.9.1-r2.ebuild
 2006142209 ./app-text/calibre/calibre-4.18.0.ebuild
@@ -4308,6 +4309,7 @@
 2002062139 ./app-text/nuspell/nuspell-3.0.0.ebuild
 2004072239 ./app-text/nuspell/nuspell-3.1.0.ebuild
 2005061739 ./app-text/nuspell/nuspell-3.1.1.ebuild
+2007020109 ./app-text/nuspell/nuspell-3.1.2.ebuild
 2002222339 ./app-text/xournalpp/xournalpp-1.0.17.ebuild
 2002222339 ./app-text/xournalpp/xournalpp-9999.ebuild
 2004250039 ./app-text/xournalpp/xournalpp-1.0.18.ebuild
@@ -5383,6 +5385,7 @@
 1908311709 ./dev-erlang/cache_tab/cache_tab-1.0.20.ebuild
 1712161139 ./dev-erlang/cache_tab/cache_tab-1.0.7.ebuild
 2004011239 ./dev-erlang/cache_tab/cache_tab-1.0.22.ebuild
+2007020109 ./dev-erlang/cache_tab/cache_tab-1.0.23.ebuild
 1909172239 ./dev-erlang/eimp/eimp-1.0.12.ebuild
 1810170039 ./dev-erlang/eimp/eimp-1.0.9.ebuild
 2004011309 ./dev-erlang/eimp/eimp-1.0.14.ebuild
@@ -5390,6 +5393,7 @@
 1911170739 ./dev-erlang/epam/epam-1.0.2.ebuild
 1911170739 ./dev-erlang/epam/epam-1.0.6.ebuild
 2004011239 ./dev-erlang/epam/epam-1.0.7.ebuild
+2007020109 ./dev-erlang/epam/epam-1.0.8.ebuild
 1702282250 ./dev-erlang/eredis/eredis-1.0.8.ebuild
 1712161139 ./dev-erlang/esip/esip-1.0.11.ebuild
 1909131539 ./dev-erlang/esip/esip-1.0.26.ebuild
@@ -5421,10 +5425,11 @@
 1712161139 ./dev-erlang/jiffy/jiffy-0.14.9.ebuild
 1909181439 ./dev-erlang/jiffy/jiffy-1.0.1.ebuild
 2004011309 ./dev-erlang/jiffy/jiffy-1.0.4.ebuild
+2007020109 ./dev-erlang/jiffy/jiffy-1.0.5.ebuild
 1908311809 ./dev-erlang/jose/jose-1.9.0.ebuild
 2006232108 ./dev-erlang/jose/jose-1.10.1.ebuild
 1712161139 ./dev-erlang/lager/lager-3.2.4.ebuild
-1908311839 ./dev-erlang/lager/lager-3.8.0.ebuild
+2007020109 ./dev-erlang/lager/lager-3.8.0.ebuild
 1702282250 ./dev-erlang/luerl/luerl-0.2.ebuild
 1909131539 ./dev-erlang/luerl/luerl-0.3.ebuild
 1909131539 ./dev-erlang/meck/meck-0.8.12.ebuild
@@ -5452,12 +5457,13 @@
 1912272239 ./dev-erlang/pkix/pkix-1.0.4.ebuild
 2004011339 ./dev-erlang/pkix/pkix-1.0.5.ebuild
 1912071709 ./dev-erlang/proper/proper-1.2.ebuild
-1912071709 ./dev-erlang/proper/proper-1.3.ebuild
+2007020109 ./dev-erlang/proper/proper-1.3.ebuild
 1912110241 ./dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
 1712161139 ./dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild
 1702282250 ./dev-erlang/riakc/riakc-2.4.2.ebuild
 1702282250 ./dev-erlang/sqlite3/sqlite3-1.1.5.ebuild
 1909131539 ./dev-erlang/sqlite3/sqlite3-1.1.6.ebuild
+2007020109 ./dev-erlang/sqlite3/sqlite3-1.1.7.ebuild
 1908311909 ./dev-erlang/stringprep/stringprep-1.0.17.ebuild
 1712161139 ./dev-erlang/stringprep/stringprep-1.0.8.ebuild
 2004011309 ./dev-erlang/stringprep/stringprep-1.0.19.ebuild
@@ -5478,8 +5484,7 @@
 1912110241 ./dev-games/aseprite/aseprite-1.1.6.ebuild
 2005271309 ./dev-games/aseprite/aseprite-1.1.7-r1.ebuild
 2005271309 ./dev-games/aseprite/aseprite-1.1.9.ebuild
-1807232209 ./dev-games/cardpics/cardpics-0.4-r1.ebuild
-1707090132 ./dev-games/cardpics/cardpics-0.4.ebuild
+2007020109 ./dev-games/cardpics/cardpics-0.4-r1.ebuild
 2005170009 ./dev-games/cegui/cegui-0.8.7-r1.ebuild
 1702282250 ./dev-games/clanlib/clanlib-2.3.7.ebuild
 1806251639 ./dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -7934,10 +7939,10 @@
 2002111439 ./dev-lang/elixir/elixir-1.9.4.ebuild
 2006190139 ./dev-lang/elixir/elixir-1.10.3.ebuild
 1912141439 ./dev-lang/epic/epic-0.9.3.3-r1.ebuild
-2002130339 ./dev-lang/erlang/erlang-21.1.1.ebuild
-2005091809 ./dev-lang/erlang/erlang-22.3.4.ebuild
-2005281909 ./dev-lang/erlang/erlang-22.3.2.ebuild
-2006212039 ./dev-lang/erlang/erlang-23.0.1.ebuild
+2007020109 ./dev-lang/erlang/erlang-21.1.1.ebuild
+2007020109 ./dev-lang/erlang/erlang-22.3.2.ebuild
+2007020109 ./dev-lang/erlang/erlang-22.3.4.ebuild
+2007020109 ./dev-lang/erlang/erlang-23.0.1.ebuild
 1702282250 ./dev-lang/esco/esco-0.512.ebuild
 1702282250 ./dev-lang/execline/execline-2.1.1.0.ebuild
 1711152307 ./dev-lang/execline/execline-2.3.0.3.ebuild
@@ -8006,7 +8011,7 @@
 2004020109 ./dev-lang/julia/julia-1.2.0.ebuild
 2004020109 ./dev-lang/julia/julia-1.3.0.ebuild
 2004080010 ./dev-lang/julia/julia-1.4.0-r1.ebuild
-2006221009 ./dev-lang/julia/julia-1.4.0-r2.ebuild
+2007020109 ./dev-lang/julia/julia-1.4.0-r2.ebuild
 1912151509 ./dev-lang/jwasm/jwasm-2.13.ebuild
 1803171008 ./dev-lang/lazarus/lazarus-1.0.12.ebuild
 2001171339 ./dev-lang/lazarus/lazarus-1.8.4-r2.ebuild
@@ -8174,9 +8179,10 @@
 2004032241 ./dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
 2004032241 ./dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
 2004101709 ./dev-lang/spidermonkey/spidermonkey-68.7.0.ebuild
-2004282239 ./dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
 2005041909 ./dev-lang/spidermonkey/spidermonkey-68.8.0.ebuild
 2006041408 ./dev-lang/spidermonkey/spidermonkey-68.9.0.ebuild
+2007020109 ./dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
+2007020109 ./dev-lang/spidermonkey/spidermonkey-68.10.0.ebuild
 1807050039 ./dev-lang/squirrel/squirrel-3.1.ebuild
 2002122139 ./dev-lang/srf/srf-1.0-r2.ebuild
 2005272009 ./dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
@@ -8380,7 +8386,7 @@
 2002151310 ./dev-libs/gf-complete/gf-complete-0.0.0.ebuild
 2002151310 ./dev-libs/gf-complete/gf-complete-2.0.0.ebuild
 2005170409 ./dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
-2006111139 ./dev-libs/gf2x/gf2x-1.3.0.ebuild
+2007020109 ./dev-libs/gf2x/gf2x-1.3.0.ebuild
 2005022309 ./dev-libs/girara/girara-0.3.3.ebuild
 2005022309 ./dev-libs/girara/girara-0.3.4.ebuild
 2005022309 ./dev-libs/girara/girara-9999.ebuild
@@ -8691,6 +8697,7 @@
 2004211009 ./dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
 1702282250 ./dev-libs/libnfc/libnfc-1.7.1.ebuild
 2005211938 ./dev-libs/libnfc/libnfc-1.7.2.ebuild
+2007020109 ./dev-libs/libnfc/libnfc-1.8.0.ebuild
 1912301509 ./dev-libs/libnl/libnl-1.1.9999.ebuild
 2003261841 ./dev-libs/libnl/libnl-1.1.4-r1.ebuild
 2004032241 ./dev-libs/libnl/libnl-1.1.4.ebuild
@@ -9081,7 +9088,7 @@
 1901030109 ./dev-libs/stb/stb-20180211.ebuild
 2007011009 ./dev-libs/stb/stb-20200205.ebuild
 2006291239 ./dev-libs/stfl/stfl-0.24.ebuild
-2006300939 ./dev-libs/stfl/stfl-0.24-r2.ebuild
+2007020109 ./dev-libs/stfl/stfl-0.24-r2.ebuild
 2001011339 ./dev-libs/stp/stp-2.3.3.ebuild
 1702282250 ./dev-libs/svrcore/svrcore-4.1.2.ebuild
 2002230040 ./dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
@@ -9199,6 +9206,7 @@
 2004010009 ./dev-libs/ncnn/ncnn-20200226.ebuild
 2004262339 ./dev-libs/ncnn/ncnn-20200413.ebuild
 2006251009 ./dev-libs/libjcat/libjcat-0.1.3.ebuild
+2007020109 ./dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
 2005150039 ./dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
 2006191939 ./dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
 2006032238 ./dev-libs/libudfread/libudfread-1.0.0-r1.ebuild
@@ -9999,14 +10007,21 @@
 2002112051 ./dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild
 2007010339 ./dev-perl/Crypt-DSA/Crypt-DSA-1.170.0-r1.ebuild
 1703141724 ./dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r2.ebuild
+2007020109 ./dev-perl/Crypt-Eksblowfish/Crypt-Eksblowfish-0.9.0-r3.ebuild
 2004032241 ./dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
 2004141909 ./dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r1.ebuild
+2007020109 ./dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild
 1912110241 ./dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0.ebuild
 2004032241 ./dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
+2007020109 ./dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild
 2004032241 ./dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.190.0-r1.ebuild
+2007020109 ./dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.190.0-r2.ebuild
 1912110241 ./dev-perl/Crypt-OpenSSL-EC/Crypt-OpenSSL-EC-1.310.0.ebuild
+2007020109 ./dev-perl/Crypt-OpenSSL-EC/Crypt-OpenSSL-EC-1.320.0.ebuild
 1910252109 ./dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r2.ebuild
+2007020109 ./dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild
 2004032241 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
+2007020109 ./dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
 2004032241 ./dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
 2004032241 ./dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0.ebuild
 2002112051 ./dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild
@@ -11544,6 +11559,7 @@
 2005031809 ./dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
 2005031809 ./dev-perl/URI-FromHash/URI-FromHash-0.50.0.ebuild
 2005061909 ./dev-perl/B-COW/B-COW-0.4.0.ebuild
+2007020109 ./dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
 1806072239 ./dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
@@ -11998,7 +12014,7 @@
 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
-2006270039 ./dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+2007020109 ./dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
 2006031008 ./dev-python/argh/argh-0.26.2-r2.ebuild
 2005051509 ./dev-python/args/args-0.1.0-r1.ebuild
 2004270439 ./dev-python/arpeggio/arpeggio-1.9.0.ebuild
@@ -12061,7 +12077,7 @@
 2001200939 ./dev-python/beagle/beagle-0.2.1.ebuild
 2006110009 ./dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
 2004232109 ./dev-python/bert/bert-2.2.0.ebuild
-2006222209 ./dev-python/betamax/betamax-0.8.1.ebuild
+2007020109 ./dev-python/betamax/betamax-0.8.1.ebuild
 2002041639 ./dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
 2002112309 ./dev-python/billiard/billiard-3.6.0.0.ebuild
 2005121609 ./dev-python/binaryornot/binaryornot-0.4.4.ebuild
@@ -12311,6 +12327,8 @@
 2006212338 ./dev-python/django/django-2.2.11.ebuild
 2006290939 ./dev-python/django/django-2.2.13.ebuild
 2006300939 ./dev-python/django/django-2.2.12.ebuild
+2007020109 ./dev-python/django/django-2.2.14.ebuild
+2007020109 ./dev-python/django/django-3.0.8.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
@@ -12466,11 +12484,11 @@
 2005252309 ./dev-python/genty/genty-1.3.2.ebuild
 2004152239 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
 2001051415 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
-2004012239 ./dev-python/gevent/gevent-1.4.0.ebuild
-2005262139 ./dev-python/gevent/gevent-20.5.1.ebuild
-2005291209 ./dev-python/gevent/gevent-20.5.2.ebuild
-2006071038 ./dev-python/gevent/gevent-20.6.0.ebuild
-2006111109 ./dev-python/gevent/gevent-20.6.1.ebuild
+2007020109 ./dev-python/gevent/gevent-1.4.0.ebuild
+2007020109 ./dev-python/gevent/gevent-20.5.1.ebuild
+2007020109 ./dev-python/gevent/gevent-20.5.2.ebuild
+2007020109 ./dev-python/gevent/gevent-20.6.0.ebuild
+2007020109 ./dev-python/gevent/gevent-20.6.1.ebuild
 2003251539 ./dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
 2005311009 ./dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
 2001260009 ./dev-python/girder-client/girder-client-2.3.0.ebuild
@@ -12571,6 +12589,7 @@
 2006230909 ./dev-python/hypothesis/hypothesis-5.18.0.ebuild
 2006261339 ./dev-python/hypothesis/hypothesis-5.18.1.ebuild
 2006281509 ./dev-python/hypothesis/hypothesis-5.18.3.ebuild
+2007020109 ./dev-python/hypothesis/hypothesis-5.19.0.ebuild
 2003251909 ./dev-python/icalendar/icalendar-4.0.3.ebuild
 2006210939 ./dev-python/icalendar/icalendar-4.0.6.ebuild
 2004032241 ./dev-python/id3-py/id3-py-1.2-r1.ebuild
@@ -12694,6 +12713,7 @@
 2003272345 ./dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
 2004152209 ./dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
 2006101039 ./dev-python/jupyter_client/jupyter_client-6.1.3.ebuild
+2007020109 ./dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
 2005032009 ./dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
 2006101039 ./dev-python/jupyter_console/jupyter_console-6.1.0.ebuild
 2004150909 ./dev-python/jupyter_core/jupyter_core-4.6.1-r1.ebuild
@@ -12709,6 +12729,7 @@
 2006012009 ./dev-python/keyring/keyring-21.2.1.ebuild
 2003251939 ./dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
 2006202239 ./dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
+2007020109 ./dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
 2001131309 ./dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
 2001051415 ./dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
 2003010709 ./dev-python/kiwisolver/kiwisolver-1.1.0.ebuild
@@ -12892,7 +12913,7 @@
 2001160839 ./dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
 2006270039 ./dev-python/netifaces/netifaces-0.10.9.ebuild
 2003251909 ./dev-python/networkx/networkx-2.4.ebuild
-2006142239 ./dev-python/networkx/networkx-2.4-r1.ebuild
+2007020109 ./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
 2006021438 ./dev-python/nltk/nltk-3.5.ebuild
@@ -13038,7 +13059,7 @@
 2001171109 ./dev-python/partd/partd-0.3.8.ebuild
 2006141539 ./dev-python/partd/partd-1.1.0.ebuild
 2004271039 ./dev-python/parver/parver-0.3.ebuild
-2006162239 ./dev-python/passlib/passlib-1.7.2.ebuild
+2007020109 ./dev-python/passlib/passlib-1.7.2.ebuild
 2004241939 ./dev-python/paste/paste-3.2.3.ebuild
 2005262009 ./dev-python/paste/paste-3.4.0.ebuild
 2006050908 ./dev-python/paste/paste-3.4.1.ebuild
@@ -13193,6 +13214,7 @@
 1912100809 ./dev-python/pychroot/pychroot-9999.ebuild
 2004190539 ./dev-python/pyclipper/pyclipper-1.1.0.ebuild
 2006042039 ./dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
+2007020109 ./dev-python/pyclipper/pyclipper-1.2.0.ebuild
 2004150609 ./dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild
 2006062009 ./dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
 2004211139 ./dev-python/pycollada/pycollada-0.7.1.ebuild
@@ -13265,7 +13287,7 @@
 2005271239 ./dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
 2005271539 ./dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
 2005311909 ./dev-python/pyicu/pyicu-2.4.3.ebuild
-2006191939 ./dev-python/pyicu/pyicu-2.5.ebuild
+2007020109 ./dev-python/pyicu/pyicu-2.5.ebuild
 2004032241 ./dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
 2002091942 ./dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
 2006082339 ./dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -13400,7 +13422,7 @@
 2001051415 ./dev-python/pytest-html/pytest-html-1.22.1.ebuild
 2006041739 ./dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
 2005311309 ./dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
-2005311309 ./dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+2007020109 ./dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
 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
@@ -13435,8 +13457,8 @@
 2005131209 ./dev-python/pytest/pytest-4.6.9.ebuild
 2005270939 ./dev-python/pytest/pytest-4.6.10.ebuild
 2006031008 ./dev-python/pytest/pytest-5.4.3.ebuild
-2006270039 ./dev-python/pytest/pytest-4.6.11.ebuild
 2006290009 ./dev-python/pytest/pytest-5.4.2.ebuild
+2007020109 ./dev-python/pytest/pytest-4.6.11.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
@@ -13600,8 +13622,8 @@
 2002060039 ./dev-python/raven/raven-5.33.0.ebuild
 2006182139 ./dev-python/rdflib/rdflib-4.2.2-r1.ebuild
 2006182339 ./dev-python/rdflib/rdflib-5.0.0.ebuild
-2006012338 ./dev-python/readme_renderer/readme_renderer-25.0.ebuild
 2006041739 ./dev-python/readme_renderer/readme_renderer-26.0.ebuild
+2007020109 ./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
@@ -13629,7 +13651,7 @@
 2006092339 ./dev-python/requests-mock/requests-mock-1.8.0.ebuild
 2004200209 ./dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
 2006092339 ./dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
-2006222209 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+2007020109 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
 2004211009 ./dev-python/requests/requests-2.21.0-r1.ebuild
 2006051939 ./dev-python/requests/requests-2.23.0.ebuild
 2006181339 ./dev-python/requests/requests-2.24.0.ebuild
@@ -13691,8 +13713,8 @@
 2005181339 ./dev-python/sabyenc/sabyenc-4.0.1.ebuild
 2004032241 ./dev-python/scandir/scandir-1.10.0-r1.ebuild
 2006120109 ./dev-python/scripttest/scripttest-1.3.0.ebuild
-2005261909 ./dev-python/scrypt/scrypt-0.8.13-r2.ebuild
 2005311309 ./dev-python/scrypt/scrypt-0.8.15.ebuild
+2007020109 ./dev-python/scrypt/scrypt-0.8.13-r2.ebuild
 2003092139 ./dev-python/seaborn/seaborn-0.10.0.ebuild
 2003251909 ./dev-python/secretstorage/secretstorage-3.1.1.ebuild
 2006012009 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -13917,14 +13939,15 @@
 2006071039 ./dev-python/tox/tox-3.15.2.ebuild
 2006212338 ./dev-python/tox/tox-3.15.0.ebuild
 2006281509 ./dev-python/tox/tox-3.16.0.ebuild
+2007020109 ./dev-python/tox/tox-3.16.1.ebuild
 2001051415 ./dev-python/tqdm/tqdm-4.23.3.ebuild
 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
-2006012338 ./dev-python/tqdm/tqdm-4.45.0.ebuild
 2006041739 ./dev-python/tqdm/tqdm-4.46.0.ebuild
 2006290939 ./dev-python/tqdm/tqdm-4.46.1.ebuild
 2006291009 ./dev-python/tqdm/tqdm-4.47.0.ebuild
+2007020109 ./dev-python/tqdm/tqdm-4.45.0.ebuild
 2006261309 ./dev-python/traceback2/traceback2-1.4.0.ebuild
 2003171139 ./dev-python/traitlets/traitlets-4.3.2.ebuild
 2006082109 ./dev-python/traitlets/traitlets-4.3.3.ebuild
@@ -13939,9 +13962,9 @@
 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
-2006012338 ./dev-python/twine/twine-1.15.0.ebuild
 2006012338 ./dev-python/twine/twine-3.1.1.ebuild
 2006252208 ./dev-python/twine/twine-3.2.0.ebuild
+2007020109 ./dev-python/twine/twine-1.15.0.ebuild
 2006040939 ./dev-python/twisted/twisted-19.10.0.ebuild
 2006211239 ./dev-python/twisted/twisted-20.3.0.ebuild
 2005041009 ./dev-python/twython/twython-3.7.0.ebuild
@@ -13994,9 +14017,9 @@
 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
-2006012338 ./dev-python/virtualenv/virtualenv-16.7.10.ebuild
 2006100509 ./dev-python/virtualenv/virtualenv-20.0.21.ebuild
 2006241108 ./dev-python/virtualenv/virtualenv-20.0.23.ebuild
+2007020109 ./dev-python/virtualenv/virtualenv-16.7.10.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
@@ -14025,7 +14048,7 @@
 2006110539 ./dev-python/websocket-client/websocket-client-0.57.0.ebuild
 2004232309 ./dev-python/websockify/websockify-0.9.0.ebuild
 2005262139 ./dev-python/webtest/webtest-2.0.33.ebuild
-2005301809 ./dev-python/webtest/webtest-2.0.35.ebuild
+2007020109 ./dev-python/webtest/webtest-2.0.35.ebuild
 2005062139 ./dev-python/werkzeug/werkzeug-0.16.0.ebuild
 2005291509 ./dev-python/werkzeug/werkzeug-1.0.1.ebuild
 2006120109 ./dev-python/werkzeug/werkzeug-0.16.1.ebuild
@@ -14101,19 +14124,19 @@
 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
-2006012338 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
+2007020109 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2004240909 ./dev-python/elementpath/elementpath-1.4.4.ebuild
 2006161139 ./dev-python/elementpath/elementpath-1.4.6.ebuild
 2006290009 ./dev-python/elementpath/elementpath-1.4.5.ebuild
 2006012338 ./dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
 2006051709 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
 2006012338 ./dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
-2006041739 ./dev-python/pypiserver/pypiserver-1.3.2.ebuild
+2007020109 ./dev-python/pypiserver/pypiserver-1.3.2.ebuild
 2006211439 ./dev-python/pytest-services/pytest-services-2.1.0.ebuild
 2006291709 ./dev-python/pytest-services/pytest-services-2.0.1.ebuild
 2006092309 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
 2006092309 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
-2006012338 ./dev-python/towncrier/towncrier-19.2.0.ebuild
+2007020109 ./dev-python/towncrier/towncrier-19.2.0.ebuild
 2005301509 ./dev-python/xmlschema/xmlschema-1.2.0.ebuild
 2006122139 ./dev-python/xmlschema/xmlschema-1.2.1.ebuild
 2006161139 ./dev-python/xmlschema/xmlschema-1.2.2.ebuild
@@ -17083,6 +17106,7 @@
 2004200309 ./dev-ruby/zeitwerk/zeitwerk-2.2.1.ebuild
 2004200309 ./dev-ruby/zeitwerk/zeitwerk-2.2.2.ebuild
 2004200309 ./dev-ruby/zeitwerk/zeitwerk-2.3.0.ebuild
+2007020809 ./dev-ruby/zeitwerk/zeitwerk-2.3.1.ebuild
 2005060009 ./dev-ruby/zentest/zentest-4.12.0.ebuild
 2002091409 ./dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
 2003291109 ./dev-ruby/rqrcode_core/rqrcode_core-0.1.2.ebuild
@@ -17518,7 +17542,7 @@
 2005221739 ./dev-util/cmake/cmake-3.16.5.ebuild
 2005221739 ./dev-util/cmake/cmake-3.17.2.ebuild
 2005301139 ./dev-util/cmake/cmake-3.17.3.ebuild
-2006172039 ./dev-util/cmake/cmake-3.18.0_rc2.ebuild
+2007020109 ./dev-util/cmake/cmake-3.18.0_rc3.ebuild
 2004032241 ./dev-util/cmdtest/cmdtest-0.30.ebuild
 2004032241 ./dev-util/cmdtest/cmdtest-0.32.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -18135,6 +18159,7 @@
 2006071239 ./dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild
 2006192139 ./dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
 2006272309 ./dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild
+2007020109 ./dev-util/bear/bear-2.4.3.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
@@ -18352,6 +18377,7 @@
 2004150109 ./games-action/supertuxkart/supertuxkart-1.1.ebuild
 1812191739 ./games-action/swordandsworcery/swordandsworcery-1.02.ebuild
 1804151439 ./games-action/teeworlds/teeworlds-0.6.4.ebuild
+2007020109 ./games-action/teeworlds/teeworlds-0.7.5.ebuild
 1711182327 ./games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
 1808151339 ./games-action/transcend/transcend-0.3-r1.ebuild
 1911081009 ./games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508-r2.ebuild
@@ -18546,7 +18572,7 @@
 1702282250 ./games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
 2005212239 ./games-board/peg-e/peg-e-1.2.8.ebuild
 1804291439 ./games-board/phalanx/phalanx-22-r1.ebuild
-1707090132 ./games-board/pioneers/pioneers-15.3-r1.ebuild
+2007020309 ./games-board/pioneers/pioneers-15.5.ebuild
 2005180439 ./games-board/pokerth/pokerth-1.1.2.ebuild
 2003311339 ./games-board/polyglot/polyglot-1.4.70b-r3.ebuild
 1707090132 ./games-board/pouetchess/pouetchess-0.2.0-r2.ebuild
@@ -20300,8 +20326,6 @@
 2001082109 ./mail-client/alot/alot-0.8.1.ebuild
 2003051539 ./mail-client/alot/alot-0.9.ebuild
 2003051539 ./mail-client/alot/alot-9999.ebuild
-2004230939 ./mail-client/alpine/alpine-2.22.ebuild
-2005210139 ./mail-client/alpine/alpine-2.22-r1.ebuild
 2006290009 ./mail-client/alpine/alpine-2.23.ebuild
 1812021739 ./mail-client/balsa/balsa-2.5.6-r1.ebuild
 1905201439 ./mail-client/bower/bower-0.10.ebuild
@@ -20350,8 +20374,10 @@
 2004032241 ./mail-client/sylpheed/sylpheed-3.7.0.ebuild
 1809131739 ./mail-client/thunderbird-bin/thunderbird-bin-52.9.1-r1.ebuild
 2006041408 ./mail-client/thunderbird-bin/thunderbird-bin-68.9.0.ebuild
+2007020109 ./mail-client/thunderbird-bin/thunderbird-bin-68.10.0.ebuild
 2004261439 ./mail-client/thunderbird/thunderbird-52.9.1-r1.ebuild
 2006051409 ./mail-client/thunderbird/thunderbird-68.9.0.ebuild
+2007020109 ./mail-client/thunderbird/thunderbird-68.10.0.ebuild
 2004191509 ./mail-client/trojita/trojita-9999.ebuild
 2006302309 ./mail-client/trojita/trojita-0.7-r5.ebuild
 2006081109 ./mail-client/mutt-wizard/mutt-wizard-0_pre20200606.ebuild
@@ -20874,7 +20900,7 @@
 2004032241 ./media-gfx/exif/exif-0.6.21.ebuild
 2006170439 ./media-gfx/exif/exif-0.6.22.ebuild
 2004032241 ./media-gfx/exiv2/exiv2-0.27.2.ebuild
-2006010039 ./media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
+2007020109 ./media-gfx/exiv2/exiv2-0.27.3.ebuild
 1804112008 ./media-gfx/farbfeld/farbfeld-4.ebuild
 1911051409 ./media-gfx/farbfeld/farbfeld-9999.ebuild
 1902221309 ./media-gfx/fbgrab/fbgrab-1.3.ebuild
@@ -21130,7 +21156,6 @@
 1912111539 ./media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
 2002230040 ./media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
 2004032241 ./media-gfx/ufraw/ufraw-0.22-r3.ebuild
-2003312109 ./media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
 2003312109 ./media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
 2001311139 ./media-gfx/valentina/valentina-9999.ebuild
 2002101140 ./media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -21633,7 +21658,7 @@
 2006242039 ./media-libs/mesa/mesa-20.0.8.ebuild
 2007010209 ./media-libs/mesa/mesa-20.1.2.ebuild
 2004252309 ./media-libs/mlt/mlt-6.20.0.ebuild
-2007010109 ./media-libs/mlt/mlt-6.20.0-r2.ebuild
+2007020109 ./media-libs/mlt/mlt-6.20.0-r2.ebuild
 1801230038 ./media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
 2006042339 ./media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
 2003050439 ./media-libs/mutagen/mutagen-1.44.0.ebuild
@@ -21815,7 +21840,7 @@
 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
-2007010939 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200627-r1.ebuild
+2007020109 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.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
@@ -22972,7 +22997,7 @@
 1702282250 ./media-tv/w_scan/w_scan-20141122.ebuild
 1901261409 ./media-tv/w_scan/w_scan-20170107.ebuild
 1909231039 ./media-tv/xmltv/xmltv-0.5.70.ebuild
-2006222209 ./media-tv/xmltv/xmltv-0.6.1.ebuild
+2007020109 ./media-tv/xmltv/xmltv-0.6.1.ebuild
 1910042209 ./media-video/acidrip/acidrip-0.14-r4.ebuild
 1908181609 ./media-video/aegisub/aegisub-9999.ebuild
 1912110241 ./media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -23491,6 +23516,7 @@
 2006041909 ./net-analyzer/netdata/netdata-1.22.1-r1.ebuild
 2006041909 ./net-analyzer/netdata/netdata-9999.ebuild
 2006251639 ./net-analyzer/netdata/netdata-1.23.0.ebuild
+2007020109 ./net-analyzer/netdata/netdata-1.23.1.ebuild
 1702282250 ./net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
 2001311739 ./net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild
 2002112051 ./net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
@@ -23593,6 +23619,7 @@
 2004032241 ./net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
 2005071839 ./net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
 2006290009 ./net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+2007020109 ./net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
 1708061641 ./net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild
 1707301241 ./net-analyzer/sancp/sancp-1.6.1-r4.ebuild
 2006040939 ./net-analyzer/sarg/sarg-2.4.0.ebuild
@@ -23714,6 +23741,7 @@
 2001301739 ./net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
 2006231539 ./net-analyzer/wireshark/wireshark-3.2.4.ebuild
 2006231539 ./net-analyzer/wireshark/wireshark-99999999.ebuild
+2007020109 ./net-analyzer/wireshark/wireshark-3.2.5.ebuild
 2002112051 ./net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
 1702282250 ./net-analyzer/xprobe/xprobe-0.3.ebuild
 1702282250 ./net-analyzer/yersinia/yersinia-0.7.3.ebuild
@@ -23833,9 +23861,8 @@
 2004032241 ./net-dns/libidn/libidn-1.35.ebuild
 2006141939 ./net-dns/libidn2/libidn2-2.3.0.ebuild
 2006141939 ./net-dns/libidn2/libidn2-99999.ebuild
-1704291802 ./net-dns/maradns/maradns-2.0.09-r2.ebuild
-1712022109 ./net-dns/maradns/maradns-2.0.14.ebuild
 1912140139 ./net-dns/maradns/maradns-2.0.16.ebuild
+2007020109 ./net-dns/maradns/maradns-3.5.0005.ebuild
 1702282250 ./net-dns/mdns-repeater/mdns-repeater-20110921.ebuild
 1902052339 ./net-dns/mydns/mydns-1.2.8.31-r2.ebuild
 2004171939 ./net-dns/mydns/mydns-1.2.8.31-r1.ebuild
@@ -23854,6 +23881,7 @@
 2006191909 ./net-dns/openresolv/openresolv-3.9.0.ebuild
 2005301309 ./net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
 2006262239 ./net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild
+2007020109 ./net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
 1912110241 ./net-dns/pdns/pdns-4.1.13.ebuild
 1912110241 ./net-dns/pdns/pdns-4.2.0.ebuild
 2003110009 ./net-dns/pdns/pdns-4.2.1-r1.ebuild
@@ -23897,6 +23925,7 @@
 2005212209 ./net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
 2002151310 ./net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
 2004101809 ./net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
+2007020309 ./net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
 1902190039 ./net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild
 2001172009 ./net-firewall/ipset/ipset-7.5.ebuild
 2002151310 ./net-firewall/ipset/ipset-6.29.ebuild
@@ -24097,7 +24126,7 @@
 2006142339 ./net-im/telegram-desktop/telegram-desktop-2.1.11-r1.ebuild
 2006181009 ./net-im/telegram-desktop/telegram-desktop-2.1.12.ebuild
 2006280439 ./net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
-2006300309 ./net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild
+2007020109 ./net-im/telegram-desktop/telegram-desktop-2.1.16.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2003240009 ./net-im/teams/teams-1.3.00.958.ebuild
 2006040939 ./net-im/teams/teams-1.3.00.5153.ebuild
@@ -24168,9 +24197,8 @@
 1912050009 ./net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild
 1910111911 ./net-irc/unrealircd/unrealircd-4.2.4.1.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
 2006091709 ./net-irc/weechat/weechat-2.8.ebuild
+2007020839 ./net-irc/weechat/weechat-9999.ebuild
 1805212239 ./net-irc/xaric/xaric-0.13.6.ebuild
 2005082039 ./net-irc/znc/znc-1.7.5.ebuild
 2006121439 ./net-irc/znc/znc-1.8.1.ebuild
@@ -24533,6 +24561,7 @@
 2004032241 ./net-libs/rpc2/rpc2-2.14.ebuild
 2004211009 ./net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
 2006062239 ./net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
+2007020109 ./net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
 2004032241 ./net-libs/serf/serf-1.3.8-r1.ebuild
 2004032241 ./net-libs/serf/serf-1.3.8.ebuild
 2004032241 ./net-libs/serf/serf-1.3.9.ebuild
@@ -24897,7 +24926,7 @@
 2004140139 ./net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
 2004140139 ./net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
 2004140139 ./net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
-2006290009 ./net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
+2007020109 ./net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
 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
@@ -24937,7 +24966,7 @@
 1702282250 ./net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
 2004271509 ./net-misc/icaclient/icaclient-19.12.0.19.ebuild
 2004271509 ./net-misc/icaclient/icaclient-20.04.0.21.ebuild
-2002222009 ./net-misc/icecast/icecast-2.4.4.ebuild
+2007020109 ./net-misc/icecast/icecast-2.4.4.ebuild
 1906051110 ./net-misc/ices/ices-2.0.2.ebuild
 1702282250 ./net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
 1905130009 ./net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild
@@ -25196,7 +25225,7 @@
 2006221039 ./net-misc/rsync/rsync-9999.ebuild
 2006261939 ./net-misc/rsync/rsync-3.2.0-r1.ebuild
 2006261939 ./net-misc/rsync/rsync-3.2.1.ebuild
-2006291309 ./net-misc/rsync/rsync-3.2.2_pre2.ebuild
+2007020109 ./net-misc/rsync/rsync-3.2.2_pre3.ebuild
 1702282250 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 2002230040 ./net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild
 2004202139 ./net-misc/rygel/rygel-0.38.3.ebuild
@@ -25388,7 +25417,7 @@
 2003161239 ./net-news/liferea/liferea-1.12.7-r1.ebuild
 2007011009 ./net-news/liferea/liferea-1.12.8.ebuild
 1901041039 ./net-news/newsboat/newsboat-2.13.ebuild
-2005232009 ./net-news/newsboat/newsboat-2.19-r1.ebuild
+2007020109 ./net-news/newsboat/newsboat-2.19-r1.ebuild
 1904181209 ./net-news/quiterss/quiterss-9999.ebuild
 2004031539 ./net-news/quiterss/quiterss-0.19.3.ebuild
 2004032241 ./net-news/rawdog/rawdog-2.22-r1.ebuild
@@ -25438,9 +25467,10 @@
 2003261841 ./net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
 1909231139 ./net-p2p/dbhub/dbhub-0.451-r1.ebuild
 2002092009 ./net-p2p/deluge/deluge-2.0.3-r4.ebuild
-2004171809 ./net-p2p/deluge/deluge-9999.ebuild
 2004190539 ./net-p2p/deluge/deluge-2.0.3-r6.ebuild
 2005061009 ./net-p2p/deluge/deluge-2.0.3-r5.ebuild
+2007020109 ./net-p2p/deluge/deluge-2.0.3-r7.ebuild
+2007020109 ./net-p2p/deluge/deluge-9999.ebuild
 1902152239 ./net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild
 1709182053 ./net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
 1709182053 ./net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -25820,7 +25850,7 @@
 2002142309 ./net-wireless/lorcon/lorcon-9999.ebuild
 1708061641 ./net-wireless/madwimax/madwimax-0.1.1-r1.ebuild
 2002112051 ./net-wireless/mdk/mdk-3.6-r1.ebuild
-1702282250 ./net-wireless/mfoc/mfoc-0.10.7.ebuild
+2007020109 ./net-wireless/mfoc/mfoc-0.10.7-r1.ebuild
 2002091942 ./net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
 2002091942 ./net-wireless/multimode/multimode-1.4_p20140831-r2.ebuild
 2002091942 ./net-wireless/multimode/multimode-9999.ebuild
@@ -25845,10 +25875,10 @@
 1908020539 ./net-wireless/rfcat/rfcat-9999.ebuild
 1710231547 ./net-wireless/rfkill/rfkill-0.5-r3.ebuild
 1912111540 ./net-wireless/rfkill/rfkill-0.5-r2.ebuild
-1802192038 ./net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
-1905212009 ./net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
-2001211409 ./net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
-2004282039 ./net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+2007020109 ./net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
+2007020109 ./net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
+2007020109 ./net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
+2007020109 ./net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
 1907181939 ./net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild
 2005280509 ./net-wireless/rtl_433/rtl_433-20.02_p20200327.ebuild
 2005280509 ./net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -27516,7 +27546,7 @@
 1704091404 ./sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
 1804020308 ./sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
 1804020308 ./sci-visualization/opendx/opendx-4.4.4-r7.ebuild
-2005120909 ./sci-visualization/paraview/paraview-5.8.0-r3.ebuild
+2007020309 ./sci-visualization/paraview/paraview-5.8.0-r3.ebuild
 2004232209 ./sci-visualization/pythonprop/pythonprop-0.29.ebuild
 2002092009 ./sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
 2002230040 ./sci-visualization/quickplot/quickplot-0.10.6.ebuild
@@ -27537,7 +27567,7 @@
 2001160909 ./sci-visualization/yt/yt-3.3.5.ebuild
 2001160909 ./sci-visualization/yt/yt-3.4.0.ebuild
 2005211239 ./sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
-2006212309 ./sci-visualization/gr/gr-0.50.0-r1.ebuild
+2007020109 ./sci-visualization/gr/gr-0.50.0-r1.ebuild
 1904041409 ./sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
 2003191139 ./sec-policy/apparmor-profiles/apparmor-profiles-2.13.4.ebuild
 1804251509 ./sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
@@ -30072,6 +30102,12 @@
 2006290009 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.228.ebuild
 2006290009 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.228.ebuild
 2006290009 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.48.ebuild
+2007020109 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.187.ebuild
+2007020109 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.131.ebuild
+2007020109 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.229.ebuild
+2007020109 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.229.ebuild
+2007020109 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.50.ebuild
+2007020109 ./sys-kernel/gentoo-sources/gentoo-sources-5.7.7.ebuild
 2006150209 ./sys-kernel/git-sources/git-sources-5.8_rc1.ebuild
 2006221009 ./sys-kernel/git-sources/git-sources-5.8_rc2.ebuild
 2006290209 ./sys-kernel/git-sources/git-sources-5.8_rc3.ebuild
@@ -30309,8 +30345,8 @@
 2002110039 ./sys-libs/libsemanage/libsemanage-2.9.ebuild
 2002112309 ./sys-libs/libsemanage/libsemanage-3.0.ebuild
 1908171339 ./sys-libs/libsepol/libsepol-2.9.ebuild
-1912082039 ./sys-libs/libsepol/libsepol-9999.ebuild
-2002112309 ./sys-libs/libsepol/libsepol-3.0.ebuild
+2007020109 ./sys-libs/libsepol/libsepol-3.0.ebuild
+2007020109 ./sys-libs/libsepol/libsepol-9999.ebuild
 1908101709 ./sys-libs/libservicelog/libservicelog-1.1.18.ebuild
 2005190039 ./sys-libs/libsmbios/libsmbios-2.4.3.ebuild
 1805212239 ./sys-libs/libstatgrab/libstatgrab-0.91.ebuild
@@ -31026,7 +31062,7 @@
 2004261439 ./www-client/firefox/firefox-52.9.0-r1.ebuild
 2006051409 ./www-client/firefox/firefox-68.9.0.ebuild
 2006171739 ./www-client/firefox/firefox-77.0.1.ebuild
-2006302339 ./www-client/firefox/firefox-68.10.0.ebuild
+2007020109 ./www-client/firefox/firefox-68.10.0.ebuild
 2006280539 ./www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
 2006280539 ./www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
 2006231739 ./www-client/google-chrome/google-chrome-83.0.4103.116.ebuild
@@ -31281,14 +31317,14 @@
 2006242339 ./x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
 2006242339 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2004032241 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
-2006291209 ./x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
+2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
 2004032241 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2004032241 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2004032241 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -31761,8 +31797,8 @@
 1708311302 ./x11-misc/sselp/sselp-0.2-r1.ebuild
 1709110046 ./x11-misc/sselp/sselp-9999.ebuild
 1805220439 ./x11-misc/stalonetray/stalonetray-0.8.3.ebuild
-1804050208 ./x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
-1904202109 ./x11-misc/sunflower/sunflower-0.3.61.ebuild
+2007020109 ./x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+2007020109 ./x11-misc/sunflower/sunflower-0.3.61.ebuild
 1703041818 ./x11-misc/superswitcher/superswitcher-0.6-r1.ebuild
 2002112051 ./x11-misc/sux/sux-1.0-r4.ebuild
 2001051839 ./x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
@@ -32438,7 +32474,6 @@
 2006151839 ./x11-wm/cwm/cwm-6.6.ebuild
 2006281409 ./x11-wm/cwm/cwm-6.7.ebuild
 2006281409 ./x11-wm/cwm/cwm-9999.ebuild
-1910111911 ./x11-wm/dwm/dwm-6.1-r1.ebuild
 2006051009 ./x11-wm/dwm/dwm-9999.ebuild
 2006111139 ./x11-wm/dwm/dwm-6.2.ebuild
 1908192239 ./x11-wm/e16/e16-1.0.20.ebuild
@@ -32850,8 +32885,9 @@
 2006121439 metadata/md5-cache/acct-group/znc-0
 2006180409 metadata/md5-cache/acct-group/fvwm-crystal-0
 2006261639 metadata/md5-cache/acct-group/cvmfs-0
-2006281609 metadata/md5-cache/acct-group/Manifest.gz
 2006281609 metadata/md5-cache/acct-group/sabnzbd-0
+2007020109 metadata/md5-cache/acct-group/Manifest.gz
+2007020109 metadata/md5-cache/acct-group/maradns-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
@@ -33037,8 +33073,10 @@
 2006041039 metadata/md5-cache/acct-user/motion-0
 2006121439 metadata/md5-cache/acct-user/znc-0
 2006261639 metadata/md5-cache/acct-user/cvmfs-0
-2006281609 metadata/md5-cache/acct-user/Manifest.gz
 2006281609 metadata/md5-cache/acct-user/sabnzbd-0
+2007020109 metadata/md5-cache/acct-user/Manifest.gz
+2007020109 metadata/md5-cache/acct-user/duende-0
+2007020109 metadata/md5-cache/acct-user/maradns-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
@@ -33160,7 +33198,6 @@
 2005091339 metadata/md5-cache/app-admin/logstalgia-1.1.2
 2005111839 metadata/md5-cache/app-admin/mongo-tools-4.2.3
 2005121139 metadata/md5-cache/app-admin/rex-1.10.0
-2005121139 metadata/md5-cache/app-admin/rex-9999
 2005201939 metadata/md5-cache/app-admin/mongo-tools-4.2.6
 2005261339 metadata/md5-cache/app-admin/kpcli-3.4
 2005252009 metadata/md5-cache/app-admin/stow-2.3.1
@@ -33190,7 +33227,6 @@
 2006141358 metadata/md5-cache/app-admin/apachetop-0.12.6-r2
 2006141358 metadata/md5-cache/app-admin/apachetop-0.17.4
 2006141358 metadata/md5-cache/app-admin/apachetop-0.18.4
-2006141358 metadata/md5-cache/app-admin/apg-2.3.0b-r7
 2006141358 metadata/md5-cache/app-admin/augeas-1.11.0
 2006141358 metadata/md5-cache/app-admin/augeas-1.11.0-r1
 2006141358 metadata/md5-cache/app-admin/augeas-1.12.0
@@ -33466,9 +33502,11 @@
 2006290109 metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
 2006290009 metadata/md5-cache/app-admin/syslog-ng-3.28.1-r2
 2006292309 metadata/md5-cache/app-admin/syslog-ng-3.26.1-r1
-2006302039 metadata/md5-cache/app-admin/Manifest.gz
 2006302039 metadata/md5-cache/app-admin/mcelog-170
 2006301039 metadata/md5-cache/app-admin/monit-5.27.0
+2007020109 metadata/md5-cache/app-admin/Manifest.gz
+2007020109 metadata/md5-cache/app-admin/apg-2.3.0b-r7
+2007020109 metadata/md5-cache/app-admin/rex-9999
 2006141358 metadata/md5-cache/app-antivirus/clamav-0.102.3
 2006141358 metadata/md5-cache/app-antivirus/clamtk-6.03
 2006191340 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
@@ -34093,7 +34131,6 @@
 2006270039 metadata/md5-cache/app-crypt/libmd-1.0.1
 2006262339 metadata/md5-cache/app-crypt/libu2f-host-1.1.10
 2006262339 metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
-2006262339 metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
 2006262339 metadata/md5-cache/app-crypt/trousers-0.3.14-r2
 2006262339 metadata/md5-cache/app-crypt/veracrypt-1.24_p2
 2006262339 metadata/md5-cache/app-crypt/veracrypt-1.24_p4
@@ -34102,8 +34139,9 @@
 2006290109 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
 2006291909 metadata/md5-cache/app-crypt/libsecret-0.20.3
 2006291909 metadata/md5-cache/app-crypt/seahorse-3.34.1
-2006302039 metadata/md5-cache/app-crypt/Manifest.gz
 2006300939 metadata/md5-cache/app-crypt/rotix-0.83-r1
+2007020109 metadata/md5-cache/app-crypt/Manifest.gz
+2007020109 metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
 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
@@ -35153,7 +35191,6 @@
 2006191340 metadata/md5-cache/app-emulation/glean-1.10.3
 2006191340 metadata/md5-cache/app-emulation/glean-1.17.0
 2006191340 metadata/md5-cache/app-emulation/protontricks-1.4.1
-2006191340 metadata/md5-cache/app-emulation/protontricks-1.4.1-r1
 2006191340 metadata/md5-cache/app-emulation/sen-0.6.0
 2006191340 metadata/md5-cache/app-emulation/sen-0.6.1
 2006190839 metadata/md5-cache/app-emulation/skopeo-1.1.0
@@ -35253,10 +35290,11 @@
 2006290109 metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129
 2006290939 metadata/md5-cache/app-emulation/lxc-4.0.3
 2006291709 metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
-2007011009 metadata/md5-cache/app-emulation/Manifest.gz
 2007010139 metadata/md5-cache/app-emulation/docker-compose-1.26.1
 2007010209 metadata/md5-cache/app-emulation/uade-2.13-r1
 2007011009 metadata/md5-cache/app-emulation/virt-viewer-9.0
+2007020109 metadata/md5-cache/app-emulation/Manifest.gz
+2007020109 metadata/md5-cache/app-emulation/protontricks-1.4.1-r1
 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
@@ -35766,7 +35804,6 @@
 2003211809 metadata/md5-cache/app-misc/dateutils-0.4.6
 2003241909 metadata/md5-cache/app-misc/remind-03.03.01
 2003261841 metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
-2003311822 metadata/md5-cache/app-misc/cbrpager-0.9.22
 2004011809 metadata/md5-cache/app-misc/ledit-2.04
 2004032241 metadata/md5-cache/app-misc/colordiff-1.0.18
 2004032241 metadata/md5-cache/app-misc/livecd-tools-2.5
@@ -35902,7 +35939,6 @@
 2006141358 metadata/md5-cache/app-misc/hivex-1.3.18
 2006141358 metadata/md5-cache/app-misc/hodie-1.5
 2006141358 metadata/md5-cache/app-misc/i2bits-0.1.0
-2006141358 metadata/md5-cache/app-misc/ignuit-2.24.3
 2006141358 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
 2006141358 metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
 2006141358 metadata/md5-cache/app-misc/irtrans-irserver-6.09.04
@@ -36102,7 +36138,6 @@
 2006211839 metadata/md5-cache/app-misc/realpath-1.18
 2006221339 metadata/md5-cache/app-misc/vlock-2.2.3-r1
 2006231039 metadata/md5-cache/app-misc/beep-1.4.9
-2006251509 metadata/md5-cache/app-misc/byobu-5.130-r1
 2006262339 metadata/md5-cache/app-misc/actkbd-0.2.8-r2
 2006262339 metadata/md5-cache/app-misc/blink1-1.98
 2006262339 metadata/md5-cache/app-misc/ddcutil-0.9.1
@@ -36134,8 +36169,9 @@
 2006290109 metadata/md5-cache/app-misc/smtm-1.6.10-r1
 2006291909 metadata/md5-cache/app-misc/gnote-3.36.1
 2006291709 metadata/md5-cache/app-misc/transfolio-1.0.1-r1
-2007010609 metadata/md5-cache/app-misc/Manifest.gz
 2007010609 metadata/md5-cache/app-misc/mosquitto-1.6.10
+2007020239 metadata/md5-cache/app-misc/Manifest.gz
+2007020109 metadata/md5-cache/app-misc/byobu-5.130-r1
 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
@@ -36186,7 +36222,6 @@
 2006141358 metadata/md5-cache/app-office/homebank-5.4.2
 2006141358 metadata/md5-cache/app-office/hourglass-0.7.2-r1
 2006141358 metadata/md5-cache/app-office/ical-3.0-r2
-2006141358 metadata/md5-cache/app-office/impressive-0.12.0
 2006141358 metadata/md5-cache/app-office/impressive-0.13.0_beta1
 2006141358 metadata/md5-cache/app-office/ledger-3.1.2-r1
 2006141358 metadata/md5-cache/app-office/ledger-3.2.0
@@ -36208,7 +36243,6 @@
 2006141358 metadata/md5-cache/app-office/projectlibre-bin-1.6.2
 2006141358 metadata/md5-cache/app-office/sc-7.16-r2
 2006141358 metadata/md5-cache/app-office/scribus-1.5.5-r1
-2006141358 metadata/md5-cache/app-office/scribus-9999
 2006141358 metadata/md5-cache/app-office/texmacs-1.99.10
 2006141358 metadata/md5-cache/app-office/texmacs-1.99.11
 2006141358 metadata/md5-cache/app-office/texmacs-1.99.6-r2
@@ -36243,19 +36277,21 @@
 2006290109 metadata/md5-cache/app-office/wps-office-11.1.0.9505
 2006290939 metadata/md5-cache/app-office/libreoffice-6.4.5.2
 2006290939 metadata/md5-cache/app-office/libreoffice-l10n-6.4.5.2
-2006301809 metadata/md5-cache/app-office/Manifest.gz
 2006301739 metadata/md5-cache/app-office/kraft-0.90
 2006301809 metadata/md5-cache/app-office/libalkimia-8.0.3
+2007020109 metadata/md5-cache/app-office/Manifest.gz
+2007020109 metadata/md5-cache/app-office/impressive-0.13.0_beta2
+2007020109 metadata/md5-cache/app-office/scribus-1.5.5_p20200626
+2007020109 metadata/md5-cache/app-office/scribus-9999
 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
-2006141358 metadata/md5-cache/app-officeext/Manifest.gz
 2006141358 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2006141358 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
-2006141358 metadata/md5-cache/app-officeext/languagetool-3.4
-2006141358 metadata/md5-cache/app-officeext/languagetool-3.5
 2006141358 metadata/md5-cache/app-officeext/ooo2gd-3.0.0-r1
 2006141358 metadata/md5-cache/app-officeext/sun-templates-1.0.0-r1
+2007020109 metadata/md5-cache/app-officeext/Manifest.gz
+2007020109 metadata/md5-cache/app-officeext/languagetool-5.0
 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
@@ -36639,7 +36675,6 @@
 2006141358 metadata/md5-cache/app-text/blahtexml-0.9
 2006141358 metadata/md5-cache/app-text/blogc-9999
 2006141358 metadata/md5-cache/app-text/bogosort-0.4.2-r1
-2006141358 metadata/md5-cache/app-text/c2ps-4.0
 2006141358 metadata/md5-cache/app-text/calibre-4.17.0-r1
 2006141358 metadata/md5-cache/app-text/calibre-4.9.1-r2
 2006141358 metadata/md5-cache/app-text/cb2bib-1.9.8
@@ -36988,8 +37023,10 @@
 2006290139 metadata/md5-cache/app-text/scdoc-1.11.0
 2006290239 metadata/md5-cache/app-text/vgrep-2.3.1
 2006291309 metadata/md5-cache/app-text/txt2man-1.7.1
-2006301639 metadata/md5-cache/app-text/Manifest.gz
 2006301639 metadata/md5-cache/app-text/grip-4.5.2
+2007020309 metadata/md5-cache/app-text/Manifest.gz
+2007020309 metadata/md5-cache/app-text/c2ps-4.0
+2007020109 metadata/md5-cache/app-text/nuspell-3.1.2
 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
@@ -38103,7 +38140,6 @@
 2005120109 metadata/md5-cache/dev-erlang/jiffy-1.0.4
 2005120109 metadata/md5-cache/dev-erlang/jose-1.9.0
 2005120109 metadata/md5-cache/dev-erlang/lager-3.2.4
-2005120109 metadata/md5-cache/dev-erlang/lager-3.8.0
 2005120109 metadata/md5-cache/dev-erlang/luerl-0.2
 2005120109 metadata/md5-cache/dev-erlang/luerl-0.3
 2005120109 metadata/md5-cache/dev-erlang/meck-0.8.12
@@ -38131,7 +38167,6 @@
 2005120109 metadata/md5-cache/dev-erlang/pkix-1.0.4
 2005120109 metadata/md5-cache/dev-erlang/pkix-1.0.5
 2005120109 metadata/md5-cache/dev-erlang/proper-1.2
-2005120109 metadata/md5-cache/dev-erlang/proper-1.3
 2005120109 metadata/md5-cache/dev-erlang/protobuffs-0.9.0
 2005120109 metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
 2005120109 metadata/md5-cache/dev-erlang/riakc-2.4.2
@@ -38153,18 +38188,22 @@
 2005120109 metadata/md5-cache/dev-erlang/yconf-1.0.1
 2005120109 metadata/md5-cache/dev-erlang/yconf-1.0.4
 2005282139 metadata/md5-cache/dev-erlang/idna-6.0.0
-2006232209 metadata/md5-cache/dev-erlang/Manifest.gz
 2006232209 metadata/md5-cache/dev-erlang/eimp-1.0.15
 2006232108 metadata/md5-cache/dev-erlang/jose-1.10.1
 2006232209 metadata/md5-cache/dev-erlang/p1_utils-1.0.19
-1807232209 metadata/md5-cache/dev-games/cardpics-0.4-r1
+2007020109 metadata/md5-cache/dev-erlang/Manifest.gz
+2007020109 metadata/md5-cache/dev-erlang/cache_tab-1.0.23
+2007020109 metadata/md5-cache/dev-erlang/epam-1.0.8
+2007020109 metadata/md5-cache/dev-erlang/jiffy-1.0.5
+2007020109 metadata/md5-cache/dev-erlang/lager-3.8.0
+2007020109 metadata/md5-cache/dev-erlang/proper-1.3
+2007020109 metadata/md5-cache/dev-erlang/sqlite3-1.1.7
 1707090139 metadata/md5-cache/dev-games/libmaitretarot-0.1.98
 2004141609 metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
 2006141358 metadata/md5-cache/dev-games/KXL-1.1.7-r2
 2006141358 metadata/md5-cache/dev-games/aseprite-1.1.6
 2006141358 metadata/md5-cache/dev-games/aseprite-1.1.7-r1
 2006141358 metadata/md5-cache/dev-games/aseprite-1.1.9
-2006141358 metadata/md5-cache/dev-games/cardpics-0.4
 2006141358 metadata/md5-cache/dev-games/cegui-0.8.7-r1
 2006141358 metadata/md5-cache/dev-games/clanlib-0.8.1
 2006141358 metadata/md5-cache/dev-games/clanlib-2.3.7
@@ -38212,8 +38251,9 @@
 2006251309 metadata/md5-cache/dev-games/tiled-1.4.0
 2006290109 metadata/md5-cache/dev-games/quake4-sdk-1.4.2
 2006290109 metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
-2007011239 metadata/md5-cache/dev-games/Manifest.gz
 2007011239 metadata/md5-cache/dev-games/tiled-1.4.1
+2007020109 metadata/md5-cache/dev-games/Manifest.gz
+2007020109 metadata/md5-cache/dev-games/cardpics-0.4-r1
 1902072239 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
 1902072239 metadata/md5-cache/dev-go/blackfriday-1.4
 1902072239 metadata/md5-cache/dev-go/go-bindata-assetfs-1.0.0_p20180223
@@ -40645,9 +40685,6 @@
 2006141358 metadata/md5-cache/dev-lang/closure-compiler-bin-20170218
 2006141358 metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
 2006141358 metadata/md5-cache/dev-lang/epic-0.9.3.3-r1
-2006141358 metadata/md5-cache/dev-lang/erlang-21.1.1
-2006141358 metadata/md5-cache/dev-lang/erlang-22.3.2
-2006141358 metadata/md5-cache/dev-lang/erlang-22.3.4
 2006141358 metadata/md5-cache/dev-lang/execline-2.1.1.0
 2006141358 metadata/md5-cache/dev-lang/f2c-20100827-r1
 2006141358 metadata/md5-cache/dev-lang/fpc-2.6.4
@@ -40826,7 +40863,6 @@
 2006141358 metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r1
 2006141358 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
 2006141358 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
-2006141358 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
 2006141358 metadata/md5-cache/dev-lang/spidermonkey-68.7.0
 2006141358 metadata/md5-cache/dev-lang/spidermonkey-68.8.0
 2006141358 metadata/md5-cache/dev-lang/spidermonkey-68.9.0
@@ -40884,10 +40920,8 @@
 2006201809 metadata/md5-cache/dev-lang/scala-bin-2.13.1
 2006201339 metadata/md5-cache/dev-lang/swi-prolog-8.3.2
 2006230309 metadata/md5-cache/dev-lang/R-4.0.2
-2006212039 metadata/md5-cache/dev-lang/erlang-23.0.1
 2006220009 metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
 2006212009 metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
-2006221009 metadata/md5-cache/dev-lang/julia-1.4.0-r2
 2006221638 metadata/md5-cache/dev-lang/mozart-stdlib-2.0.1
 2006241739 metadata/md5-cache/dev-lang/janet-1.9.1
 2006241739 metadata/md5-cache/dev-lang/mozart-2.0.1
@@ -40907,8 +40941,15 @@
 2006291909 metadata/md5-cache/dev-lang/vala-0.40.23
 2006291909 metadata/md5-cache/dev-lang/vala-0.46.10
 2006291909 metadata/md5-cache/dev-lang/vala-0.48.6
-2006300239 metadata/md5-cache/dev-lang/Manifest.gz
 2006300239 metadata/md5-cache/dev-lang/jsonnet-0.16.0
+2007020109 metadata/md5-cache/dev-lang/Manifest.gz
+2007020109 metadata/md5-cache/dev-lang/erlang-21.1.1
+2007020109 metadata/md5-cache/dev-lang/erlang-22.3.2
+2007020109 metadata/md5-cache/dev-lang/erlang-22.3.4
+2007020109 metadata/md5-cache/dev-lang/erlang-23.0.1
+2007020109 metadata/md5-cache/dev-lang/julia-1.4.0-r2
+2007020109 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r4
+2007020109 metadata/md5-cache/dev-lang/spidermonkey-68.10.0
 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
@@ -41134,7 +41175,6 @@
 2006141358 metadata/md5-cache/dev-libs/gf-complete-0.0.0
 2006141358 metadata/md5-cache/dev-libs/gf-complete-2.0.0
 2006141358 metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
-2006141358 metadata/md5-cache/dev-libs/gf2x-1.3.0
 2006141358 metadata/md5-cache/dev-libs/girara-0.3.3
 2006141358 metadata/md5-cache/dev-libs/girara-0.3.4
 2006141358 metadata/md5-cache/dev-libs/girara-9999
@@ -41897,12 +41937,15 @@
 2006291709 metadata/md5-cache/dev-libs/nss-3.52.1-r1
 2006291239 metadata/md5-cache/dev-libs/stfl-0.24
 2006291909 metadata/md5-cache/dev-libs/vala-common-0.48.6
-2007011009 metadata/md5-cache/dev-libs/Manifest.gz
 2006300609 metadata/md5-cache/dev-libs/libebml-1.4.0
 2006301709 metadata/md5-cache/dev-libs/libudfread-1.1.0
 2006300139 metadata/md5-cache/dev-libs/nss-3.54-r1
 2007011009 metadata/md5-cache/dev-libs/stb-20200205
-2006300939 metadata/md5-cache/dev-libs/stfl-0.24-r2
+2007020109 metadata/md5-cache/dev-libs/Manifest.gz
+2007020109 metadata/md5-cache/dev-libs/gf2x-1.3.0
+2007020109 metadata/md5-cache/dev-libs/libjcat-0.1.3-r1
+2007020109 metadata/md5-cache/dev-libs/libnfc-1.8.0
+2007020109 metadata/md5-cache/dev-libs/stfl-0.24-r2
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2006141358 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2006141358 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -44236,7 +44279,15 @@
 2006302139 metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r3
 2006302209 metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120-r1
 2007010339 metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0-r1
-2007010339 metadata/md5-cache/dev-perl/Manifest.gz
+2007020109 metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r3
+2007020109 metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0-r2
+2007020109 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0-r1
+2007020109 metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.190.0-r2
+2007020109 metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.320.0
+2007020109 metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r3
+2007020109 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
+2007020109 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
+2007020109 metadata/md5-cache/dev-perl/Manifest.gz
 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
@@ -44922,7 +44973,6 @@
 2006191340 metadata/md5-cache/dev-python/click-6.7-r1
 2006191340 metadata/md5-cache/dev-python/click-7.0-r1
 2006191340 metadata/md5-cache/dev-python/click-7.1.2
-2006191340 metadata/md5-cache/dev-python/click-default-group-1.2.2
 2006191340 metadata/md5-cache/dev-python/click-log-0.2.1
 2006191340 metadata/md5-cache/dev-python/click-log-0.3.2
 2006191340 metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -45209,11 +45259,6 @@
 2006191340 metadata/md5-cache/dev-python/genson-1.1.0
 2006191340 metadata/md5-cache/dev-python/genty-1.3.2
 2006191340 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
-2006191340 metadata/md5-cache/dev-python/gevent-1.4.0
-2006191340 metadata/md5-cache/dev-python/gevent-20.5.1
-2006191340 metadata/md5-cache/dev-python/gevent-20.5.2
-2006191340 metadata/md5-cache/dev-python/gevent-20.6.0
-2006191340 metadata/md5-cache/dev-python/gevent-20.6.1
 2006191340 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
 2006191340 metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
 2006191340 metadata/md5-cache/dev-python/geventhttpclient-1.4.2
@@ -45601,7 +45646,6 @@
 2006191340 metadata/md5-cache/dev-python/netaddr-0.7.19
 2006191340 metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
 2006191340 metadata/md5-cache/dev-python/networkx-2.4
-2006191340 metadata/md5-cache/dev-python/networkx-2.4-r1
 2006191340 metadata/md5-cache/dev-python/neutron-lib-1.29.2
 2006191340 metadata/md5-cache/dev-python/neutron-lib-2.3.0
 2006191340 metadata/md5-cache/dev-python/nltk-3.5
@@ -45740,7 +45784,6 @@
 2006191340 metadata/md5-cache/dev-python/partd-0.3.8
 2006191340 metadata/md5-cache/dev-python/partd-1.1.0
 2006191340 metadata/md5-cache/dev-python/parver-0.3
-2006191340 metadata/md5-cache/dev-python/passlib-1.7.2
 2006191340 metadata/md5-cache/dev-python/paste-3.2.3
 2006191340 metadata/md5-cache/dev-python/paste-3.4.0
 2006191340 metadata/md5-cache/dev-python/paste-3.4.1
@@ -46028,7 +46071,6 @@
 2006191340 metadata/md5-cache/dev-python/pyphen-0.9.4
 2006191340 metadata/md5-cache/dev-python/pyphen-0.9.5
 2006191340 metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
-2006191340 metadata/md5-cache/dev-python/pypiserver-1.3.2
 2006191340 metadata/md5-cache/dev-python/pypng-0.0.20
 2006191340 metadata/md5-cache/dev-python/pypowervm-1.1.20
 2006191340 metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
@@ -46103,7 +46145,6 @@
 2006191340 metadata/md5-cache/dev-python/pytest-html-1.22.1
 2006191340 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
 2006191340 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
-2006191340 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
 2006191340 metadata/md5-cache/dev-python/pytest-localserver-0.5.0-r1
 2006191340 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
 2006191340 metadata/md5-cache/dev-python/pytest-mock-1.11.2
@@ -46291,7 +46332,6 @@
 2006191340 metadata/md5-cache/dev-python/raven-5.33.0
 2006191340 metadata/md5-cache/dev-python/rdflib-4.2.2-r1
 2006191340 metadata/md5-cache/dev-python/rdflib-5.0.0
-2006191340 metadata/md5-cache/dev-python/readme_renderer-25.0
 2006191340 metadata/md5-cache/dev-python/readme_renderer-26.0
 2006191340 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-1.0.3
 2006191340 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-1.0.4
@@ -46383,7 +46423,6 @@
 2006191340 metadata/md5-cache/dev-python/scikit-build-0.10.0
 2006191340 metadata/md5-cache/dev-python/scikit-build-0.11.1
 2006191340 metadata/md5-cache/dev-python/scripttest-1.3.0
-2006191340 metadata/md5-cache/dev-python/scrypt-0.8.13-r2
 2006191340 metadata/md5-cache/dev-python/scrypt-0.8.15
 2006191340 metadata/md5-cache/dev-python/seaborn-0.10.0
 2006191340 metadata/md5-cache/dev-python/secretstorage-3.1.1
@@ -46612,7 +46651,6 @@
 2006191340 metadata/md5-cache/dev-python/toolz-0.9.0
 2006191340 metadata/md5-cache/dev-python/tooz-1.60.1
 2006191340 metadata/md5-cache/dev-python/toro-1.0.1
-2006191340 metadata/md5-cache/dev-python/towncrier-19.2.0
 2006191340 metadata/md5-cache/dev-python/tox-2.9.1
 2006191340 metadata/md5-cache/dev-python/tox-3.12.1
 2006191340 metadata/md5-cache/dev-python/tox-3.14.4
@@ -46623,7 +46661,6 @@
 2006191340 metadata/md5-cache/dev-python/tqdm-4.23.3
 2006191340 metadata/md5-cache/dev-python/tqdm-4.33.0
 2006191340 metadata/md5-cache/dev-python/tqdm-4.40.0
-2006191340 metadata/md5-cache/dev-python/tqdm-4.45.0
 2006191340 metadata/md5-cache/dev-python/tqdm-4.46.0
 2006191340 metadata/md5-cache/dev-python/tqdm-9999
 2006191340 metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -46640,7 +46677,6 @@
 2006191340 metadata/md5-cache/dev-python/tvdb_api-1.10_pre20150406-r1
 2006191340 metadata/md5-cache/dev-python/tvdb_api-2.0
 2006191340 metadata/md5-cache/dev-python/tvdb_api-2.0-r1
-2006191340 metadata/md5-cache/dev-python/twine-1.15.0
 2006191340 metadata/md5-cache/dev-python/twine-3.1.1
 2006191340 metadata/md5-cache/dev-python/twisted-19.10.0
 2006191340 metadata/md5-cache/dev-python/twython-3.7.0
@@ -46691,7 +46727,6 @@
 2006191340 metadata/md5-cache/dev-python/versioneer-0.18-r1
 2006191340 metadata/md5-cache/dev-python/vine-1.3.0
 2006191340 metadata/md5-cache/dev-python/virtualenv-16.0.0
-2006191340 metadata/md5-cache/dev-python/virtualenv-16.7.10
 2006191340 metadata/md5-cache/dev-python/virtualenv-16.7.9-r1
 2006191340 metadata/md5-cache/dev-python/virtualenv-20.0.18
 2006191340 metadata/md5-cache/dev-python/virtualenv-20.0.21
@@ -46724,7 +46759,6 @@
 2006191340 metadata/md5-cache/dev-python/websockets-8.1
 2006191340 metadata/md5-cache/dev-python/websockify-0.9.0
 2006191340 metadata/md5-cache/dev-python/webtest-2.0.33
-2006191340 metadata/md5-cache/dev-python/webtest-2.0.35
 2006191340 metadata/md5-cache/dev-python/werkzeug-0.16.0
 2006191340 metadata/md5-cache/dev-python/werkzeug-0.16.1
 2006191340 metadata/md5-cache/dev-python/werkzeug-1.0.1
@@ -46818,7 +46852,6 @@
 2006211039 metadata/md5-cache/dev-python/numpy-1.19.0
 2006202239 metadata/md5-cache/dev-python/openstacksdk-0.46.0
 2006202239 metadata/md5-cache/dev-python/osc-lib-2.0.0
-2006191939 metadata/md5-cache/dev-python/pyicu-2.5
 2006201739 metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
 2006201739 metadata/md5-cache/dev-python/pytest-salt-2020.1.27
 2006201739 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
@@ -46834,7 +46867,6 @@
 2006191909 metadata/md5-cache/dev-python/sphinx-3.0.4
 2006192139 metadata/md5-cache/dev-python/sqlparse-0.3.1
 2006192139 metadata/md5-cache/dev-python/tblib-1.6.0
-2006222209 metadata/md5-cache/dev-python/betamax-0.8.1
 2006221009 metadata/md5-cache/dev-python/boto3-1.12.48
 2006230909 metadata/md5-cache/dev-python/boto3-1.14.8
 2006221009 metadata/md5-cache/dev-python/botocore-1.15.48
@@ -46858,7 +46890,6 @@
 2006221909 metadata/md5-cache/dev-python/python-distutils-extra-2.45
 2006230909 metadata/md5-cache/dev-python/qtconsole-4.7.5
 2006222209 metadata/md5-cache/dev-python/repoze-lru-0.7-r1
-2006222209 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
 2006222209 metadata/md5-cache/dev-python/routes-2.4.1-r1
 2006221009 metadata/md5-cache/dev-python/s3transfer-0.3.1
 2006230909 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.1.2
@@ -46922,7 +46953,6 @@
 2006261309 metadata/md5-cache/dev-python/traceback2-1.4.0
 2006252209 metadata/md5-cache/dev-python/twine-3.2.0
 2006261339 metadata/md5-cache/dev-python/watchdog-0.10.3
-2006270039 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
 2006272339 metadata/md5-cache/dev-python/brython-3.7.3
 2006262339 metadata/md5-cache/dev-python/cheroot-8.3.0-r1
 2006270039 metadata/md5-cache/dev-python/dogpile-cache-0.7.1
@@ -46941,7 +46971,6 @@
 2006281509 metadata/md5-cache/dev-python/pyfakefs-3.7.2
 2006281509 metadata/md5-cache/dev-python/pyfakefs-4.0.2
 2006262109 metadata/md5-cache/dev-python/pyopencl-2020.2
-2006270039 metadata/md5-cache/dev-python/pytest-4.6.11
 2006262109 metadata/md5-cache/dev-python/pytools-2020.3.1
 2006271109 metadata/md5-cache/dev-python/rarfile-3.1
 2006262339 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
@@ -46976,7 +47005,6 @@
 2006291709 metadata/md5-cache/dev-python/tempora-3.0.0
 2006290939 metadata/md5-cache/dev-python/tqdm-4.46.1
 2006291009 metadata/md5-cache/dev-python/tqdm-4.47.0
-2007011139 metadata/md5-cache/dev-python/Manifest.gz
 2007010939 metadata/md5-cache/dev-python/brython-3.7.4
 2006300939 metadata/md5-cache/dev-python/django-2.2.12
 2007010139 metadata/md5-cache/dev-python/docker-py-4.2.2
@@ -46990,6 +47018,36 @@
 2007010639 metadata/md5-cache/dev-python/python-slugify-4.0.1
 2007011139 metadata/md5-cache/dev-python/vdf-3.3
 2006300939 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
+2007020109 metadata/md5-cache/dev-python/Manifest.gz
+2007020109 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
+2007020109 metadata/md5-cache/dev-python/betamax-0.8.1
+2007020109 metadata/md5-cache/dev-python/click-default-group-1.2.2
+2007020109 metadata/md5-cache/dev-python/django-2.2.14
+2007020109 metadata/md5-cache/dev-python/django-3.0.8
+2007020109 metadata/md5-cache/dev-python/gevent-1.4.0
+2007020109 metadata/md5-cache/dev-python/gevent-20.5.1
+2007020109 metadata/md5-cache/dev-python/gevent-20.5.2
+2007020109 metadata/md5-cache/dev-python/gevent-20.6.0
+2007020109 metadata/md5-cache/dev-python/gevent-20.6.1
+2007020109 metadata/md5-cache/dev-python/hypothesis-5.19.0
+2007020109 metadata/md5-cache/dev-python/jupyter_client-6.1.5
+2007020109 metadata/md5-cache/dev-python/keystoneauth-4.0.1
+2007020109 metadata/md5-cache/dev-python/networkx-2.4-r1
+2007020109 metadata/md5-cache/dev-python/passlib-1.7.2
+2007020109 metadata/md5-cache/dev-python/pyclipper-1.2.0
+2007020109 metadata/md5-cache/dev-python/pyicu-2.5
+2007020109 metadata/md5-cache/dev-python/pypiserver-1.3.2
+2007020109 metadata/md5-cache/dev-python/pytest-4.6.11
+2007020109 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+2007020109 metadata/md5-cache/dev-python/readme_renderer-25.0
+2007020109 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+2007020109 metadata/md5-cache/dev-python/scrypt-0.8.13-r2
+2007020109 metadata/md5-cache/dev-python/towncrier-19.2.0
+2007020109 metadata/md5-cache/dev-python/tox-3.16.1
+2007020109 metadata/md5-cache/dev-python/tqdm-4.45.0
+2007020109 metadata/md5-cache/dev-python/twine-1.15.0
+2007020109 metadata/md5-cache/dev-python/virtualenv-16.7.10
+2007020109 metadata/md5-cache/dev-python/webtest-2.0.35
 2005201639 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239
 2006141358 metadata/md5-cache/dev-qt/assistant-5.14.2
 2006141358 metadata/md5-cache/dev-qt/assistant-5.15.0
@@ -49799,9 +49857,10 @@
 2006292039 metadata/md5-cache/dev-ruby/kramdown-2.3.0
 2006290939 metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
 2006290939 metadata/md5-cache/dev-ruby/rouge-3.19.0
-2007010909 metadata/md5-cache/dev-ruby/Manifest.gz
 2006300109 metadata/md5-cache/dev-ruby/facter-3.14.11
 2007010909 metadata/md5-cache/dev-ruby/json-2.3.1
+2007020809 metadata/md5-cache/dev-ruby/Manifest.gz
+2007020809 metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
 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
@@ -50622,7 +50681,6 @@
 2006151809 metadata/md5-cache/dev-util/vulkan-tools-1.2.137
 2006171109 metadata/md5-cache/dev-util/spirv-tools-2020.3
 2006171709 metadata/md5-cache/dev-util/bitcoin-tx-0.20.0
-2006172039 metadata/md5-cache/dev-util/cmake-3.18.0_rc2
 2006171709 metadata/md5-cache/dev-util/netsurf-buildsystem-1.9
 2006180809 metadata/md5-cache/dev-util/jenkins-bin-2.235.1
 2006191340 metadata/md5-cache/dev-util/buildbot-2.7.0
@@ -50832,12 +50890,14 @@
 2006290939 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r2
 2006291909 metadata/md5-cache/dev-util/lldb-10.0.0
 2006292209 metadata/md5-cache/dev-util/lldb-10.0.1_rc2
-2007011009 metadata/md5-cache/dev-util/Manifest.gz
 2006300709 metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
 2006301909 metadata/md5-cache/dev-util/clazy-1.7
 2007011009 metadata/md5-cache/dev-util/cutter-1.10.3
 2006302239 metadata/md5-cache/dev-util/github-cli-0.10.1
 2007010239 metadata/md5-cache/dev-util/qbs-1.16.0
+2007020109 metadata/md5-cache/dev-util/Manifest.gz
+2007020109 metadata/md5-cache/dev-util/bear-2.4.3
+2007020109 metadata/md5-cache/dev-util/cmake-3.18.0_rc3
 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
@@ -51059,7 +51119,6 @@
 2006222339 metadata/md5-cache/games-action/0verkill-0.16-r4
 2006222339 metadata/md5-cache/games-action/luola-1.3.2-r1
 2006241739 metadata/md5-cache/games-action/minetest-5.2.0
-2006290109 metadata/md5-cache/games-action/Manifest.gz
 2006290109 metadata/md5-cache/games-action/apotheon-1.26v
 2006290109 metadata/md5-cache/games-action/beathazardultra-20130308-r2
 2006290109 metadata/md5-cache/games-action/brutal-legend-20130615-r2
@@ -51074,6 +51133,8 @@
 2006290109 metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
 2006290109 metadata/md5-cache/games-action/super-hexagon-20160217
 2006290109 metadata/md5-cache/games-action/trine-1.08-r3
+2007020109 metadata/md5-cache/games-action/Manifest.gz
+2007020109 metadata/md5-cache/games-action/teeworlds-0.7.5
 1910111911 metadata/md5-cache/games-arcade/aop-0.6-r1
 1910111911 metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
 1910111911 metadata/md5-cache/games-arcade/gnake-0.94b-r1
@@ -51253,7 +51314,6 @@
 2006141358 metadata/md5-cache/games-board/pasang-emas-3.1.0-r1
 2006141358 metadata/md5-cache/games-board/peg-e-1.2.8
 2006141358 metadata/md5-cache/games-board/phalanx-22-r1
-2006141358 metadata/md5-cache/games-board/pioneers-15.3-r1
 2006141358 metadata/md5-cache/games-board/pokerth-1.1.2
 2006141358 metadata/md5-cache/games-board/pouetchess-0.2.0-r2
 2006141358 metadata/md5-cache/games-board/simsu-1.3.9
@@ -51277,8 +51337,9 @@
 2006211509 metadata/md5-cache/games-board/cockatrice-20190304-r1
 2006220109 metadata/md5-cache/games-board/gnuchess-6.2.7
 2006211609 metadata/md5-cache/games-board/scid-4.6.2-r1
-2006231939 metadata/md5-cache/games-board/Manifest.gz
 2006231539 metadata/md5-cache/games-board/gnugo-3.9.1-r2
+2007020309 metadata/md5-cache/games-board/Manifest.gz
+2007020309 metadata/md5-cache/games-board/pioneers-15.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
@@ -53047,8 +53108,6 @@
 2006130039 metadata/md5-cache/mail-client/aerc-0.4.0
 2006130039 metadata/md5-cache/mail-client/aerc-9999
 2006121739 metadata/md5-cache/mail-client/roundcube-1.4.6
-2006141358 metadata/md5-cache/mail-client/alpine-2.22
-2006141358 metadata/md5-cache/mail-client/alpine-2.22-r1
 2006141358 metadata/md5-cache/mail-client/balsa-2.5.6-r1
 2006141358 metadata/md5-cache/mail-client/claws-mail-3.17.3-r1
 2006141358 metadata/md5-cache/mail-client/claws-mail-3.17.4
@@ -53091,8 +53150,10 @@
 2006290009 metadata/md5-cache/mail-client/alpine-2.23
 2006291909 metadata/md5-cache/mail-client/evolution-3.36.3
 2006291639 metadata/md5-cache/mail-client/neomutt-20200626
-2006302309 metadata/md5-cache/mail-client/Manifest.gz
 2006302309 metadata/md5-cache/mail-client/trojita-0.7-r5
+2007020309 metadata/md5-cache/mail-client/Manifest.gz
+2007020109 metadata/md5-cache/mail-client/thunderbird-68.10.0
+2007020109 metadata/md5-cache/mail-client/thunderbird-bin-68.10.0
 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
@@ -53646,7 +53707,6 @@
 2006141358 metadata/md5-cache/media-gfx/esci-interpreter-gt-s80-0.2.1.1
 2006141358 metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
 2006141358 metadata/md5-cache/media-gfx/exiv2-0.27.2
-2006141358 metadata/md5-cache/media-gfx/exiv2-0.27.3_rc2
 2006141358 metadata/md5-cache/media-gfx/farbfeld-4
 2006141358 metadata/md5-cache/media-gfx/farbfeld-9999
 2006141358 metadata/md5-cache/media-gfx/fbgrab-1.3
@@ -53879,7 +53939,6 @@
 2006191340 metadata/md5-cache/media-gfx/termtosvg-0.7.0
 2006191340 metadata/md5-cache/media-gfx/termtosvg-0.8.0
 2006191340 metadata/md5-cache/media-gfx/termtosvg-1.1.0
-2006191340 metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
 2006191340 metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r2
 2006191340 metadata/md5-cache/media-gfx/word_cloud-1.6.0
 2006191340 metadata/md5-cache/media-gfx/xdot-9999
@@ -53905,10 +53964,11 @@
 2006290109 metadata/md5-cache/media-gfx/llgal-0.13.18
 2006291909 metadata/md5-cache/media-gfx/shotwell-0.30.9
 2006291909 metadata/md5-cache/media-gfx/simple-scan-3.34.6
-2007010109 metadata/md5-cache/media-gfx/Manifest.gz
 2007010109 metadata/md5-cache/media-gfx/digikam-6.4.0-r1
 2006300609 metadata/md5-cache/media-gfx/gmic-2.9.1
 2006301139 metadata/md5-cache/media-gfx/scrot-9999
+2007020109 metadata/md5-cache/media-gfx/Manifest.gz
+2007020109 metadata/md5-cache/media-gfx/exiv2-0.27.3
 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
@@ -54552,17 +54612,17 @@
 2006291939 metadata/md5-cache/media-libs/jpeg-9d
 2006291009 metadata/md5-cache/media-libs/libcddb-1.3.2-r1
 2006291909 metadata/md5-cache/media-libs/woff2-1.0.2-r2
-2007010939 metadata/md5-cache/media-libs/Manifest.gz
 2006300609 metadata/md5-cache/media-libs/cimg-2.9.1
 2006300609 metadata/md5-cache/media-libs/exiftool-11.99
 2006300609 metadata/md5-cache/media-libs/exiftool-12.01
 2006301909 metadata/md5-cache/media-libs/gmmlib-20.2.2
 2006300609 metadata/md5-cache/media-libs/libmatroska-1.6.0
-2007010939 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200627-r1
 2007010209 metadata/md5-cache/media-libs/mesa-20.1.2
-2007010109 metadata/md5-cache/media-libs/mlt-6.20.0-r2
 2006301709 metadata/md5-cache/media-libs/openh264-2.1.0
 2006301709 metadata/md5-cache/media-libs/openh264-2.1.1
+2007020109 metadata/md5-cache/media-libs/Manifest.gz
+2007020109 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200701
+2007020109 metadata/md5-cache/media-libs/mlt-6.20.0-r2
 1702282326 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
@@ -55704,7 +55764,6 @@
 2006191340 metadata/md5-cache/media-tv/tvnamer-2.5
 2006222209 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2006222209 metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
-2006222209 metadata/md5-cache/media-tv/xmltv-0.6.1
 2006262339 metadata/md5-cache/media-tv/kodi-18.3-r1
 2006262339 metadata/md5-cache/media-tv/kodi-18.4-r1
 2006262339 metadata/md5-cache/media-tv/kodi-18.5-r2
@@ -55715,12 +55774,13 @@
 2006262339 metadata/md5-cache/media-tv/tvheadend-9999
 2006262339 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
 2006262339 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2
-2006290109 metadata/md5-cache/media-tv/Manifest.gz
 2006290009 metadata/md5-cache/media-tv/kodi-18.7
 2006290109 metadata/md5-cache/media-tv/plex-media-server-1.18.3
 2006290109 metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
 2006290109 metadata/md5-cache/media-tv/plex-media-server-1.19.1
 2006290109 metadata/md5-cache/media-tv/plex-media-server-1.19.2
+2007020109 metadata/md5-cache/media-tv/Manifest.gz
+2007020109 metadata/md5-cache/media-tv/xmltv-0.6.1
 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
@@ -56485,7 +56545,10 @@
 2006290109 metadata/md5-cache/net-analyzer/symon-2.87
 2006290009 metadata/md5-cache/net-analyzer/testssl-3.0.2
 2006291709 metadata/md5-cache/net-analyzer/etherape-0.9.19
-2007011239 metadata/md5-cache/net-analyzer/Manifest.gz
+2007020109 metadata/md5-cache/net-analyzer/Manifest.gz
+2007020109 metadata/md5-cache/net-analyzer/netdata-1.23.1
+2007020109 metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
+2007020109 metadata/md5-cache/net-analyzer/wireshark-3.2.5
 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
@@ -56589,8 +56652,6 @@
 2006141358 metadata/md5-cache/net-dns/libidn-1.35
 2006141939 metadata/md5-cache/net-dns/libidn2-2.3.0
 2006141939 metadata/md5-cache/net-dns/libidn2-99999
-2006141358 metadata/md5-cache/net-dns/maradns-2.0.09-r2
-2006141358 metadata/md5-cache/net-dns/maradns-2.0.14
 2006141358 metadata/md5-cache/net-dns/maradns-2.0.16
 2006141358 metadata/md5-cache/net-dns/mdns-repeater-20110921
 2006141358 metadata/md5-cache/net-dns/mydns-1.2.8.31-r1
@@ -56627,8 +56688,10 @@
 2006262239 metadata/md5-cache/net-dns/pdns-recursor-4.3.1-r1
 2006290109 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2006292139 metadata/md5-cache/net-dns/bind-9.16.4
-2006301739 metadata/md5-cache/net-dns/Manifest.gz
 2006301739 metadata/md5-cache/net-dns/bind-tools-9.16.4
+2007020109 metadata/md5-cache/net-dns/Manifest.gz
+2007020109 metadata/md5-cache/net-dns/maradns-3.5.0005
+2007020109 metadata/md5-cache/net-dns/pdns-recursor-4.3.2
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2006141358 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -56686,8 +56749,9 @@
 2006290109 metadata/md5-cache/net-firewall/psad-2.2.5
 2006291809 metadata/md5-cache/net-firewall/shorewall-5.2.5.1
 2006291809 metadata/md5-cache/net-firewall/shorewall-5.2.5.2
-2007011009 metadata/md5-cache/net-firewall/Manifest.gz
 2007011009 metadata/md5-cache/net-firewall/ufw-0.36
+2007020309 metadata/md5-cache/net-firewall/Manifest.gz
+2007020309 metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.17.22.13.42
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.31.19.17.35
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
@@ -56860,8 +56924,8 @@
 2006290109 metadata/md5-cache/net-im/slack-4.4.2
 2006290109 metadata/md5-cache/net-im/slack-4.4.3
 2006290109 metadata/md5-cache/net-im/teams-1.3.00.5153
-2006300309 metadata/md5-cache/net-im/Manifest.gz
-2006300309 metadata/md5-cache/net-im/telegram-desktop-2.1.14
+2007020109 metadata/md5-cache/net-im/Manifest.gz
+2007020109 metadata/md5-cache/net-im/telegram-desktop-2.1.16
 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
@@ -56914,9 +56978,7 @@
 2006141358 metadata/md5-cache/net-irc/sic-1.2-r1
 2006141358 metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r2
 2006141358 metadata/md5-cache/net-irc/unrealircd-5.0.5.1
-2006141358 metadata/md5-cache/net-irc/weechat-2.7.1
 2006141358 metadata/md5-cache/net-irc/weechat-2.8
-2006141358 metadata/md5-cache/net-irc/weechat-9999
 2006141358 metadata/md5-cache/net-irc/xaric-0.13.6
 2006141358 metadata/md5-cache/net-irc/znc-1.7.5
 2006141358 metadata/md5-cache/net-irc/znc-1.8.1
@@ -56931,8 +56993,9 @@
 2006280009 metadata/md5-cache/net-irc/quassel-0.13.1-r2
 2006290109 metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
 2006290109 metadata/md5-cache/net-irc/pisg-0.73-r1
-2006291909 metadata/md5-cache/net-irc/Manifest.gz
 2006291909 metadata/md5-cache/net-irc/polari-3.34.1
+2007020839 metadata/md5-cache/net-irc/Manifest.gz
+2007020839 metadata/md5-cache/net-irc/weechat-9999
 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
@@ -57344,7 +57407,6 @@
 2006290939 metadata/md5-cache/net-libs/cppzmq-4.6.0
 2006291909 metadata/md5-cache/net-libs/gtk-vnc-1.0.0
 2006290939 metadata/md5-cache/net-libs/libvncserver-0.9.13
-2007011239 metadata/md5-cache/net-libs/Manifest.gz
 2006302209 metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
 2006302209 metadata/md5-cache/net-libs/libmicrohttpd-0.9.68
 2006302209 metadata/md5-cache/net-libs/libmicrohttpd-0.9.69
@@ -57352,6 +57414,8 @@
 2007011009 metadata/md5-cache/net-libs/libwebsockets-4.0.16
 2007011239 metadata/md5-cache/net-libs/nodejs-14.5.0
 2006300939 metadata/md5-cache/net-libs/signond-8.60-r2
+2007020109 metadata/md5-cache/net-libs/Manifest.gz
+2007020109 metadata/md5-cache/net-libs/rpcsvc-proto-1.4.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
@@ -57708,7 +57772,6 @@
 2006141358 metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
 2006141358 metadata/md5-cache/net-misc/icaclient-19.12.0.19
 2006141358 metadata/md5-cache/net-misc/icaclient-20.04.0.21
-2006141358 metadata/md5-cache/net-misc/icecast-2.4.4
 2006141358 metadata/md5-cache/net-misc/ices-2.0.2
 2006141358 metadata/md5-cache/net-misc/ip-sentinel-0.12
 2006141358 metadata/md5-cache/net-misc/iperf-3.6
@@ -58102,7 +58165,6 @@
 2006290109 metadata/md5-cache/net-misc/clusterssh-4.30.600
 2006290109 metadata/md5-cache/net-misc/clusterssh-9999
 2006290109 metadata/md5-cache/net-misc/gcap-0.1.1-r1
-2006290009 metadata/md5-cache/net-misc/geoipupdate-4.3.0
 2006290109 metadata/md5-cache/net-misc/htpdate-1.0.7
 2006290009 metadata/md5-cache/net-misc/remmina-1.4.5
 2006290009 metadata/md5-cache/net-misc/smb4k-3.0.6
@@ -58110,16 +58172,18 @@
 2006290939 metadata/md5-cache/net-misc/bridge-utils-1.6
 2006291709 metadata/md5-cache/net-misc/etherdfs-20180203-r1
 2006291739 metadata/md5-cache/net-misc/kea-1.7.9
-2006291309 metadata/md5-cache/net-misc/rsync-3.2.2_pre2
 2006292009 metadata/md5-cache/net-misc/usbip-3.19
 2006292009 metadata/md5-cache/net-misc/usbip-4.13
-2007011009 metadata/md5-cache/net-misc/Manifest.gz
 2007011009 metadata/md5-cache/net-misc/asterisk-13.33.0
 2007011009 metadata/md5-cache/net-misc/asterisk-13.34.0
 2007011009 metadata/md5-cache/net-misc/asterisk-16.10.0
 2007011009 metadata/md5-cache/net-misc/asterisk-16.11.1
 2006300939 metadata/md5-cache/net-misc/curl-7.71.0
 2006301739 metadata/md5-cache/net-misc/freerdp-2.1.2-r1
+2007020109 metadata/md5-cache/net-misc/Manifest.gz
+2007020109 metadata/md5-cache/net-misc/geoipupdate-4.3.0
+2007020109 metadata/md5-cache/net-misc/icecast-2.4.4
+2007020109 metadata/md5-cache/net-misc/rsync-3.2.2_pre3
 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
@@ -58147,7 +58211,6 @@
 2002112051 metadata/md5-cache/net-news/yydecode-0.2.10-r1
 2006141358 metadata/md5-cache/net-news/liferea-1.12.7-r1
 2006141358 metadata/md5-cache/net-news/newsboat-2.13
-2006141358 metadata/md5-cache/net-news/newsboat-2.19-r1
 2006141358 metadata/md5-cache/net-news/quiterss-0.19.3
 2006141358 metadata/md5-cache/net-news/quiterss-9999
 2006141358 metadata/md5-cache/net-news/rssguard-3.5.9-r1
@@ -58159,8 +58222,9 @@
 2006191340 metadata/md5-cache/net-news/canto-curses-0.9.9
 2006191340 metadata/md5-cache/net-news/canto-daemon-0.9.7
 2006191340 metadata/md5-cache/net-news/rawdog-2.22-r1
-2007011009 metadata/md5-cache/net-news/Manifest.gz
 2007011009 metadata/md5-cache/net-news/liferea-1.12.8
+2007020109 metadata/md5-cache/net-news/Manifest.gz
+2007020109 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
@@ -58264,7 +58328,6 @@
 2006191340 metadata/md5-cache/net-p2p/deluge-2.0.3-r4
 2006191340 metadata/md5-cache/net-p2p/deluge-2.0.3-r5
 2006191340 metadata/md5-cache/net-p2p/deluge-2.0.3-r6
-2006191340 metadata/md5-cache/net-p2p/deluge-9999
 2006191340 metadata/md5-cache/net-p2p/nicotine+-1.4.1-r2
 2006182039 metadata/md5-cache/net-p2p/syncthing-1.6.1
 2006191340 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
@@ -58275,8 +58338,10 @@
 2006262339 metadata/md5-cache/net-p2p/rtorrent-0.9.8
 2006290109 metadata/md5-cache/net-p2p/resilio-sync-2.6.1
 2006290109 metadata/md5-cache/net-p2p/resilio-sync-2.6.3
-2006290939 metadata/md5-cache/net-p2p/Manifest.gz
 2006290939 metadata/md5-cache/net-p2p/tremc-0.9.2
+2007020109 metadata/md5-cache/net-p2p/Manifest.gz
+2007020109 metadata/md5-cache/net-p2p/deluge-2.0.3-r7
+2007020109 metadata/md5-cache/net-p2p/deluge-9999
 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
@@ -58565,7 +58630,6 @@
 2006141358 metadata/md5-cache/net-wireless/linssid-3.6-r1
 2006141358 metadata/md5-cache/net-wireless/lorcon-old-9999
 2006141358 metadata/md5-cache/net-wireless/mdk-3.6-r1
-2006141358 metadata/md5-cache/net-wireless/mfoc-0.10.7
 2006141358 metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2
 2006141358 metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r2
 2006141358 metadata/md5-cache/net-wireless/multimode-9999
@@ -58576,10 +58640,6 @@
 2006141358 metadata/md5-cache/net-wireless/qradiolink-9999
 2006141358 metadata/md5-cache/net-wireless/rfkill-0.5-r2
 2006141358 metadata/md5-cache/net-wireless/rfkill-0.5-r3
-2006141358 metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
-2006141358 metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
-2006141358 metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
-2006141358 metadata/md5-cache/net-wireless/rtl-sdr-9999
 2006141358 metadata/md5-cache/net-wireless/rtl_433-0.1_p20190709-r1
 2006141358 metadata/md5-cache/net-wireless/rtl_433-20.02_p20200327
 2006141358 metadata/md5-cache/net-wireless/rtl_433-9999
@@ -58673,8 +58733,13 @@
 2006262339 metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
 2006262339 metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
 2006262339 metadata/md5-cache/net-wireless/osmo-fl2k-9999
-2006290109 metadata/md5-cache/net-wireless/Manifest.gz
 2006290109 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
+2007020109 metadata/md5-cache/net-wireless/Manifest.gz
+2007020109 metadata/md5-cache/net-wireless/mfoc-0.10.7-r1
+2007020109 metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
+2007020109 metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
+2007020109 metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
+2007020109 metadata/md5-cache/net-wireless/rtl-sdr-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
@@ -60292,7 +60357,6 @@
 2006141358 metadata/md5-cache/sci-visualization/nonolith-connect-1.1
 2006141358 metadata/md5-cache/sci-visualization/opendx-4.4.4-r7
 2006141358 metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r2
-2006141358 metadata/md5-cache/sci-visualization/paraview-5.8.0-r3
 2006141358 metadata/md5-cache/sci-visualization/pythonprop-0.29
 2006141358 metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r3
 2006141358 metadata/md5-cache/sci-visualization/quickplot-0.10.6
@@ -60315,11 +60379,12 @@
 2006191340 metadata/md5-cache/sci-visualization/veusz-3.2
 2006191340 metadata/md5-cache/sci-visualization/yt-3.3.5
 2006191340 metadata/md5-cache/sci-visualization/yt-3.4.0
-2006212309 metadata/md5-cache/sci-visualization/gr-0.50.0-r1
 2006280009 metadata/md5-cache/sci-visualization/epix-1.2.11-r2
 2006290009 metadata/md5-cache/sci-visualization/gnuplot-5.2.8
-2006301409 metadata/md5-cache/sci-visualization/Manifest.gz
 2006301409 metadata/md5-cache/sci-visualization/gwyddion-2.56
+2007020309 metadata/md5-cache/sci-visualization/Manifest.gz
+2007020109 metadata/md5-cache/sci-visualization/gr-0.50.0-r1
+2007020309 metadata/md5-cache/sci-visualization/paraview-5.8.0-r3
 2002112051 metadata/md5-cache/sec-policy/apparmor-profiles-9999
 2002112051 metadata/md5-cache/sec-policy/selinux-abrt-9999
 2002112051 metadata/md5-cache/sec-policy/selinux-accountsd-9999
@@ -62960,7 +63025,6 @@
 2006292009 metadata/md5-cache/sys-kernel/zen-sources-5.4.15
 2006292009 metadata/md5-cache/sys-kernel/zen-sources-5.6.15
 2006292009 metadata/md5-cache/sys-kernel/zen-sources-5.7.5
-2007011239 metadata/md5-cache/sys-kernel/Manifest.gz
 2006301709 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 2007011239 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.187
 2007011239 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.131
@@ -62968,6 +63032,13 @@
 2007011239 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.229
 2007011239 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.50
 2007011239 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.7
+2007020109 metadata/md5-cache/sys-kernel/Manifest.gz
+2007020109 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.187
+2007020109 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.131
+2007020109 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.229
+2007020109 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.229
+2007020109 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.50
+2007020109 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.7
 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
@@ -63064,8 +63135,6 @@
 2006141358 metadata/md5-cache/sys-libs/libsemanage-3.0
 2006141358 metadata/md5-cache/sys-libs/libsemanage-9999
 2006141358 metadata/md5-cache/sys-libs/libsepol-2.9
-2006141358 metadata/md5-cache/sys-libs/libsepol-3.0
-2006141358 metadata/md5-cache/sys-libs/libsepol-9999
 2006141358 metadata/md5-cache/sys-libs/libsmbios-2.4.3
 2006141358 metadata/md5-cache/sys-libs/libstatgrab-0.91
 2006141358 metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r2
@@ -63165,7 +63234,6 @@
 2006290139 metadata/md5-cache/sys-libs/glibc-2.31-r4
 2006290139 metadata/md5-cache/sys-libs/glibc-2.31-r5
 2006290139 metadata/md5-cache/sys-libs/glibc-9999
-2006292209 metadata/md5-cache/sys-libs/Manifest.gz
 2006291909 metadata/md5-cache/sys-libs/compiler-rt-10.0.0
 2006292209 metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc2
 2006291909 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
@@ -63178,6 +63246,9 @@
 2006292209 metadata/md5-cache/sys-libs/libomp-10.0.1_rc2
 2006291909 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
 2006292209 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1_rc2
+2007020109 metadata/md5-cache/sys-libs/Manifest.gz
+2007020109 metadata/md5-cache/sys-libs/libsepol-3.0
+2007020109 metadata/md5-cache/sys-libs/libsepol-9999
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -63868,12 +63939,12 @@
 2006290109 metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1959.3_p1
 2006300009 metadata/md5-cache/www-client/chromium-85.0.4181.8
 2006291509 metadata/md5-cache/www-client/opera-developer-71.0.3735.0
-2006302339 metadata/md5-cache/www-client/Manifest.gz
-2006302339 metadata/md5-cache/www-client/firefox-68.10.0
 2006302339 metadata/md5-cache/www-client/firefox-bin-68.10.0
 2006302339 metadata/md5-cache/www-client/firefox-bin-78.0
 2006301639 metadata/md5-cache/www-client/netsurf-3.10-r1
 2006301539 metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1964.3_p1
+2007020109 metadata/md5-cache/www-client/Manifest.gz
+2007020109 metadata/md5-cache/www-client/firefox-68.10.0
 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
@@ -64121,15 +64192,15 @@
 2006262339 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
 2006262339 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 2006262339 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
-2006291209 metadata/md5-cache/x11-drivers/Manifest.gz
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
-2006291209 metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
+2007020109 metadata/md5-cache/x11-drivers/Manifest.gz
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r5
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
+2007020109 metadata/md5-cache/x11-drivers/nvidia-drivers-450.51-r1
 1702282335 metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5
 1705241709 metadata/md5-cache/x11-libs/liboglappth-1.0.0
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-0.2.1
@@ -64588,8 +64659,6 @@
 2006141358 metadata/md5-cache/x11-misc/sprop-0.1-r1
 2006141358 metadata/md5-cache/x11-misc/sselp-0.2-r1
 2006141358 metadata/md5-cache/x11-misc/sselp-9999
-2006141358 metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
-2006141358 metadata/md5-cache/x11-misc/sunflower-0.3.61
 2006141358 metadata/md5-cache/x11-misc/superswitcher-0.6-r1
 2006141358 metadata/md5-cache/x11-misc/sux-1.0-r4
 2006141358 metadata/md5-cache/x11-misc/sw-notify-send-9999
@@ -64768,8 +64837,10 @@
 2006291909 metadata/md5-cache/x11-misc/alacarte-3.36.0
 2006291709 metadata/md5-cache/x11-misc/projecteur-0.7-r2
 2006290939 metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
-2006302039 metadata/md5-cache/x11-misc/Manifest.gz
 2006301109 metadata/md5-cache/x11-misc/lightdm-1.30.0-r1
+2007020109 metadata/md5-cache/x11-misc/Manifest.gz
+2007020109 metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
+2007020109 metadata/md5-cache/x11-misc/sunflower-0.3.61
 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
@@ -65251,7 +65322,6 @@
 2006141358 metadata/md5-cache/x11-wm/bspwm-0.9.9
 2006141358 metadata/md5-cache/x11-wm/ctwm-4.0.2
 2006141358 metadata/md5-cache/x11-wm/ctwm-4.0.3
-2006141358 metadata/md5-cache/x11-wm/dwm-6.1-r1
 2006141358 metadata/md5-cache/x11-wm/dwm-6.2
 2006141358 metadata/md5-cache/x11-wm/dwm-9999
 2006141358 metadata/md5-cache/x11-wm/echinus-0.4.9
@@ -65355,8 +65425,8 @@
 2006290109 metadata/md5-cache/x11-wm/icewm-1.6.6
 2006290939 metadata/md5-cache/x11-wm/i3-4.18.1
 2006291909 metadata/md5-cache/x11-wm/mutter-3.34.6-r1
-2007011139 metadata/md5-cache/x11-wm/Manifest.gz
 2007011139 metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
+2007020109 metadata/md5-cache/x11-wm/Manifest.gz
 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
@@ -65457,4 +65527,4 @@
 2006292139 metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
 2006292139 metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.3
 2006292139 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.4
-2007011239 metadata/md5-cache/Manifest.gz
+2007020839 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 70a0e6243e0f..e1fae1cbef13 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Jul 2020 17:30:01 +0000
+Thu, 02 Jul 2020 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4e0115a5f745..242cb4b6e66c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-56911e5b7b0e6a0e71a495f7768123184ac7ac3b 1593595961 2020-07-01T09:32:41+00:00
+cbc4fa1728bf3098af59fb5f83208e3888362357 1593666361 2020-07-02T05:06:01+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index da1f1229f36b..5c193db852b3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1593596101 Wed 01 Jul 2020 09:35:01 AM UTC
+1593668101 Thu 02 Jul 2020 05:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 18c02caef6d7..00f6e1998acb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Jul 2020 09:38:22 +0000
+Thu, 02 Jul 2020 05:38:23 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fdf255a7a895..a6c950a64e67 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 6e318670fe2d..46d74bbed3b9 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -2,9 +2,11 @@ DIST netdata-1.21.1.tar.gz 3748090 BLAKE2B 5cc8dd47b768838eecc7c8af35a82548dc5bb
 DIST netdata-1.22.0.tar.gz 3786121 BLAKE2B ad34bcdb94cf44f8de154bf53b2e4ecbecee43c6cef2e5337c0fa6bd08b0feb41c25ee96e51fc6c54d72909559e5ac822b44153daa71255487bb0713ce6eca1d SHA512 3bf239c3e950195ef7b8b43f1c17f2cc94f9257a4f21665629f7b518cc6fcef3b0837743254efd03323408b39e2afa9533487147fa30c8f015705c391aa543f3
 DIST netdata-1.22.1.tar.gz 3787203 BLAKE2B cb09ade9540d81fac9b30738650206bce263b74445ce76bf3e9c57a7935bd5fed04806b3b3ba6631ad7ed119b93b1f36eb10261a239127e238e4cf09ca2f4e7a SHA512 47a0b6c4c1b3d8ab18cf25725223c72683ed74084f0efd09cddbe293950839315f8fcadb16c2e5fa9a179745f20b08ce8652d4b972465eacc6a1792b4cfc296e
 DIST netdata-1.23.0.tar.gz 3819410 BLAKE2B 33b41bacfdba03e0e8cc15ba6c200f98f4c3304136d57798c32410f04d568a2aaf12aebca87136b420d50d0f508d7ce849793b0c11b78a43c30ffed48a991c2c SHA512 edf333b40889547f454101694cadc7766da11acba96db1351d956634e5e240535f5bd9d029fbe3fce79d80e184bd60cc9649055264baea6279d1e63d2db2335f
+DIST netdata-1.23.1.tar.gz 3819097 BLAKE2B d04b41232248c4216227b759a66c6a4db48d466b44b73b00211b40e3c1512f91df84fd927dbd58bbdec178b3ef126b44e1ce61c213df98a31aebcac6a6831dd5 SHA512 2b4873aaac9a569c29c5de718da816fe2f6f2ee2de44ef82e8771d5fb02bca21257647c357cf0fb9117a86f075a1deefb9fea380c1ea66147eb34713e0722ad2
 EBUILD netdata-1.21.1-r1.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8
 EBUILD netdata-1.22.0-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b
 EBUILD netdata-1.22.1-r1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 EBUILD netdata-1.23.0.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
+EBUILD netdata-1.23.1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 EBUILD netdata-9999.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/netdata-1.23.1.ebuild b/net-analyzer/netdata/netdata-1.23.1.ebuild
new file mode 100644
index 000000000000..3b6458e2fb4e
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.23.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+		mysql? (
+			|| (
+				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
+				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
+			)
+		)
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-cloud \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 6d3068aabbfe..f02f4e5cec56 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -14,5 +14,6 @@ DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.6.0-r1.ebuild 4256 BLAKE2B 96efab5cf4cbdd45e5f64bf41bae3de3260dfa2ad0699ae76b2c6f98c3e88369df5173fb465628dceabb4f8bc92216c8bb51955454a8bc25bfadbed8a63e5906 SHA512 08bba445ae1e6a2e91bcdf903647919e645930bf95786d41ae2663acd1b01eb06009a2ba582ac559ccee45686168fcca9c4592e11570e7f17a2ddeb08329523b
 EBUILD rrdtool-1.7.1.ebuild 4251 BLAKE2B b422dd13981e28eaecc51396e6726eae4ce205ed2619a9a85035a2afba0729c8dcbb39956d08d5bf2422edeca2e876f05d6ba006d78f3980f10d3d332f3a83f6 SHA512 9c09607dd79f1bf9dd4936a45a1f58e7f2c5d13f0f7ea628ade5180612ed029a036168a05e7d60920e2c324a94d9b6fe283b7a27640c12430876d0ece41497db
+EBUILD rrdtool-1.7.2-r1.ebuild 4219 BLAKE2B a6d34b8875578e72fb8e9648faad2b309825940075e6a1b72af9d4df85d96acd0096ba27a35d8735e3ae23ccb509b61809a800dd1a21b34231aab46b50972d06 SHA512 349930ee617d987d165847c966c24804c0b97db2e17b123c1b22101cad8e7b6cee1cfd0b7507626d29ec302ec25d9528b8c30cca13cdaaeb1dbac8c1a3ac606d
 EBUILD rrdtool-1.7.2.ebuild 4229 BLAKE2B 21c6ee4a85ffa9d56efab72b2c1dd5971fe003d4eccff17e18c560c6494da652e9744b4699751c377d396bb809d810038d0e250dc04179cdeabd6b5c170b32b6 SHA512 7fd0ef299215784dd335671bbd24ecf65e22b0ccbc9d63e0066679d1fc386bc92537d72b04d55e27b039331d6bf16070fdcef30110880266f2a6aaec4fa6a4c4
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..18ef0863e7e4
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools perl-module distutils-r1 flag-o-matic multilib
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
+	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
+	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
+)
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	if ! [ -f doc/rrdrados.pod ]; then
+		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
+	else
+		die "File already exists: doc/rrdrados.pod. Remove this code!"
+	fi
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	if ! use graph; then
+		sed -i \
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+			tests/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	export rd_cv_gcc_flag__Werror=no
+	export rd_cv_ms_async=ok
+
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d32813593599..df53dd8542ec 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,6 +5,8 @@ AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.2.4.tar.xz 31580440 BLAKE2B c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89 SHA512 67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097
+DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93 SHA512 3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277
 EBUILD wireshark-3.2.4.ebuild 7043 BLAKE2B 3a81a5738c7a55d89755a3f1b5462ddafa420891d738350dd4f0159626148d0a4a28038050b148dc5f7fd90fde758bfea8e658f1c48606bad423719b7b899812 SHA512 42ce3ac95cc7f06f0a5fa524a5b8d5c35bdd3f0001ccf1c1bbb5034139ae9bc9378303b68a4858020b1463b33ddddf242b77743679b763588593d4e593a74b3c
+EBUILD wireshark-3.2.5.ebuild 7047 BLAKE2B 78646ff4d82cfd941f0a2495c710a9aaf7ba717c063ee3119155b0e5281aebf356b079a7417e162f742726d1f46f3b404c0da6a3a8533b5cf956d4ef55ebabd2 SHA512 1feb80295c778c3d5f9c8b673503a39372f425a01db2bcb2e7f9e4121a89592fe2ea3b5942f6f23ec3bcc47425be84a2bd173868e039e06d31d41b7fa4a2d523
 EBUILD wireshark-99999999.ebuild 6726 BLAKE2B 725f9834e9a57f9d055ece469de2a76b0d1af2a856eee7987f51afac25b9371a11bb000a47cd2bff113a85bf9b3842e6bd667b880430e7ce1a7697b6133ce4df SHA512 c45f48fa8296ff46af4161783fa0de82c9ee89f8c2e1ace27c31275d185dc1cf4831ad93b54d23f512422c921598b1f98025779a1bcb689254b9e1b160d6f3f2
 MISC metadata.xml 4887 BLAKE2B fe155238f794922efa1707256697726e556138179e431ca65376fa66c9904ef1cdbbe6018b583f61af3969be618e90b999969da92ce1b782f30f412b0c8305ca SHA512 40e145145120e0301aae8438d8b8782d2414946ac80f5e3d051261eb9372b823a74e4f779d5c4413fe9eb833c2f48e149ca64259f7498bb97275eadc0238a7b3
diff --git a/net-analyzer/wireshark/wireshark-3.2.5.ebuild b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
new file mode 100644
index 000000000000..9ecfd3d5c9b3
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.5.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+	test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${D}"/usr/share/appdata ]]; then
+		rm -r "${D}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 335328eb8c67..ed096f4c7938 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 3d3c3e4d1a9a..8a730530e131 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -5,10 +5,8 @@ AUX maradns-2.0.09-build.patch 1549 BLAKE2B 4b74391d9ddc294a8060bc24f769ace28faa
 AUX maradns.service.in 159 BLAKE2B 2ecd43d92a6c804fd713c0e1e22a18049ab410ccb0b92ec9ffe7621605e1dfea65c880369d0530e59cf061f6fb402cd83175f38be27b43d82b65a7175434e648 SHA512 0de3b9141b8266cb6443b8a7fcb6243782059d2ea45b89421158ded607413eb491542c279f2a9b4455e9396e6ba20e46aed8f46eba3b04e5bd428f335c4b9582
 AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e208e90009900faf8f93c9c43ae80fe0b618202b2aff5cd2302af253a4d38d7d6486c8bc05 SHA512 e893020a934c5927b772189c034469055cd0d8a8ab3e066fe063e30999be6a6679e7b95c2761dec1326cec37fe5261541fbb27e9be796681764c75252b10e90b
 AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7
-DIST maradns-2.0.09.tar.bz2 1139409 BLAKE2B 8c3709241b85f9069eb4e18098f7753b19bcc87d32bbb36aef42cb8ec123dc73b8e29e79b5efe1083035b2378a484e2c00038700647d5e75f469589b37b351e2 SHA512 42bfcafaf4e465d8d566b4d9ea8383b5d0f553486b86dd807b35a07358987227e5dc8187de0e8192fba5b53098d61f91091cec112ef7cc80c5d5e73d8acff3bf
-DIST maradns-2.0.14.tar.bz2 1156272 BLAKE2B 7e96d0769dd1df70316cc1bd79fb7e902c723f78db035fe721aaab0d6902958a40c2743374824ae024759164ad9cbda9a3c6ecaec7cc6bf3c5fa7b384101c16f SHA512 57527bba2f9801904f59cc7d9e56cbd7124635841ad8c91cbd3d1b8d58e7fe38d509e19f6ea53e2790777e054b68bb8df02bfa820ba7c9dbe65262e1993a2aa4
 DIST maradns-2.0.16.tar.bz2 1127504 BLAKE2B 142166370efed2d52c0a1e659bf0056f8d13cc5eca3c1d30c0278b81047aa58ce6c6f3f8496e982841b9dcd541ffd2c24467b8062aa5a7ffb1f31ef6cf841a15 SHA512 9959a7b6724aff5561fa9303b3d7c967e298fd63d95ef7e34d80514dde8871c19887c184a6466779f2833c295233dd1d54a7c06928ac58dcbb374281deb13f17
-EBUILD maradns-2.0.09-r2.ebuild 2691 BLAKE2B 4cfc46b00741e7263f2e941fbc2028bd1587d0919061dfe07cecacfbdaa6326da404dfbeba99541c9197e089c5709146d9848b4f85f16b069a56b5c8cec6fdc9 SHA512 481512b5a855aa8751ae8d3699c2b3218cf05e5ec2808df30502ed2e20756e1d50ce8714e8acd09eba09f6b3faa8442345bc9187ca5eae53a0bd178421a92f12
-EBUILD maradns-2.0.14.ebuild 2848 BLAKE2B 62f4a9e99a249fe5084ee5d4b57513d151fd4fbb3a39d382c2d4c40d72c143d9051c8b6bbbfcf8cfa06c4f5929c171429e9eb1b42f038b8d4798becbcab353bd SHA512 bac2001e02da3ab7cd7be5009953d2cdeb73062c2ded1e58b35998001ae6d77b0c51a3166202f291733c635b751fd82cadeed6d3171bdfb1bce5032fd59cfc7b
+DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
 EBUILD maradns-2.0.16.ebuild 2814 BLAKE2B 5c7baba17ac15bcfe55c3e1600f4139e62564443647b53def559468c6c4a75c1dfad0212ccf7ac0ff73d4f8b7c241351629766d5b10f12c29a2c7a118e073ed6 SHA512 155e04103597ec88ad5f4e47ceb2829cc6d64e5971f7fd9f2a5198f0def046612fdfa29f14b7b45a173909585e84c0d3a6fd2f3854faf489de7f5261fa7eba49
+EBUILD maradns-3.5.0005.ebuild 2360 BLAKE2B 00865af6b60997b605ec87ea4ca19de88007faf30de57eb5dc4a42c301ab89b770b61f54aa42bc7e7112ab761bf2c2ce3e70ef7ec2f27c8f8c0a524c68fb7109 SHA512 dfb591d714004888e7719359364c56e16bc19a759af66ca6edd0f5f68f25000365acc9de115f332481a830b90e7a636521421fd556451da7aea0a77cac10c111
 MISC metadata.xml 728 BLAKE2B 07077c81b008d0ab019995c21873fcf61ff636a346eb582d966f81dabd4a9a7e3ad2a9879c6ca33708828b54b3ae2dcafb8c89716dd571c95a456add01e43863 SHA512 0b0c7db834ae6a1a94069873c72cfe2e87840d89d556ffc7a2887c426321ced9b474dc32292010f4dd8918389906cda16b2f3ae1251c7a9ab6be055763ae8330
diff --git a/net-dns/maradns/maradns-2.0.09-r2.ebuild b/net-dns/maradns/maradns-2.0.09-r2.ebuild
deleted file mode 100644
index 2124be1f395b..000000000000
--- a/net-dns/maradns/maradns-2.0.09-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs user
-
-DEADWOOD_VER="3.2.05"
-
-DESCRIPTION="A security-aware DNS server"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
-
-# The GPL-2 covers the init script, bug 426018.
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="authonly examples ipv6"
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.06-askmara-tcp.patch"
-	"${FILESDIR}/${PN}-2.0.06-duende-man.patch"
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating group and users"
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-	eend ${?}
-}
-
-src_configure() {
-	# Use duende-ng.c.
-	cp  "${S}/tools/duende-ng.c" "${S}/tools/duende.c" \
-		|| die "failed to rename duende-ng.c"
-
-	tc-export CC
-	./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}"
-}
-
-src_install() {
-	# Install the MaraDNS binaries.
-	dosbin server/maradns
-	dosbin tcp/zoneserver
-	dobin tcp/getzone tcp/fetchzone
-	dobin tools/askmara tools/askmara-tcp tools/duende
-	dobin tools/bind2csv2.py tools/csv1tocsv2.pl
-
-	# MaraDNS docs, manpages, misc.
-	dodoc doc/en/{QuickStart,README,*.txt}
-	dodoc doc/en/text/*.txt
-	doman doc/en/man/*.[1-9]
-	dodoc maradns.gpg.key
-	dodoc doc/en/*.html
-	dodoc -r doc/en/webpage
-	dodoc -r doc/en/tutorial
-	if use examples ; then
-		docinto examples
-		dodoc doc/en/examples/example_*
-	fi
-
-	# Deadwood binary, docs, manpages, etc.
-	if ! use authonly; then
-		dosbin deadwood-${DEADWOOD_VER}/src/Deadwood
-		doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
-		docinto deadwood
-		dodoc deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende,FAQ}.txt
-		dodoc deadwood-${DEADWOOD_VER}/doc/{Deadwood,FAQ}.html
-		docinto deadwood/internals
-		dodoc deadwood-${DEADWOOD_VER}/doc/internals/*
-		insinto /etc/maradns
-		newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
-	fi
-
-	# Example configurations.
-	insinto /etc/maradns
-	newins doc/en/examples/example_full_mararc mararc_full.dist
-	newins doc/en/examples/example_csv2 example_csv2.dist
-	keepdir /etc/maradns/logger
-
-	# Init scripts.
-	newinitd "${FILESDIR}"/maradns2 maradns
-	newinitd "${FILESDIR}"/zoneserver2 zoneserver
-	if ! use authonly; then
-		newinitd "${FILESDIR}"/deadwood deadwood
-	fi
-
-	# systemd unit
-	# please keep paths in sync!
-	sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
-		-e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
-		"${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
-		|| die "failed to create the maradns.service file (sed)"
-
-	systemd_dounit "${T}"/maradns.service
-}
diff --git a/net-dns/maradns/maradns-2.0.14.ebuild b/net-dns/maradns/maradns-3.5.0005.ebuild
similarity index 62%
rename from net-dns/maradns/maradns-2.0.14.ebuild
rename to net-dns/maradns/maradns-3.5.0005.ebuild
index 8d0ca3ee8416..049cb0ac80e3 100644
--- a/net-dns/maradns/maradns-2.0.14.ebuild
+++ b/net-dns/maradns/maradns-3.5.0005.ebuild
@@ -1,45 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-single-r1 systemd toolchain-funcs user
-
-DEADWOOD_VER="3.2.10"
+inherit systemd toolchain-funcs python-any-r1
 
 DESCRIPTION="A security-aware DNS server"
 HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
 
 # The GPL-2 covers the init script, bug 426018.
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="authonly examples ipv6"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="examples ipv6"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
+	acct-user/maradns
+	acct-group/maradns
+	acct-user/duende
 	dev-lang/perl"
 
-pkg_setup() {
-	ebegin "Creating group and users"
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-	eend ${?}
-
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 
-	# Use duende-ng.c.
-	cp  tools/duende{,-ng}.c \
-		|| die "failed to rename duende-ng.c"
 	# replace "make" by "$(MAKE)" to avoid GNU Make warning
 	sed -i 's/\ make\ /\ \$\(MAKE\)\ /g' build/Makefile.linux \
 		|| die "can't patch build/Makefile.linux"
@@ -56,9 +43,7 @@ src_install() {
 	# Install the MaraDNS and Deadwood binaries
 	dosbin server/maradns
 	dosbin tcp/zoneserver
-	if ! use authonly; then
-		dosbin deadwood-${DEADWOOD_VER}/src/Deadwood
-	fi
+	dosbin deadwood-${PV}/src/Deadwood
 	dobin tcp/{getzone,fetchzone}
 	dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
 
@@ -66,11 +51,9 @@ src_install() {
 	dodoc doc/en/{QuickStart,README,*.txt,*.html}
 	dodoc -r doc/en/{text,webpage,tutorial}
 	dodoc maradns.gpg.key
-	if ! use authonly; then
-		docinto deadwood
-		dodoc deadwood-${DEADWOOD_VER}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
-		dodoc -r deadwood-${DEADWOOD_VER}/doc/internals
-	fi
+	docinto deadwood
+	dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+	dodoc -r deadwood-${PV}/doc/internals
 
 	# Install examples (optional)
 	if use examples ; then
@@ -80,25 +63,19 @@ src_install() {
 
 	# Install manpages
 	doman doc/en/man/*.[1-9]
-	if ! use authonly; then
-		doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
-	fi
+	doman deadwood-${PV}/doc/{Deadwood,Duende}.1
 
 	# Example configurations.
 	insinto /etc/maradns
 	newins doc/en/examples/example_full_mararc mararc_full.dist
 	newins doc/en/examples/example_csv2 example_csv2.dist
-	if ! use authonly; then
-		newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
-	fi
+	newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
 	keepdir /etc/maradns/logger
 
 	# Init scripts.
 	newinitd "${FILESDIR}"/maradns2 maradns
 	newinitd "${FILESDIR}"/zoneserver2 zoneserver
-	if ! use authonly; then
-		newinitd "${FILESDIR}"/deadwood deadwood
-	fi
+	newinitd "${FILESDIR}"/deadwood deadwood
 
 	# systemd unit
 	# please keep paths in sync!
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 37a8a9bafd45..37ab3928ebfa 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,6 +2,8 @@ AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3f
 AUX pdns-recursor-4.3.1-gcc-10.patch 2592 BLAKE2B da68e0311a30ba894cfa82b1140dca85b2547cc0885d9fec6dd0721c38f531777e06d27ede7bdc92996e60bfb621351bab66c1ce19cc923f8fc3b1b44a4bde05 SHA512 16a81afc5a3a7cdac4acee52b30ff61cea97ef1c543fc0858897c2caa19fedd1e71f9787c4674122ee7f96d4130d6b5f37b0cdcc6bcd44d14765845877c02ab4
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
 DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8
+DIST pdns-recursor-4.3.2.tar.bz2 1354549 BLAKE2B 253f9a6ec3b7bfb4d3a97953c9f65458b479bdaa20fcc28d980a1cf4c1f15f80ad35251687bb5410f14268be79de4bbcec8bc36663a0a8eb51894fa6e4242547 SHA512 d1ca566dc8785fda3764838a0ea598acc4106b6261ebdbbe43fc6a6e4a82c375f7ef3f6d23fbd9b216067eb9cf56fcae6d460bfc7957ba4c201d466ad15d75d7
 EBUILD pdns-recursor-4.3.1-r1.ebuild 1976 BLAKE2B 349a1e9ece84876f4942fbd71e2a4627e10ae2095794540ed8537314d614d9cbc3705d889493c188acb73583d144fc4afa8cdb15c71b0b557d99d0b96dd58a37 SHA512 87ec69617de53ee96947d566475753499f0997a5597e8e48ebbc84e2dcd10992e5bb920980c4567fd68c9d02aa75d855f73feaa990d68720196b828fbcadc5f8
 EBUILD pdns-recursor-4.3.1.ebuild 1871 BLAKE2B 41b5d33da55a8a0fabfd0d69666ad23a7104f10343d10bc949b269596ed8238f9c9cd3f573a2a026f876046fce42cf7787ac264cf1fe69bd8822c8605a19c544 SHA512 26fca6db80aa43334985e27161a64a893d150f0e746fe0bb834b5341096f0eed79524c432b8b95ad06bce152ef65fcc76b7befc4a2dd100729b7ffa077c0471e
+EBUILD pdns-recursor-4.3.2.ebuild 1891 BLAKE2B 53322aa8c1bb8cb8e8fe2d539e646b6435535b8cf404a80f2ded85c03a73819cf0d29ea8c60bdfc34ec00c607dd1b76432be4581ac5ded9768899ceaff3c447e SHA512 5eeb24db8aadc281f4f5af29321cdae2c7df3fd230089f7f2f3b0461275fef1af29287e80e18d57754c9fa46eb6299e147c2da9dfca0f8d7490e66d9bdcda471
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
new file mode 100644
index 000000000000..0806261b1f4c
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
+REQUIRED_USE="dnstap? ( protobuf )"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index f370ffb6a211..be5ce6794e16 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 2d34e4a919f5..116c21e2a65b 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -6,5 +6,6 @@ AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19d
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
 DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
 EBUILD fwknop-2.6.10-r1.ebuild 3706 BLAKE2B 25805b725cca9f3c5345d49edafd7c4e6ca40f44ab3206b829c61be43447b19864f645b9a93e1d794c8680d275ad2d88549733c62a3bd8f91085e3f9a3f0b9e3 SHA512 a9267412dc4d1ab74be5479a857475f1571599a7f08e13699de90cfd13bc97ec5c8299e818dd34bb1c99e3dbb30777ff72502467b9acb81f00ef35e00944748f
+EBUILD fwknop-2.6.10-r2.ebuild 3353 BLAKE2B 0e7577c18dd8ff04fb6b529585801bb27e6218fb3eb3424e7f0c49f17b24c35fe2547474eeb565f20cb4301588a6d9757ae5284743b2f74ff7511febe87986eb SHA512 2e30cd3499ee75d9e5ae35ae2ef3f313689a3d2afd10634d4c6e4a88281804ff497f4bb3f344d278dbe2b2d44050bc58c25535067f6b0a96d93db43defee3783
 EBUILD fwknop-2.6.9-r1.ebuild 3794 BLAKE2B 34962c2026d3ad921bca886f69483fccbb5b107c497fffda054fcd2088548afe905cf19b16b4d3f9017fb9383fc8580ed98e54f7b9f7f0cdb9c4b7fe3e6861a3 SHA512 a07321223267ed412af9a72fd4527b358bf49f2de34fd03be80e40a33a345acf835fe1a2314f5e23d56724d80be68a021918c35e02ca78617743bed338b2ec87
 MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
new file mode 100644
index 000000000000..64a0407290b7
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="https://www.cipherdyne.org/fwknop/"
+SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client extras firewalld gdbm gpg +iptables nfqueue +server static-libs udp-server"
+
+DEPEND="
+	client? ( net-misc/wget[ssl] )
+	firewalld? ( net-firewall/firewalld )
+	gdbm? ( sys-libs/gdbm )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	iptables? ( net-firewall/iptables )
+	nfqueue? ( net-libs/libnetfilter_queue )
+	server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	nfqueue? ( server )
+	server? ( ^^ ( firewalld iptables ) )
+	udp-server? ( server )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
+
+DOCS=( AUTHORS ChangeLog README )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'.
+Please edit them to suit your needs and then remove the .example suffix.
+
+fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
+You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
+instead of the default one chosen at compile time.
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Install example configs with .example suffix.
+	if use server; then
+		sed -i -e 's|conf;|conf.example;|g' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/run"
+		$(use_enable client)
+		$(use_enable !gdbm file-cache)
+		$(use_enable nfqueue nfq-capture)
+		$(use_enable server)
+		$(use_enable udp-server)
+		$(use_with gpg gpgme)
+	)
+	use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld")
+	use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default_src_install
+
+	if use extras; then
+		dodoc extras/apparmor/usr.sbin.fwknopd
+		dodoc extras/console-qr/console-qr.sh
+		dodoc extras/fwknop-launcher/*
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
+		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+		systemd_dounit "${FILESDIR}/fwknopd.service"
+		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
+		readme.gentoo_create_doc
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name libfko.a -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		readme.gentoo_print_elog
+
+		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
+			echo
+			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
+			ewarn "created firewall rules, which is an important security feature."
+			ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel."
+			echo
+		fi
+		if use nfqueue && \
+			! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then
+			echo
+			ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode."
+			ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel."
+			echo
+		fi
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 95652190e94a..802850857f76 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 097264ba0f30..75232d319631 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,14 +1,13 @@
 AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4ac980a63e054fe841876133e81a9420c52d3d9c91066725a9a0049ae9bc1e80d46c22e4ca8dd9b18cfc328 SHA512 da144cd13f42cac06aa1932945fccf7367f37edca7fb4781e8fa38fe8af1cb52b3b6062396a9a5d2e243966bdbb093e541042446e237d88c59bc855ea347c4e3
-AUX 2.1.14-no-gtk.patch 850 BLAKE2B b2bfb6fbd220d5fbf426f3488a5f1937340615e110dbd0a62dd3cdcd3827ac7b80f3548c086a80487b9df8458839a96d3fe00d6788da6d4b616f1930e90cee7c SHA512 d7aa7cff85b5e4c83420d6200892d2f8f4158d531253ae5936e97f906648cf02ed597f8d7890762a8fbb5a6afac746ef7cc16132c04baf71529e3c790790beb1
 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.11-full.tar.gz 36548657 BLAKE2B 969ee0b680cb225c86bbab25e792b9fa21182227d73f062700ac56f08de83b249cca41d661c711e1a7dbcbeeeda70ddb13535403bee6f001ea10c4864b995c67 SHA512 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42
 DIST tdesktop-2.1.12-full.tar.gz 36549678 BLAKE2B 0a973f8f560ccd30a35f172d4a63af9b4d16601af47f2ed71f37f6c3845e328501a79062f2917f37842248646b60ff3d88f8444d75df8bbae967969907cd3a83 SHA512 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff
 DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8
-DIST tdesktop-2.1.14-full.tar.gz 36578245 BLAKE2B 0ec3e5e4d696544975a95a6ab70f240b2ab172ab5135ad037d1537d57b0aef2ce9f479cdfae89a6499ef31e391ac65e3d40476918beadac11d4541f4a52e7ead SHA512 4c48e235ac790ecd2d5e7344de9641d0e843e7d2e46a3883f8016587034bc7f5aebd4e1b26c701a225dfb3777b610d69a2ccc685aaa5ee08a163fdd49fee1e9e
+DIST tdesktop-2.1.16-full.tar.gz 36580804 BLAKE2B 9bc912800294ebf004d34a0ed00d4edc91aa051cc0a13ab5f27bc46d03a9d94f8b47d0cca3b27777043d2b1aed01d258075d8d554695c366b0704562c16bea10 SHA512 7bcd608030e0b48cf3350cecdffbcdafa7ff254b7b8c931a24b3c02813a60d5bbd523012febbd0d4aa80e0b991c3b09163419b7b5eaa76f2016cc56daed35045
 EBUILD telegram-desktop-2.1.0-r1.ebuild 3715 BLAKE2B 78d184427e162ee5fa54f8f3e1fc495d279ffef5e80db51097fb8e144253e3c8abca6da1c5f31f313ccd8883421c1144defd8a4dc9792977b1cd2347eb7e059e SHA512 a22d939a8a8c939e8205a6aa3f537f627370d3f929b817e0ec77e5d95a24a12b8ca5fa6ef87a1b36782204127d13ae5cdbb46a8f26eab9b0bd13d24c77119040
 EBUILD telegram-desktop-2.1.11-r1.ebuild 3871 BLAKE2B 8fb5f786d077016fa3e487eb3e3d895b8ea9224c92a257fb2ea613c225f69e9f441160f0d329ab9fdcc9500784e6e29ad5b1298cd77a6c2c9bc19b68143425d7 SHA512 32e27091413618701d1eec5f30f4a2182be39b358f773c272aedd5ede4da9cee0d589ee9db123a502c4a4b9b954044edf1ad007fd1cb6822a5cad7ad5d94b886
 EBUILD telegram-desktop-2.1.12.ebuild 3888 BLAKE2B fd9413f9899f8dc6c3d03693a60151c5f2323102f157c65108ab2b6418d6c005c59321deeb66a1b0d4c2e644904f382014332e3e370d90e0ae65a91a1a85b4e6 SHA512 91e37a46a7ce9d85393fe5580f5df100a0508a783a750e13b839e9e497c9dadfab28715d07e02f14dbb67d193efdabe55cf7c6a7d9f41127d0689e9ab97a7e1c
 EBUILD telegram-desktop-2.1.13.ebuild 3888 BLAKE2B fd9413f9899f8dc6c3d03693a60151c5f2323102f157c65108ab2b6418d6c005c59321deeb66a1b0d4c2e644904f382014332e3e370d90e0ae65a91a1a85b4e6 SHA512 91e37a46a7ce9d85393fe5580f5df100a0508a783a750e13b839e9e497c9dadfab28715d07e02f14dbb67d193efdabe55cf7c6a7d9f41127d0689e9ab97a7e1c
-EBUILD telegram-desktop-2.1.14.ebuild 4273 BLAKE2B bbb112a880263ff3977cb2d66589771bf61724300498e7ac0a5bf0cc525f10f28b63d44447527012101ac4c38ea35567c5a22a036db83772de10eda4e82ff248 SHA512 01ef057b16c1bd899e0fcd7af942eda7917a8b9244c3dd31961d6b0886ca6abfc13a19e586610428352573375ac605134f95e0ab8be5f4cdabb3fae9ad527de4
+EBUILD telegram-desktop-2.1.16.ebuild 4227 BLAKE2B 3047f6e3ec1484ec2663cb355108aca3fc14226f02a5d74cc31cd4d0b3efa4ef841114adfe8ce88e1b0f7aed0dc61b4bc04fa9f66dd8d1a2d48d0c1e6b93d60f SHA512 692c2f9729adf4309c002506bf7f079a74787d32385dd446c97f7b0a4151b8b6daa775007815b00d495959d964f4dc95952d92f2106aedde8e903fdd9043f678
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch b/net-im/telegram-desktop/files/2.1.14-no-gtk.patch
deleted file mode 100644
index 365b7f2967e3..000000000000
--- a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-index eb23796..3424bab 100644
---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-@@ -521,6 +521,7 @@ QString GetIconName() {
- }
- 
- bool GtkClipboardSupported() {
-+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
- 	return (Libs::gtk_clipboard_get != nullptr)
- 		&& (Libs::gtk_clipboard_wait_for_contents != nullptr)
- 		&& (Libs::gtk_clipboard_wait_for_image != nullptr)
-@@ -532,6 +533,8 @@ bool GtkClipboardSupported() {
- 		&& (Libs::gdk_pixbuf_get_rowstride != nullptr)
- 		&& (Libs::gdk_pixbuf_get_has_alpha != nullptr)
- 		&& (Libs::gdk_atom_intern != nullptr);
-+#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
-+	return false;
- }
- 
- QImage GetImageFromClipboard() {
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.16.ebuild
similarity index 97%
rename from net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild
rename to net-im/telegram-desktop/telegram-desktop-2.1.16.ebuild
index c8c7b4eb6686..6ddaac567726 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.14.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.16.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5[png,X(-)?]
 	media-fonts/open-sans
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20200627[alsa?,pulseaudio?]
+	~media-libs/libtgvoip-2.4.4_p20200701[alsa?,pulseaudio?]
 	media-libs/openal[alsa?,pulseaudio?]
 	media-libs/opus:=
 	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
@@ -76,8 +76,6 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PV}-no-gtk.patch" )
-
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
 		ewarn
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 187fec5aa399..dd6800c5f68b 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 6c0785f00060..5db11da15e66 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,4 @@
-DIST weechat-2.7.1.tar.xz 2226768 BLAKE2B 0ce14646c8d383c3338a52bacbb9cac036c2611cc8aae2c790af73df5aab25e49f8bc2addcf4527884774925a9b222c15a7a696d93ad57197052a746a0da95f6 SHA512 eb0cc4c7e0f2cf18d522b49429fe2d77b1cee3225686d0bc09f80a69b17362af0923df4cd5f4859207d84acb762d4042cd5b57799705d0b7e4759eade6c660e0
 DIST weechat-2.8.tar.xz 2248868 BLAKE2B 756ce1719ecaa351a2780641758bb7587b45b8e6b16e5a82833009ddb27f71783a461cf89662e04118c75e2d372103eda5a11c98feb62d624b330b223bf22ede SHA512 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
-EBUILD weechat-2.7.1.ebuild 4031 BLAKE2B bb3030970a66c9c4438f646467c57e7aeaa657de7a6753b94b0f36755c8538ecdbc875de06c3bbcf61a5c36afe982632f7d96e133a567d988dce36ec47047bf4 SHA512 48f7522555d69a4d389798202f98661436b46463937973a08ecb876b435161098c663c542ae618797e474b6ab0a845555e7250eba785a473589aed39abe3e762
 EBUILD weechat-2.8.ebuild 4038 BLAKE2B 6121de5bbcaaf326916f7ada4dd370f1b1994b79221cb25243ef9fe9532130b0449e0ba8d02c0af74d4db28be62a01b6030b94b89ced69b44980599962cde445 SHA512 60e77e01f0ea4aa6b3d3e44fa4a9bbd4a975ac9e19314dbd51107e33528810e6aa2372b64f0c5105126d8751457b411d31658dc6d75261a6a74c25c4f9c5bd7d
-EBUILD weechat-9999.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
+EBUILD weechat-9999.ebuild 3964 BLAKE2B 6d017e33ee5f49c90aaa65dc7debb53aa106df4caf2d67d71e90b8f4ea4d6700fcdaeed1c8fe0fb033b52cd28ed7e3a98a40beb0338b26cfc96b71a35d5028a0 SHA512 ad48f552017c801c6ecd6e403b4ae4991e9dbc71e3daba4edc18fd1ebda63f0a999aee992a116308362957e31735b9b48fd523b98d3c19db314a1174b858ddae
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-2.7.1.ebuild b/net-irc/weechat/weechat-2.7.1.ebuild
deleted file mode 100644
index f5edee5b5e0f..000000000000
--- a/net-irc/weechat/weechat-2.7.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit cmake-utils python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ppc64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR=/usr/$(get_libdir)
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-	)
-
-	if use python; then
-		python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 37b7a1e45182..a63694304e87 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -26,23 +26,23 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
+	net-libs/gnutls:=
 	sys-libs/ncurses:0=
-	sys-libs/zlib
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
 	charset? ( virtual/libiconv )
 	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
+	lua? ( dev-lang/lua:0 )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
-	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 "
@@ -67,7 +67,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# install only required translations
 	local i
@@ -115,7 +115,6 @@ src_configure() {
 		-DENABLE_EXEC=$(usex exec)
 		-DENABLE_FIFO=$(usex fifo)
 		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GNUTLS=$(usex ssl)
 		-DENABLE_GUILE=$(usex guile)
 		-DENABLE_IRC=$(usex irc)
 		-DENABLE_LOGGER=$(usex logger)
@@ -140,7 +139,7 @@ src_configure() {
 		python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6d5a8b6fd1df..0b9ed2b01c71 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index a5b5eca6515f..d9124ac2a8d4 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,6 @@
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
+DIST rpcsvc-proto-1.4.2.tar.gz 61788 BLAKE2B e941fa86088d690e3e80a501beb5169a51ff77b60d618f54db9d9fd5fb96c2b2a4277ab8d847dcdb29dadd2f6947d155b15cd8b6af1f1420e023da8637d555c0 SHA512 6769f9439e3f187eebdeef4ee8d54f8a6fee6f410e3137d0c1b26e61b705873932890856faff55b68c39aa702e456b36fe9410b85baf1ef9b20ee97f2158971a
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
 EBUILD rpcsvc-proto-1.4.1-r1.ebuild 945 BLAKE2B b37c837ee226bf9208107c89c2b66b6e7209ff2226cd73c41f76a711959f3aee7188c53262c37dfd409c9968ed27d79db92c6d1c2fc480912fcbe7397b3aa59f SHA512 8d4078193d552d75b6666ea25c4ca1c03a71ab28236bf35609fa08a902cbd23e6e40f5b17f6e867bb83077c70b24fe8e0de74af52d28c67b230a9072eadae8a6
+EBUILD rpcsvc-proto-1.4.2.ebuild 954 BLAKE2B 38ec166200ca7b5173de5c5be6782339ea52c55f9a3717cb1d9af091bd0ac9cecfcd45c6e1a767632b82b108d2549d7defa8946c88d0e95645f760c07344681a SHA512 e0be6fac36dd860fbb9f407ee37f5e2f81885ef70c330315976e223b669f38368d7622c9585b330b6509235b0ffea20b8196277f94e2b50fe8225a9aed9da609
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
new file mode 100644
index 000000000000..d7df5d09a441
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+# sys-devel/gettext is only for libintl detection macros.
+DEPEND="sys-devel/gettext"
+RDEPEND="
+	!<sys-libs/glibc-2.26
+	virtual/libintl
+"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Use ${CHOST}-cpp, not 'cpp': bug #718138
+	# Ideally we should use @CPP@ but rpcgen makes it hard to use '${CHOST}-gcc -E'
+	sed -i -s "s/CPP = \"cpp\";/CPP = \"${CHOST}-cpp\";/" rpcgen/rpc_main.c || die
+}
+
+src_install() {
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 761a627a1b10..669cf4c10081 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index a2b658f950f1..ce515ef59e98 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -44,5 +44,5 @@ EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
-EBUILD geoipupdate-4.3.0.ebuild 2777 BLAKE2B 2376a5aefab92d8a72b4ca6748f54298253c9fe3fe4f3da9febf8d77dfdf8978c6a944b090d97b1d012f56d9147da5d4b4601f54d7e661c37f64a3d780f5ff68 SHA512 a3ce19158c1d4e0ebe8d1ecae3448d4eb8dbfd5a553c8da3e5382a4c848dcf869ab6401723c6fbfabcf108de4a32e71e45162bf264a8064a9e7fd5f5d45a5495
+EBUILD geoipupdate-4.3.0.ebuild 2782 BLAKE2B 5587e79a7f8fd9330f6cb62fa8fb5a9dc2193420e98b5eb156e16097f86cbbb908a526bd0a39b9457da0e8ffc593675da8b09fe51954f162ef775cbcce4967fc SHA512 6cc29328867e9938dc870c79896c7744349b535a4d74a8667d9a0ccd6415926113336fd461add9ce41f0979f6a20ebd847cfec1680092bbac8e1a8769e85fb92
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
index 337691eda77d..f782d9fa17a5 100644
--- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
@@ -53,7 +53,7 @@ SRC_URI="
 
 LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
 
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index a6eb84f0983c..4a53bdce6e4a 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -5,5 +5,5 @@ AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d2
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
-EBUILD icecast-2.4.4.ebuild 2148 BLAKE2B fe7bd8190da285f64640d1523a43627bddf596bf1877159bc9ba1d3a6c8a1510f74a3a5d0d146fffdad7909c7d29ce4829a3a4507db21db3143f07c3b6fe63b3 SHA512 0dd5daa2b48d309740092d72a8387cc4aa58b6c2899ccd566e13357d834dcb9774d24a457890b4be3e369e2b29c101e1787828cb7a3b88ff4ed58dceee0adcf3
+EBUILD icecast-2.4.4.ebuild 2150 BLAKE2B 6615a96e22dacc5c8023478db18b35caa4a46c36d54d48329cdc9c7a700549b2c50c495eafb9c1ee60475a0ae3680e176e79030f025ea7c4141c24f1f4199a36 SHA512 a3fe57cea914e2be4f776e8611be1e0c78d6eadd5dfebe9a7c8449db50f97b214ef753d30c9111d326ba789698635c5b2bb9d76d2b50651af907655b7edbdc6f
 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild
index 9b56924bcfdc..1a0bb862d6ab 100644
--- a/net-misc/icecast/icecast-2.4.4.ebuild
+++ b/net-misc/icecast/icecast-2.4.4.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit autotools systemd user
 
 DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
+HOMEPAGE="https://www.icecast.org/"
+SRC_URI="https://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 7be624736157..98eb38eca139 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -8,9 +8,9 @@ AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99ac
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
 DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
-DIST rsync-3.2.2pre2.tar.gz 1056347 BLAKE2B 648a5cd120cf6468e4009d766a92e91da51d142ff814abdd7db362c7170d36cd0bd7a1ff6672eed79ec2d37b2ec18a40bb18b0fee6f8610cff57f3bb5d029e60 SHA512 7427d6929b0b7eff8632db20049cb74fbb31c295e059b86dc92e3fce5c1d260ec1e9c2ec9615d985d55f0d6b22c89410fd61148b26a3eda56b6518efb8ad6518
+DIST rsync-3.2.2pre3.tar.gz 1043941 BLAKE2B 7f3730d39509af9eba921f2cc23716176ba7287d61f949ad2bfa26ed3252dc43738943937295da6005f1a81bb83281118e517d16c8575de764e37369db31f337 SHA512 375c3936f5876a01a35f509df82eb9cfde01fcdc1b401735b6a6298b10fedfc82eb87a51995b2122923d49f941364547b47b03c6bad88995d50c0ee922a0f0ea
 EBUILD rsync-3.2.0-r1.ebuild 4509 BLAKE2B ab0897f40b2f7ea13a8a841892ba5eca647befe4f8be98d6440ed9f1cdb7addc13d548a45660c4295472b116517b8c41b30f35e01b37227a1ede1b507a45fa20 SHA512 89ad2d62e3b764e8283dc41899b54ecb93d69f16e9ab4e7e859d0c45bd108bff744776fee114cbca2c4ea85e944ae53e6b5d068b809253aea482cca002ebe5a7
 EBUILD rsync-3.2.1.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
-EBUILD rsync-3.2.2_pre2.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
+EBUILD rsync-3.2.2_pre3.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
 EBUILD rsync-9999.ebuild 4444 BLAKE2B 9ebb509b7fd4ca4e77eec489a5b8f628bee745d12a8828c54f8887d81b2a79d77e65333b65491041b26efd40cec3dc6dc44d99b590b99eaa1b5f1d80fe8815bc SHA512 0437f7264cd62f2a77a4d0c81cb6135451fc705901ab658f1fd1e4b8ad4d199c096c02fab605781fd6b203caf3c0fd9a1edbaf3588a4d76548709b96a5bc3f1d
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/rsync-3.2.2_pre2.ebuild b/net-misc/rsync/rsync-3.2.2_pre3.ebuild
similarity index 100%
rename from net-misc/rsync/rsync-3.2.2_pre2.ebuild
rename to net-misc/rsync/rsync-3.2.2_pre3.ebuild
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 77531e969ea3..67cd13245140 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index 9aa00fb111f0..dcdfe53ad16e 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -105,5 +105,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
 EBUILD newsboat-2.13.ebuild 1252 BLAKE2B 20607997ab2079d9531b6214a21f556c0c78f4059d3276c08f87006eb19603e92a8daff0883b527f136959078a6172a7a77c2099616dfc481f60a4d062a17b00 SHA512 139266eed0947fbb7f479c9d973cf30a44b97c5ab3ee09d3909d494db016cc9045d064436d28bcc986d0a7d0dc15bb1df10014a4a9e38e4e6804733df3d84852
-EBUILD newsboat-2.19-r1.ebuild 3182 BLAKE2B 3167e3f91ccd1afd9ee779a3a8a9a11808a9c63a6c6d982803a553e53f517c7c2dee0b686007b9e32cbc025a650035c9a10747181a9a574161fd0c74677bc3cd SHA512 81c780d2d6c611969da4214780724ee2e745e2a19982f92c2d66a46a1a6bf74e7b53b3827a9c4f9024c022b9b586d85ed8e8a4a8c27102e1decfc3e51268260c
+EBUILD newsboat-2.19-r1.ebuild 3187 BLAKE2B 399c02bce80f6b2bbef3d0090d054865eef9e6a145f1cfe5cb6c5d44327df7803ed608357a00d7056fc2d35710f4bc0a4df906dfd9bedaf99451d1e68332ad9d SHA512 c12c83de368391b3ad5a9a052e16714c0efbae1a17240042098c6ec99822b7e7adb629a12ad873b5d6a0940629e1eb3f0c1ff5cf5e66e29d5196b5a11dee152a
 MISC metadata.xml 216 BLAKE2B 6a9d054ae44666e41d1fa4f4876a8ef7bb95e7023a56b7a7f108cc2cc5b131e94d2080a5777dbbeef466a38db321c530af83dcec5eff25aa5bd8137dc949b6b7 SHA512 237dec64aa7d798b0b71f56a1c93a701fd424b0374d549a1f51272fd22905341157bdd7bcde6f77a7afeb83afede7e6eb2bbd0a2e3a70a9670933bd1d8732196
diff --git a/net-news/newsboat/newsboat-2.19-r1.ebuild b/net-news/newsboat/newsboat-2.19-r1.ebuild
index b2899009efd8..913c42137807 100644
--- a/net-news/newsboat/newsboat-2.19-r1.ebuild
+++ b/net-news/newsboat/newsboat-2.19-r1.ebuild
@@ -120,7 +120,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0650f15eac19..a2237fe499ee 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index a0522da675aa..97104606ff52 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -14,5 +14,6 @@ DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e
 EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
 EBUILD deluge-2.0.3-r5.ebuild 4498 BLAKE2B 36a76f2ac7e3729c02fbe55778a4e03f180bc9a786a2e588f9824a2da3f30a01bd414b114fcf00e41f4be7dc35190f204fba5558718894f5ebc7c49aaa0b7e99 SHA512 eb2175efa677e713c9f4f43f8eee4dffbd152b3b15e9344ee402d056504c62a87851bebdc6e5c9b899f58bf24ddf1dfaeed58a402d6bc5ec43558a8de9e57ad5
 EBUILD deluge-2.0.3-r6.ebuild 4536 BLAKE2B 2e364f8ab18cd863e062883a44347e25d1013423fab81731b8ed5ed12f16d46d7bf1dd3c334092ad8d2d4f6a8a827036a3432dca0a287c430e021b3d27d192c3 SHA512 907108811c97d88e8ccdee666623f8a130503e45ca4c148ce9266d802654075136940fbcc5563a6ce7de82bf602c6339e277d3e14fd66e3569895ec98dbfb97c
-EBUILD deluge-9999.ebuild 4483 BLAKE2B 68bc5d2fcb7a73aa084d5bb9f10a783503be261634a9162cbacfeb4454bbdca7c2aa858de5295e0cbfe934037eb97442721fee83b474b5076a6c920cecf34150 SHA512 00587ba71ee066314024586ec5420ed6419053f0ecde16a8745e021ea7dcc328d941927c011e14fd72b31a4ffc8c8eee72046c921f2612786794b6b2a968b35c
+EBUILD deluge-2.0.3-r7.ebuild 4544 BLAKE2B d04ab2b41c9f3080a6743768f844daa65673f19d105e616d8398f6015674c8570e28d996ce809ac2fb6028caeb590c55d36f64cd407ffb929d91b397798aaa43 SHA512 71bbcefe5ede6133321753afa10739936878e214b7df56881abe1db4348c0feb0eff07e01f376f2fba338ffe1f2f425bc72336764f9b5c2feaf071dcf8206ef9
+EBUILD deluge-9999.ebuild 4544 BLAKE2B d04ab2b41c9f3080a6743768f844daa65673f19d105e616d8398f6015674c8570e28d996ce809ac2fb6028caeb590c55d36f64cd407ffb929d91b397798aaa43 SHA512 71bbcefe5ede6133321753afa10739936878e214b7df56881abe1db4348c0feb0eff07e01f376f2fba338ffe1f2f425bc72336764f9b5c2feaf071dcf8206ef9
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r7.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
new file mode 100644
index 000000000000..2caebb8c9d1d
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
+)
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 121cab580048..2caebb8c9d1d 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -61,6 +61,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
 	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
 )
 
 python_prepare_all() {
@@ -91,15 +92,15 @@ python_install_all() {
 	distutils-r1_python_install_all
 	if ! use console ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
 	fi
 	if ! use gtk ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
 	fi
 	if use webinterface; then
 		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
@@ -108,8 +109,8 @@ python_install_all() {
 		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
 	else
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
 	fi
 	newinitd "${FILESDIR}"/deluged.init-2 deluged
 	newconfd "${FILESDIR}"/deluged.conf-2 deluged
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 5eac1fcd9e29..9d82747e5e7b 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/mfoc/Manifest b/net-wireless/mfoc/Manifest
index f273a006701f..dc26bf48c3d5 100644
--- a/net-wireless/mfoc/Manifest
+++ b/net-wireless/mfoc/Manifest
@@ -1,3 +1,3 @@
 DIST mfoc-0.10.7.tar.gz 31339 BLAKE2B 2b82492fa34190673058d18845be11145954ffe5c3a9d687374d03b00105e3f34a9cb72c3a06b523334fa50ff10ec294374dd140f018335f87b51cb1c93c321b SHA512 7dddcb0fa098fb48a90b83376a0add32701c0ee63b0828a55cb5e0f99bc82be126b4f59bb40ace80606452363d3ea1ab34285430817fefc80a291ec22cd72b24
-EBUILD mfoc-0.10.7.ebuild 469 BLAKE2B fc3b036dd5378b966cffd99f248d449ca4db0e22254ab5332cc622e4e2a79ac869030588af064c8063a1b19c70ebe0f6f9d20db18a346edadddfdf8071007bd8 SHA512 d7e46181b66c37ace1aaee1be99411bb2b457e278adc7b067a317edf60ef573c30ce548512caf89d15984eb99739396d4fe1f26462d6ea9ba5bc88006dcf85df
-MISC metadata.xml 246 BLAKE2B 6e98b7cc74f24af7dda078606c689e9b7cc4d5edc88f1f32a3501731b1fb8f168d38501afe75835fb80a27270c12244beda3f520b09eed2082229b3e6790477c SHA512 493f9f151dbf13a312f0bc0f1a2e2aa79eb3308fe84a9348cdaebd7139d1fd9a70afa0b7692ed820d5513ba369e36932642a445da934b48c172d776ba51e83df
+EBUILD mfoc-0.10.7-r1.ebuild 468 BLAKE2B ca85bdbc7593a32421f83cb722a8ab3642e3ce2c282bcbc5daead34b49d4271cbb2df4063941964cb2c81f93b47e1e65818f92dd931f1a9c2bf9a5a98f401625 SHA512 4f57d17af7030d431b8aaf32c5b9d2ff81e2c9b58f76cb9d5a134c7d11dc8095c366b7c65a392d4000b67618846c72287f280961c594ca4c05aae48e86703045
+MISC metadata.xml 326 BLAKE2B e5b47bfbe22e7c281f12d397529f34c8c31948f2d724e52490c4af2496564713123a155a0a1006f25d0392ea3535c3d28bf16b0d818b0ae71e36fc44fb6aeff0 SHA512 37ff49efddf6ac55a1f351b178d3dd3abf88c026f1a5ab1a1b21f6099d412d4ae47f808fafc7cdfe347e610f498ef8d39e53154cb295359dd198debb97548d6d
diff --git a/net-wireless/mfoc/metadata.xml b/net-wireless/mfoc/metadata.xml
index d105b4a973d1..6d781d15d77b 100644
--- a/net-wireless/mfoc/metadata.xml
+++ b/net-wireless/mfoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>Rick Farina</name>
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nfc-tools/mfoc</remote-id>
 	</upstream>
diff --git a/net-wireless/mfoc/mfoc-0.10.7.ebuild b/net-wireless/mfoc/mfoc-0.10.7-r1.ebuild
similarity index 84%
rename from net-wireless/mfoc/mfoc-0.10.7.ebuild
rename to net-wireless/mfoc/mfoc-0.10.7-r1.ebuild
index 8f4aca92e0a5..6fe306c11ff2 100644
--- a/net-wireless/mfoc/mfoc-0.10.7.ebuild
+++ b/net-wireless/mfoc/mfoc-0.10.7-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
@@ -13,7 +13,7 @@ LICENSE="GPL-2 GPL-2+ BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND=">=dev-libs/libnfc-1.7.0"
+DEPEND=">=dev-libs/libnfc-1.7.0:="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index a6e01b57458c..48c7d28dbf54 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -3,8 +3,8 @@ AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
 DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
-EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
-EBUILD rtl-sdr-0.5.4.ebuild 1162 BLAKE2B f3088c38e3f3307f4c4320a034c5cd573c5578ffc9f83d1994a1773c7c3f91846055201c46ba55926967fc9c2312077020d6e39351c3fda2d89995f4900360af SHA512 68bc4fa2d8fa2bcacded03f85c6d68ebdc4600d4440fc366991940e2e5a54362088b50f7bc58a4b152bb1edb7b3f24f86e3354f0ce9e391486e1cfecee5c75bb
-EBUILD rtl-sdr-0.6.0-r1.ebuild 1203 BLAKE2B 5563cc60c1a70dd83e2b825db8ddc9e4d8e034c4e4a08b5af88f9394ee7b641a1e48590acaffb384682065be4f709211b642e00a7fc1a6d85866ff7d5e3e09a4 SHA512 d55c788bd0c20d2dbf711b7fd84ffef4a6364fa004c6d7477b4b312a1f299a63015616819ba445c03d46ca595625f7cc81cb3ba9b9a2b01c95dd463b79764efc
-EBUILD rtl-sdr-9999.ebuild 1334 BLAKE2B 950153d85e57be97a4abae9779f640808c991743f0c4a1efb07919706d08621e9116397b411d5d44cbd163453cca272a0175792505baf23a9ef9bc9b891641cc SHA512 292d0b626c50c672a62d4ab359504929fdc31328c17662e2b32c9268adf368eb01fffea252a626771b5abb1e61b37952bf5c2fac08020e2b3def9ac218b33102
+EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1142 BLAKE2B 1321119ae94c5c89a8912dde134ee7890b987c70cafa61617f0118fa596cab58485f3fbf51b3f6ebfce819eb50b281606adfb36cbea12497ea02cbc7a0e053d2 SHA512 043448e7787215446c27eb1e264e7c18f463f829ae162dd23ede268c3664ed0073fac4c6f3c30c77902cf421bf535eee83a585575b980c1fafc9119809cbe9a1
+EBUILD rtl-sdr-0.5.4.ebuild 1149 BLAKE2B 3690e4cfd90271b6b49a0f453b0a1e290e096e432f42621cfd3a97aebcd0050a4a4cbc69334c6906eed637c3814bdb554e97edf997d116618715af8c1673f7b1 SHA512 08d4f453f18be3c631b54ca11f0042c60163182f25bcb335148d32978a64280f116d61fed6fa0bff8efc94acc09b901c87a89e3a93bfb6d7f24e8936ccd24411
+EBUILD rtl-sdr-0.6.0-r1.ebuild 1181 BLAKE2B 017cf726d4b9503d9bebde574531e98751a53e5bcad630c42ca611a17f4cf2eb8d2625b60915eed951f5134110a16e272c14e17871836fc6d92e8821a6c36303 SHA512 b95abbf805d32964883cdba6ead9a5b0bdfb0aa9bbd25c81ad8652f9c26d2d589e1fbb2bead99621e78d9628386ec7e890d8f2855fc803dcd43bf2fd7fd31331
+EBUILD rtl-sdr-9999.ebuild 1321 BLAKE2B 9a17a4c0fb60c6454919c77188b65f6905ce3dadd6f2526f63bf920cb718b96a8abb7ed631bec418343714966e2c1d33e5a4e8f6793073eb62a9db3ba6859731 SHA512 f081e318a25a5fedf39e39103b3cf19c3cca892d921b65e09c36c2d25f96eff9035f7d19e50d2a726c163f2dbf43fa5a3cc5d384cc1beb7fd627a0ebee9ff0bf
 MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
index cb32ad203bb9..6bc9e9c36706 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.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
@@ -12,7 +12,6 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-	KEYWORDS=""
 else
 	#git clone https://git.osmocom.org/rtl-sdr
 	#cd rtl-sdr
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
index 01063ffe168f..f62298abe773 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.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,6 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-	KEYWORDS=""
 else
 	#git clone https://git.osmocom.org/rtl-sdr
 	#cd rtl-sdr
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
index a428815f883a..cb3fa88be9d5 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/steve-m/librtlsdr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 x86"
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 2f3140b29d22..6f788b128c8f 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-	KEYWORDS=""
 else
 	#git clone https://git.osmocom.org/rtl-sdr
 	#cd rtl-sdr
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a60ec29964f3..7d03cf37635b 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 86cce9fb8ad4..e664307bd251 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Matt Turner <mattst88@gentoo.org> (2020-07-01)
+# Unlikely.
+vulkan
+
 # James Le Cuirot <chewi@gentoo.org> (2020-05-10)
 # media-libs/allegro is not keyworded.
 allegro
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 5b7962c71db5..e6217f6a5a9f 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Matt Turner <mattst88@gentoo.org> (2020-07-01)
+# Unlikely.
+vulkan
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-21)
 # ruby2.4 will go away soon, avoid keywording older packages
 ruby_targets_ruby24
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index b1bf6d7bc98f..43d8c77ebef4 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ia64
 
+# Matt Turner <mattst88@gentoo.org> (2020-07-01)
+# Unlikely.
+vulkan
+
 # James Le Cuirot <chewi@gentoo.org> (2020-05-10)
 # media-libs/allegro is not keyworded.
 allegro
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index b6c50e3dcc58..86f917e6f917 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -sparc
 
+# Matt Turner <mattst88@gentoo.org> (2020-07-01)
+# Unlikely.
+vulkan
+
 # James Le Cuirot <chewi@gentoo.org> (2020-05-10)
 # media-libs/allegro is not keyworded.
 allegro
diff --git a/profiles/package.mask b/profiles/package.mask
index 3fb771709609..8a197313c6a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-07-01)
+# Depends on dead gnome-base/libgnomeui, bug #726816, dead upstream. Big Debian
+# patch exists, but we won't become new upstream. Masked for removal in 30 days.
+games-board/teg
+
 # Aaron Bauman <bman@gentoo.org> (2020-06-29)
 # More Py2 only stuff. Plz see -dev ML for discussions
 # Remove bindings, port to Py3, etc
@@ -106,7 +111,6 @@ dev-util/unrpyc
 games-engines/gemrb
 media-sound/lilycomp
 media-video/tovid
-net-dns/maradns
 net-irc/irker
 net-mail/archivemail
 net-mail/getmail
@@ -408,12 +412,6 @@ 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
-
 # Jonas Stein <jstein@gentoo.org> (2020-06-01)
 # Last rite package due to missing/unclear license.
 # Removal after 2020-08-01
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 3c0883e38581..a80b902e84bc 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index cbb9aad3625c..1f4cc7486e47 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,4 +1,4 @@
 AUX gr-0.50.0-qt-5.15.patch 652 BLAKE2B 0d945a678acf7e457ca848da770f442caa0e64dba984c073cf394903f08548e668935d4333f574429f93f415e2b74a225573f9aa0da594bd9358c79ca4fb94c2 SHA512 fc85ff4227c257cffe05925095d54451793f899013f9123bf5cc480ea2bb5e267a5067b862feebb000cee9a34781c283ad83fc8adee3b5ec9689d12c37699a5e
 DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a
-EBUILD gr-0.50.0-r1.ebuild 1931 BLAKE2B 9e69242b9e62499502f7eb6a456806452c9724143c15bcec2bb4330eab983c50879be3d8d5aa92d6b363a2f6104fe07a6bfb589004b2170aad00d8e24cc4d194 SHA512 ed83ed28a05f861d695cc4acc2bf18ca1f6d919c75cd3235064506d3e88a19cf2b4f7b5f070d54bd75519bb9f3af9f77df7ac69752390870961ac53c2a556fe4
+EBUILD gr-0.50.0-r1.ebuild 1932 BLAKE2B 5f0f985689446797443449d8dcf69aad1b676e200bfdd9a16c0f711e435c5a171d5a54d7b6a429c9b544dfafa5efaadacf40c299879176cb53d3585b7b9a81d4 SHA512 840fd46e829f67081c2c1a263dbe3ff77bf1ebca514f051201ed37064a6db36d5214be8210dd6bae70fc2df2f5f900bc88888459af98ab8b92b68593853804ff
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.50.0-r1.ebuild
index 82f6df9f2ae1..ddb28dbc2466 100644
--- a/sci-visualization/gr/gr-0.50.0-r1.ebuild
+++ b/sci-visualization/gr/gr-0.50.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Universal framework for cross-platform visualization applications"
-HOMEPAGE="http://gr-framework.org/"
+HOMEPAGE="https://gr-framework.org/"
 SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 79f45d7bdecb..a2bb1f0f215e 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,7 @@
 AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
+AUX paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch 1185 BLAKE2B 9573a94af926615a3e6e8e043ea5bbbbf7a7946e33bce30c9fe6475de074142043463c345cf6caed09a60a63c241cac19ca2a54383b41752441b72e0bf5d9f17 SHA512 3552ae966be577840187590c651abc98e41047cbac6b679a17779b83b37c8d1ddd1a36a6ddd6dffb01b66138d2fc8a1bd335afb3ee488d2faa60c7ec1e4323e0
 DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2
-EBUILD paraview-5.8.0-r3.ebuild 6280 BLAKE2B 4fc30316f09fa18343e9a0f7dae3ed3fd60888d61ac5ae4472bf19f332b491be3f1deae6c885f1c892baa97ad7cb02983f675cd71440f35c52414d8588612e26 SHA512 3632f58d3e8b811f09f0fc0a4b97896b3a9cf82b73733c5cc513a5ae9452cf10ba301659699f67e8ab1528e2a4fd0aa4c1d8be9a40459ce2205bb2559548fde7
+EBUILD paraview-5.8.0-r3.ebuild 6326 BLAKE2B 295a6de4ca4c7e7b22946a793d296fe54184a432a6fb66062c93ef8e3457de464f1532a416d458bff763350b5015d20b17120e5901c6659c2fe8efae9a09b005 SHA512 514dc686c2f5e69bfc5328cdaeeb7873c1214003bf036590d8f8f03959b8370477322c24d410a9b475cbe044717154edb21e840e99f4ad425f6aab3de20ea128
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
new file mode 100644
index 000000000000..1f76b84ac2d6
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
+From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
+Date: Wed, 27 May 2020 15:27:15 +1000
+Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
+
+---
+ Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
+ Rendering/Qt/vtkQtStringToImage.cxx       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+index afda585cca..eca65c64cd 100644
+--- a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
++++ b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+@@ -41,6 +41,7 @@
+ #include <QImage>
+ #include <QMap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPair>
+ #include <QPixmap>
+ #include <QTextDocument>
+diff --git a/VTK/Rendering/Qt/vtkQtStringToImage.cxx b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
+index 659c71570e..fbb9b78f05 100644
+--- a/VTK/Rendering/Qt/vtkQtStringToImage.cxx
++++ b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
+@@ -30,6 +30,7 @@
+ #include <QFontMetrics>
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QString>
+ #include <QTextDocument>
+-- 
+2.26.2
+
diff --git a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
index fad68f534bdd..ed78dca47642 100644
--- a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
@@ -105,6 +105,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
 	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${P}-w-vtk-8.2.0-qt-5.15.patch
 )
 
 CMAKE_MAKEFILE_GENERATOR="emake" #579474
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index d04cafc5239d..c8bda3d18a81 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/libnss-nis/Manifest b/sys-auth/libnss-nis/Manifest
index 69e6ca582179..277091b17d22 100644
--- a/sys-auth/libnss-nis/Manifest
+++ b/sys-auth/libnss-nis/Manifest
@@ -1,4 +1,3 @@
-AUX libnss-nis-1.4-glibc-2.30.patch 5087 BLAKE2B d77c5dd017ea749316dd2e6bda57db7cd76625add78bebfa21a6454b8bc35ba827906ac2b0e2fd30c34595d22d633fae810fd21d27dbd0593e108377347d858a SHA512 df2503420f1499510f9e59f9615bf2904ebd7a07a6197413127643f4dc29420b33cefcceb356eca9029f206cc01d1e410b2656c57ae8304a099d3f1770803282
 DIST libnss-nis-3.1.tar.gz 225933 BLAKE2B 23b0c760f48f2f1bd2bcd6a1d3b2e7da0bc2f186b23f4ff961faf78b76bfbbaaa238a510979b086f279f4c4e25f98d9ae8631e5222dc7479e8c50b0f4572b0da SHA512 fab2d035ef9cea5fa6351c44085a96f9f90e50550b77aa3898e0d5a6ff296951b22b4ac58979d07ae3b3da2f97c7e47ab466e1a5868e7f218971028174159636
 EBUILD libnss-nis-3.1.ebuild 841 BLAKE2B 50a594d0c1fa5af66a92f5dca43ed14fee93a33671f8170ba36f6dc0771d5f773834e9b99e82c7e71c2105d5c427a794e56795776b8994d7942f0eec7b74881e SHA512 6bca9ea40bda16e242f3141bc45bb776e6193c47a9e349eb19673039ad53ec28a7f56e5b4a18c6367ca4d849e3ac12d10e04cccea88f46ee644df1e193734f4a
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch b/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch
deleted file mode 100644
index ac8d497ecb4c..000000000000
--- a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From e9f0f4286d5a923eca1a9c84ff125268d144822e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 25 Jul 2019 12:10:56 -0700
-Subject: [PATCH] nis-hosts: Remove use of RES_USE_INET6
-
-Upstream glibc dropped it starting glibc 2.30
-see
-https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe
-
-Fixes issue #6
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/nis-hosts.c | 55 ++++++++++++-------------------------------------
- 1 file changed, 13 insertions(+), 42 deletions(-)
-
-diff --git a/src/nis-hosts.c b/src/nis-hosts.c
-index 307b46e..bd3c4ad 100644
---- a/src/nis-hosts.c
-+++ b/src/nis-hosts.c
-@@ -35,15 +35,12 @@
- #include "libc-lock.h"
- #include "nss-nis.h"
- 
--/* Get implementation for some internal functions. */
--#include "mapv4v6addr.h"
--
- #define ENTNAME         hostent
- #define DATABASE        "hosts"
- #define NEED_H_ERRNO
- 
--#define EXTRA_ARGS      , af, flags
--#define EXTRA_ARGS_DECL , int af, int flags
-+#define EXTRA_ARGS      , af
-+#define EXTRA_ARGS_DECL , int af
- 
- #define ENTDATA hostent_data
- struct hostent_data
-@@ -67,19 +64,8 @@ LINE_PARSER
-    /* Parse address.  */
-    if (af != AF_INET6 && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
-      {
--       assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC);
--       if (flags & AI_V4MAPPED)
--	 {
--	   map_v4v6_address ((char *) entdata->host_addr,
--			     (char *) entdata->host_addr);
--	   result->h_addrtype = AF_INET6;
--	   result->h_length = IN6ADDRSZ;
--	 }
--       else
--	 {
--	   result->h_addrtype = AF_INET;
--	   result->h_length = INADDRSZ;
--	 }
-+       result->h_addrtype = AF_INET;
-+       result->h_length = INADDRSZ;
-      }
-    else if (af != AF_INET
- 	    && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
-@@ -134,7 +120,7 @@ strong_alias (_nss_nis_sethostent, _nss_nis_endhostent)
- static enum nss_status
- internal_nis_gethostent_r (struct hostent *host, char *buffer,
- 			   size_t buflen, int *errnop, int *h_errnop,
--			   int af, int flags)
-+			   int af)
- {
-   char *domain;
-   if (yp_get_default_domain (&domain))
-@@ -203,7 +189,7 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer,
- 	++p;
-       free (result);
- 
--      parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
-+      parse_res = parse_line (p, host, data, buflen, errnop, af);
-       if (parse_res == -1)
- 	{
- 	  free (outkey);
-@@ -232,8 +218,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, size_t buflen,
-   __libc_lock_lock (lock);
- 
-   status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop,
--			((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
--			((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 ));
-+			AF_INET);
- 
-   __libc_lock_unlock (lock);
- 
-@@ -244,7 +229,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, size_t buflen,
- static enum nss_status
- internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
- 			   char *buffer, size_t buflen, int *errnop,
--			   int *h_errnop, int flags)
-+			   int *h_errnop)
- {
-   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct parser_data);
-   buffer += pad;
-@@ -318,7 +303,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
-     ++p;
-   free (result);
- 
--  int parse_res = parse_line (p, host, data, buflen, errnop, af, flags);
-+  int parse_res = parse_line (p, host, data, buflen, errnop, af);
- 
-   if (parse_res < 1 || host->h_addrtype != af)
-     {
-@@ -351,8 +336,7 @@ _nss_nis_gethostbyname2_r (const char *name, int af, struct hostent *host,
-     }
- 
-   return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
--				    h_errnop,
--			((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
-+				    h_errnop);
- }
- 
- 
-@@ -360,18 +344,8 @@ enum nss_status
- _nss_nis_gethostbyname_r (const char *name, struct hostent *host, char *buffer,
- 			  size_t buflen, int *errnop, int *h_errnop)
- {
--  if (_res.options & RES_USE_INET6)
--    {
--      enum nss_status status;
--
--      status = internal_gethostbyname2_r (name, AF_INET6, host, buffer, buflen,
--					  errnop, h_errnop, AI_V4MAPPED);
--      if (status == NSS_STATUS_SUCCESS)
--	return status;
--    }
--
-   return internal_gethostbyname2_r (name, AF_INET, host, buffer, buflen,
--				    errnop, h_errnop, 0);
-+				    errnop, h_errnop);
- }
- 
- 
-@@ -433,9 +407,7 @@ _nss_nis_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af,
-     ++p;
-   free (result);
- 
--  int parse_res = parse_line (p, host, data, buflen, errnop, af,
--			      ((_res.options & RES_USE_INET6)
--			       ? AI_V4MAPPED : 0));
-+  int parse_res = parse_line (p, host, data, buflen, errnop, af);
-   if (parse_res < 1)
-     {
-       if (parse_res == -1)
-@@ -532,8 +504,7 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
-   buflen -= pad;
- 
-   struct hostent host;
--  int parse_res = parse_line (result, &host, data, buflen, errnop, AF_UNSPEC,
--			      0);
-+  int parse_res = parse_line (result, &host, data, buflen, errnop, AF_UNSPEC);
-   if (parse_res < 1)
-     {
-       if (parse_res == -1)
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f12982b56a84..2e7088644d6a 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index da4bf427f97d..46b490eaf20e 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -1,5 +1,4 @@
 AUX corosync-2.3.4-docs.patch 842 BLAKE2B 363e26872497c2724ba54dee2e6458e5b101bbadec263ba8a230cca8d2187e37d36bf2f42a65a9b50e4cb1b870af204f0043f55b31342865a5a262dc5892177f SHA512 e73db019b1fbe8a030e530a0be55cdc33972d018a6415d17c7c425607613ef1f0695e9c4d231eddbce708710e1cb2341c42e911e59382974ba8b24204205896f
-AUX corosync-docs.patch 1022 BLAKE2B 5a211263e466d934cfb591cbca4a8e1f2c7dd5895e6dd7397ae78f1fc1b1fc88fb9f7194df10b2a7a777cb6a9a2cec7c2a7a89d57d0ba1135040f7fb378c1586 SHA512 49f8b19cbfd5f0b1f0f927a7aa8cd2f0ad24ff958cf2baf06e8a9d87858fa01cf3656ba05189a085e265a2d8b1b320ca7f18b3a4d405d73ff05f1876ebe14960
 AUX corosync.initd 668 BLAKE2B 52a838b1cc64103a69a3f67573b0b752ec9eef434c9fd2183478d32a6dfda825e96e41333e16f0aa7431937323ad3d5329c04037baec83717624a884d2480bcb SHA512 a514ac91e4b691c7e7e65a45dbb49c1da408690012d750ff3e4cb1c45e629df070019382f9b7c1dbcf8342b1edc15b296433d1f589334effde843434005f0969
 AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c8081557f87570952117109b68c7101045990dfd8aea5f56c8a8078d12383f8cb040b098591678c8294dd52bc SHA512 3c65eb01a33a6fa51befa8ce466cc8a35a06a19816b77610b83c18f9372dccdbd33354fc8568e63fe165f2c2aa598b6a5d15615939f12e3385b4c3e1b91a6ec3
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
diff --git a/sys-cluster/corosync/files/corosync-docs.patch b/sys-cluster/corosync/files/corosync-docs.patch
deleted file mode 100644
index 198db980ae44..000000000000
--- a/sys-cluster/corosync/files/corosync-docs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Make docs optional
-
---- configure.ac
-+++ configure.ac
-@@ -432,7 +432,7 @@
- fi
- 
- # final build of *FLAGS
--CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
-+CFLAGS="$ENV_CFLAGS $OS_CFLAGS \
- 	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
- CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS"
- LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
-@@ -458,7 +458,10 @@
- AC_SUBST([DARWIN_OPTS])
- AC_SUBST([SOLARIS_OPTS])
- 
--AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
-+AC_ARG_ENABLE([doc],
-+  AS_HELP_STRING([--enable-doc],[Build html documentation])
-+)
-+AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] )
- 
- AC_SUBST([LINT_FLAGS])
- 
---- Makefile.am
-+++ Makefile.am
-@@ -41,9 +41,6 @@
- 			  config.guess config.sub missing install-sh \
- 			  autoheader automake autoconf
- 
--dist_doc_DATA		= LICENSE INSTALL README.devmap \
--			  README.recovery SECURITY TODO AUTHORS
--
- corosysconfdir		= ${COROSYSCONFDIR}
-
- corosysconf_DATA        = conf/corosync.conf.example
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 0ba1214f0add..c418652770d7 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,8 +1,5 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
-AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db
-AUX glusterfs-4.1.0-silent_rules.patch 500 BLAKE2B bd6812be1059f04bcb34e9408b6ef24f6bd0992cc432ff22da9f21970e11dd5394e1421a6967cae6c026207dcf1d7ae591afaa06e4a25a62c0e79f7f679cd22e SHA512 1cbdfd9f04a917387f0b3299f3ab04074c34e5a4911642ccf4274f1270a97acbf0e27f89c89ce6a1cd2e26238761f956cd1dfa3033d763ead32b0d0fd92a0798
-AUX glusterfs-6.7-fix-rebalance-crash.patch 5861 BLAKE2B caaf103b10d18e4540ab1e516f5ee06aeeb418e12a570d9f4df7c1952302a2035b8ead11fee17d2d797e5872e977ebd8c124aa8bdda26e28a23e8a4173338222 SHA512 149bc10d47424bc40e55cb4053ab251adf88f890a6e4e2e03cddbb23fe411b9d1621fe183b8e09acd36d7945827f85eefcc83c58b01d27f988d6e88bdb1bcafd
 AUX glusterfs-6.7-fix-seek.patch 1247 BLAKE2B 77ede2514e3afcca12a0d2fef7d24ed66924ffe9ff804bbd48b56a04f27268b8b09471368afaececf9c6c7a304889c5f5271207442ff134d0ad215b46ac2ddf7 SHA512 839eb1d2bb87cae9adbfcc1f81c6187697e0b9c69fcd4c6aea9182c45fef09e3fe3ed3be210c8321a4530f4b9a6a140429ca2437bf5daf8357518ac1732f8434
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch
deleted file mode 100644
index 341535163747..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
-index 1d0ac27e8..b1a7c0a93 100644
---- a/libglusterfs/src/compat.h
-+++ b/libglusterfs/src/compat.h
-@@ -510,6 +510,7 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
- /* Use run API, see run.h */
- #include <stdlib.h> /* system(), mkostemp() */
- #include <stdio.h> /* popen() */
-+#include <sys/sysmacros.h>
- #pragma GCC poison system mkostemp popen
- #endif
diff --git a/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch
deleted file mode 100644
index 236898ab8c14..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2018-03-08 22:50:23.221758897 +0000
-+++ b/configure.ac	2018-03-08 22:53:12.776129757 +0000
-@@ -19,11 +19,6 @@
- #but libglusterfs fails to build with contrib (Then are not set up that way?)
- #AM_INIT_AUTOMAKE([subdir-objects])
- 
--m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
--
--if make --help 2>&1 | grep -q no-print-directory; then
--   AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
--fi
- 
- AC_CONFIG_HEADERS([config.h site.h])
- 
diff --git a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-rebalance-crash.patch b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-rebalance-crash.patch
deleted file mode 100644
index e5a31623a32f..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-rebalance-crash.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From ff1eae7f882b8f12380e0c35a9a73b672583cd4c Mon Sep 17 00:00:00 2001
-From: N Balachandran <nbalacha@redhat.com>
-Date: Tue, 01 Oct 2019 17:37:15 +0530
-Subject: [PATCH] cluster/dht: Correct fd processing loop
-
-The fd processing loops in the
-dht_migration_complete_check_task and the
-dht_rebalance_inprogress_task functions were unsafe
-and could cause an open to be sent on an already freed
-fd. This has been fixed.
-
-> Change-Id: I0a3c7d2fba314089e03dfd704f9dceb134749540
-> Fixes: bz#1757399
-> Signed-off-by: N Balachandran <nbalacha@redhat.com>
-> (cherry picked from commit 9b15867070b0cc241ab165886292ecffc3bc0aed)
-
-Change-Id: I0a3c7d2fba314089e03dfd704f9dceb134749540
-Fixes: bz#1786983
-Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
----
-
-diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
-index acad493..4f7370d 100644
---- a/xlators/cluster/dht/src/dht-helper.c
-+++ b/xlators/cluster/dht/src/dht-helper.c
-@@ -1290,6 +1290,7 @@
-     fd_t *tmp = NULL;
-     uint64_t tmp_miginfo = 0;
-     dht_migrate_info_t *miginfo = NULL;
-+    gf_boolean_t skip_open = _gf_false;
-     int open_failed = 0;
- 
-     this = THIS;
-@@ -1428,24 +1429,34 @@
-      * the loop will cause the destruction of the fd. So we need to
-      * iterate the list safely because iter_fd cannot be trusted.
-      */
--    list_for_each_entry_safe(iter_fd, tmp, &inode->fd_list, inode_list)
--    {
--        if (fd_is_anonymous(iter_fd))
--            continue;
--
--        if (dht_fd_open_on_dst(this, iter_fd, dst_node))
--            continue;
--
-+    iter_fd = list_entry((&inode->fd_list)->next, typeof(*iter_fd), inode_list);
-+    while (&iter_fd->inode_list != (&inode->fd_list)) {
-+        if (fd_is_anonymous(iter_fd) ||
-+            (dht_fd_open_on_dst(this, iter_fd, dst_node))) {
-+            if (!tmp) {
-+                iter_fd = list_entry(iter_fd->inode_list.next, typeof(*iter_fd),
-+                                     inode_list);
-+                continue;
-+            }
-+            skip_open = _gf_true;
-+        }
-         /* We need to release the inode->lock before calling
-          * syncop_open() to avoid possible deadlocks. However this
-          * can cause the iter_fd to be released by other threads.
-          * To avoid this, we take a reference before releasing the
-          * lock.
-          */
--        __fd_ref(iter_fd);
-+        fd_ref(iter_fd);
- 
-         UNLOCK(&inode->lock);
- 
-+        if (tmp) {
-+            fd_unref(tmp);
-+            tmp = NULL;
-+        }
-+        if (skip_open)
-+            goto next;
-+
-         /* flags for open are stripped down to allow following the
-          * new location of the file, otherwise we can get EEXIST or
-          * truncate the file again as rebalance is moving the data */
-@@ -1467,9 +1478,11 @@
-             dht_fd_ctx_set(this, iter_fd, dst_node);
-         }
- 
--        fd_unref(iter_fd);
--
-+    next:
-         LOCK(&inode->lock);
-+        skip_open = _gf_false;
-+        tmp = iter_fd;
-+        iter_fd = list_entry(tmp->inode_list.next, typeof(*tmp), inode_list);
-     }
- 
-     SYNCTASK_SETID(frame->root->uid, frame->root->gid);
-@@ -1482,6 +1495,10 @@
- 
- unlock:
-     UNLOCK(&inode->lock);
-+    if (tmp) {
-+        fd_unref(tmp);
-+        tmp = NULL;
-+    }
- 
- out:
-     if (dict) {
-@@ -1563,6 +1580,7 @@
-     int open_failed = 0;
-     uint64_t tmp_miginfo = 0;
-     dht_migrate_info_t *miginfo = NULL;
-+    gf_boolean_t skip_open = _gf_false;
- 
-     this = THIS;
-     frame = data;
-@@ -1683,24 +1701,40 @@
-      * the loop will cause the destruction of the fd. So we need to
-      * iterate the list safely because iter_fd cannot be trusted.
-      */
--    list_for_each_entry_safe(iter_fd, tmp, &inode->fd_list, inode_list)
--    {
--        if (fd_is_anonymous(iter_fd))
--            continue;
--
--        if (dht_fd_open_on_dst(this, iter_fd, dst_node))
--            continue;
--
-+    iter_fd = list_entry((&inode->fd_list)->next, typeof(*iter_fd), inode_list);
-+    while (&iter_fd->inode_list != (&inode->fd_list)) {
-         /* We need to release the inode->lock before calling
-          * syncop_open() to avoid possible deadlocks. However this
-          * can cause the iter_fd to be released by other threads.
-          * To avoid this, we take a reference before releasing the
-          * lock.
-          */
--        __fd_ref(iter_fd);
- 
-+        if (fd_is_anonymous(iter_fd) ||
-+            (dht_fd_open_on_dst(this, iter_fd, dst_node))) {
-+            if (!tmp) {
-+                iter_fd = list_entry(iter_fd->inode_list.next, typeof(*iter_fd),
-+                                     inode_list);
-+                continue;
-+            }
-+            skip_open = _gf_true;
-+        }
-+
-+        /* Yes, this is ugly but there isn't a cleaner way to do this
-+         * the fd_ref is an atomic increment so not too bad. We want to
-+         * reduce the number of inode locks and unlocks.
-+         */
-+
-+        fd_ref(iter_fd);
-         UNLOCK(&inode->lock);
- 
-+        if (tmp) {
-+            fd_unref(tmp);
-+            tmp = NULL;
-+        }
-+        if (skip_open)
-+            goto next;
-+
-         /* flags for open are stripped down to allow following the
-          * new location of the file, otherwise we can get EEXIST or
-          * truncate the file again as rebalance is moving the data */
-@@ -1721,9 +1755,11 @@
-             dht_fd_ctx_set(this, iter_fd, dst_node);
-         }
- 
--        fd_unref(iter_fd);
--
-+    next:
-         LOCK(&inode->lock);
-+        skip_open = _gf_false;
-+        tmp = iter_fd;
-+        iter_fd = list_entry(tmp->inode_list.next, typeof(*tmp), inode_list);
-     }
- 
-     SYNCTASK_SETID(frame->root->uid, frame->root->gid);
-@@ -1731,6 +1767,10 @@
- unlock:
-     UNLOCK(&inode->lock);
- 
-+    if (tmp) {
-+        fd_unref(tmp);
-+        tmp = NULL;
-+    }
-     if (open_failed) {
-         ret = -1;
-         goto out;
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 9dd9416b2347..033971953a5a 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,4 +1,3 @@
-AUX keepalived-2.0.10-snmp-crash-fix.patch 3843 BLAKE2B 246ac57c0f25df09357a8dd6f1f504dfbaa3b690fa68b353643bb1ce1d4811178b00e6c6ef2b1fa886c8e2a343379e9ebc077b49b8c921744afef24aa9e667f9 SHA512 26b4c222966b793bb8029b8d125203ecdfd6381928812ffb1ff99a056bbdff8b85ab2b350a263459e24bc282f4af05f6dd02fea78a7162197450604694a39fac
 AUX keepalived.confd-r1 63 BLAKE2B 8925b12c9936aaccf828132720a0cb74fddc4a4c8642aaa2ad08099e17e5db0170070966a4465de7bfc06317f812194d9a7928da2559ea41a994c5f8e832b9c7 SHA512 8aed0ece9d67956006c5056543bbb31c354b73b7b555f6cce039f9507da24e40e2ad15ac057dd2e39244de5319f5b9a19659e8ee5c2c7116e202f18c88e6ed74
 AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384700a7bc4e1a381f106a4734f19e3f740ad00a83c065f45ac620d8224fd125f76ed0a96ec285d3abf393 SHA512 5a5057f50c29c6e2c9f2451acf1e2aa2cdd9218a5882d3eea1a148a4ae8b259b5937387b95feab919b242a65d706e48c5afa3ed280215092295b8e8d44d1f543
 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7
diff --git a/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch b/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch
deleted file mode 100644
index c1a5ab36180c..000000000000
--- a/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/keepalived/check/check_snmp.c b/keepalived/check/check_snmp.c
-index 67ae0e4f9..95c6e6f83 100644
---- a/keepalived/check/check_snmp.c
-+++ b/keepalived/check/check_snmp.c
-@@ -1451,6 +1451,9 @@ static struct variable8 check_vars[] = {
- void
- check_snmp_agent_init(const char *snmp_socket)
- {
-+	if (snmp_running)
-+		return;
-+
- 	/* We handle the global oid if we are running SNMP */
- 	snmp_agent_init(snmp_socket, true);
- 	snmp_register_mib(check_oid, OID_LENGTH(check_oid), "Healthchecker",
-@@ -1462,6 +1465,9 @@ check_snmp_agent_init(const char *snmp_socket)
- void
- check_snmp_agent_close()
- {
-+	if (!snmp_running)
-+		return;
-+
- 	snmp_unregister_mib(check_oid, OID_LENGTH(check_oid));
- 	snmp_agent_close(true);
- }
-diff --git a/keepalived/core/snmp.c b/keepalived/core/snmp.c
-index a9472feae..eb5bed20a 100644
---- a/keepalived/core/snmp.c
-+++ b/keepalived/core/snmp.c
-@@ -325,6 +325,9 @@ snmp_unregister_mib(oid *myoid, size_t len)
- void
- snmp_agent_init(const char *snmp_socket, bool base_mib)
- {
-+	if (snmp_running)
-+		return;
-+
- 	log_message(LOG_INFO, "Starting SNMP subagent");
- 	netsnmp_enable_subagent();
- 	snmp_disable_log();
-@@ -378,6 +381,9 @@ snmp_agent_init(const char *snmp_socket, bool base_mib)
- void
- snmp_agent_close(bool base_mib)
- {
-+	if (!snmp_running)
-+		return;
-+
- 	if (base_mib)
- 		snmp_unregister_mib(global_oid, OID_LENGTH(global_oid));
- 	snmp_shutdown(global_name);
-diff --git a/keepalived/vrrp/vrrp_snmp.c b/keepalived/vrrp/vrrp_snmp.c
-index ca9d46768..db696159c 100644
---- a/keepalived/vrrp/vrrp_snmp.c
-+++ b/keepalived/vrrp/vrrp_snmp.c
-@@ -4552,6 +4552,9 @@ vrrp_handles_global_oid(void)
- void
- vrrp_snmp_agent_init(const char *snmp_socket)
- {
-+	if (snmp_running)
-+		return;
-+
- 	/* We let the check process handle the global OID if it is running and with snmp */
- 	snmp_agent_init(snmp_socket, vrrp_handles_global_oid());
- 
-@@ -4581,6 +4584,9 @@ vrrp_snmp_agent_init(const char *snmp_socket)
- void
- vrrp_snmp_agent_close(void)
- {
-+	if (!snmp_running)
-+		return;
-+
- #ifdef _WITH_SNMP_VRRP_
- 	if (global_data->enable_snmp_vrrp)
- 		snmp_unregister_mib(vrrp_oid, OID_LENGTH(vrrp_oid));
-diff --git a/lib/scheduler.c b/lib/scheduler.c
-index 0a1c334c3..9090a7f88 100644
---- a/lib/scheduler.c
-+++ b/lib/scheduler.c
-@@ -1630,7 +1630,7 @@ thread_fetch_next_queue(thread_master_t *m)
- 				if (!ev->read) {
- 					log_message(LOG_INFO, "scheduler: No read thread bound on fd:%d (fl:0x%.4X)"
- 						      , ev->fd, ep_ev->events);
--					assert(0);
-+					continue;
- 				}
- 				thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD);
- 				ev->read = NULL;
-@@ -1641,7 +1641,7 @@ thread_fetch_next_queue(thread_master_t *m)
- 				if (!ev->write) {
- 					log_message(LOG_INFO, "scheduler: No write thread bound on fd:%d (fl:0x%.4X)"
- 						      , ev->fd, ep_ev->events);
--					assert(0);
-+					continue;
- 				}
- 				thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD);
- 				ev->write = NULL;
-@@ -1710,7 +1710,12 @@ process_threads(thread_master_t *m)
- 		thread = thread_trim_head(thread_list);
- 		if (!shutting_down ||
- 		    (thread->type == THREAD_READY_FD &&
--		     (thread->u.fd == m->timer_fd || thread->u.fd == m->signal_fd)) ||
-+		     (thread->u.fd == m->timer_fd ||
-+		      thread->u.fd == m->signal_fd
-+#ifdef _WITH_SNMP_
-+		      || FD_ISSET(thread->u.fd, &m->snmp_fdset)
-+#endif
-+							       )) ||
- 		    thread->type == THREAD_CHILD ||
- 		    thread->type == THREAD_CHILD_TIMEOUT ||
- 		    thread->type == THREAD_CHILD_TERMINATED ||
-diff --git a/lib/utils.c b/lib/utils.c
-index 6f9ec254d..e5b82b524 100644
---- a/lib/utils.c
-+++ b/lib/utils.c
-@@ -789,7 +789,9 @@ FILE *fopen_safe(const char *path, const char *mode)
- {
- 	int fd;
- 	FILE *file;
-+#ifdef ENABLE_LOG_FILE_APPEND
- 	int flags = O_NOFOLLOW | O_CREAT | O_CLOEXEC;
-+#endif
- 	int sav_errno;
- 	char file_tmp_name[] = "/tmp/keepalivedXXXXXX";
- 
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 58a648097c4e..dfb811354278 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,4 +1,3 @@
-AUX disable-sview.patch 2451 BLAKE2B 4cf247c55bd439f72e428c94c2826394f6be2a3eb9b65ff6b713b1651248eb7470e2fa9aeb3fe27ad122971924a3d6e154659a3a3cbff19aafec713d6a25e861 SHA512 d828d64703c86bba79d929ed3583842b0b9e82f4f6e1f887eb7d4b4d0015e16cdfdc812454b4adb184afa08011afaa24a3def6d90dbc957375fc88e05c93e199
 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9
 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f
 AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164463a167459082a23eea25fa22edf2987e52c71f953160c12b29cdb5e5f437a3bdc89f1cd8395b5 SHA512 b7f116687e0dee0377b43cbb49f63569088d6f5f9b1514014999b1135b1b4da462e04887851b753161d7b9691436048b692b7697ffee2a4e45daa339a412c93c
diff --git a/sys-cluster/slurm/files/disable-sview.patch b/sys-cluster/slurm/files/disable-sview.patch
deleted file mode 100644
index f409765a847a..000000000000
--- a/sys-cluster/slurm/files/disable-sview.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/configure.ac	2019-08-13 20:40:08.000000000 +0200
-+++ b/configure.ac	2019-08-22 12:02:02.127865098 +0200
-@@ -229,42 +229,6 @@
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
- 
--#
--#  Tests for GTK+
--#
--
--# use the correct libs if running on 64bit
--if test -d "/usr/lib64/pkgconfig"; then
--    PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--if test -d "/opt/gnome/lib64/pkgconfig"; then
--    PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
--
--if test ${glib_config_minor_version=0} -ge 32 ; then
--       AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher])
--fi
--
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
--if test ${gtk_config_minor_version=0} -ge 10 ; then
--       AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 12 ; then
--       AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 14 ; then
--       AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
--fi
--
--if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
--	AC_MSG_WARN([cannot build sview without gtk library]);
--fi
--
- AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
- 
- X_AC_CRAY
-@@ -447,7 +411,6 @@
- 		 src/sshare/Makefile
- 		 src/sstat/Makefile
- 		 src/strigger/Makefile
--		 src/sview/Makefile
- 		 src/plugins/Makefile
- 		 src/plugins/accounting_storage/Makefile
- 		 src/plugins/accounting_storage/common/Makefile
-diff -Naur slurm-19.05.2.orig/src/Makefile.am slurm-19.05.2/src/Makefile.am
---- slurm-19.05.2.orig/src/Makefile.am	2019-08-13 20:40:08.000000000 +0200
-+++ slurm-19.05.2/src/Makefile.am	2019-08-22 12:02:02.127865098 +0200
-@@ -25,5 +25,4 @@
- 	srun		\
- 	sshare		\
- 	sstat		\
--	strigger	\
--	sview
-+	strigger
-diff -Naur slurm-19.05.2.orig/src/Makefile.in slurm-19.05.2/src/Makefile.in
---- slurm-19.05.2.orig/src/Makefile.in	2019-08-13 20:40:08.000000000 +0200
-+++ slurm-19.05.2/src/Makefile.in	2019-08-22 12:02:02.127865098 +0200
-@@ -495,8 +495,7 @@
- 	srun		\
- 	sshare		\
- 	sstat		\
--	strigger	\
--	sview
-+	strigger
- 
- all: all-recursive
- 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index dd59220be282..129ccdd832d7 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 b516d37a8b0b..05fc24cc1892 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,9 @@ DIST genpatches-4.14-195.extras.tar.xz 17536 BLAKE2B 9b9d57324fc8770f8e9af0d62de
 DIST genpatches-4.14-196.base.tar.xz 4359108 BLAKE2B 8f56424855c5d7f0e08a9c3ebe784aba798abd0755751e00341f2f2106f9aea33640b9c59213126de7f187b69efdb8b101675258a49c51eb4d89c0655d4e6bce SHA512 26c214aa12343f607d75116d2048ede0c9b134a15ad93cbba5997b5bee71a6553e2c420fbf4d7da20dac16f9ed41ce77ae9ec7fbdc06674b32d11a3adfb9fcdb
 DIST genpatches-4.14-196.experimental.tar.xz 5932 BLAKE2B 590ebc711495e321ea9c5826fcabc47d30f88ed7bbea889b0d873eb04b1ac9467be15dd64e4ef32a002250a83de85c8267686b5b8c6f3f2019540191bbb84fef SHA512 135516ab26127df7ae8de27a148ad378ca145f3064d578a7c1d6c5d6a6c0c35941e70e30cfcb741e1ecce20e52a051e74de775b4a8861ea0b7e12212a417b4d4
 DIST genpatches-4.14-196.extras.tar.xz 17528 BLAKE2B e8cbcf4d54a3c44504498bff52bdb65b5bd697dfb211b78924a3e09bf5bc505e8053d268881d1f0d5068e1cdd427a9a1445616251d8dd78871d30303f49430da SHA512 61e14704837422bac9f0af527d0071e31b5c75dd034dc4ef11a5f297b217c7cf2ca07cf74532c83f75c0a65c88a0ced978c15e3921d4c06c3e2a9235535df067
+DIST genpatches-4.14-197.base.tar.xz 4373776 BLAKE2B e7bd604f374755488b3178ead90ce2b26a0f104bdcdb742eae0151562ccad5a2aafa00354af01e0af08afdd9a1d44ef5be874af96c87f01591ad3ef95b455217 SHA512 5364801285a9ea2735e5ac94f4cea874bb3bda290008d39175e0f42614341654e32e786f9003130d81d9382664b9870356dc1132ca7416e521b9f8935e0c5046
+DIST genpatches-4.14-197.experimental.tar.xz 6092 BLAKE2B 458d9c4247c9b838db825a56ab04908a1fd4c9bf2935273f66705f6d226754807370664e189d0b0a9051f0e1c57798606c99108e255057331a37c40e242c4336 SHA512 c8e19867cd449c10fa10fbb108d53343a940a063ebcbe03fb5a3a51b18d8dee9ad4106bf486412a9b84e0166217bbf5d13e74175a362f17c20c1817414ec2241
+DIST genpatches-4.14-197.extras.tar.xz 17536 BLAKE2B f99eec39ec2893df203aca5c3917106bb30427f66839c80c3e64928f45beccb7d3757a5ad9db6581c76e7077317031417aa31e2d89b5c8eb0e358cb989522bac SHA512 dee2528e05fca7bff8ab82534b98c92561c3a6e82dc3f364b26cfad02c72e610622f1db4c162f6956f7904d5416a03d112fe65b7a7309c472a1416fd8ec6ed67
 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
@@ -16,18 +19,27 @@ DIST genpatches-4.19-128.extras.tar.xz 17524 BLAKE2B 885ad7ab0be8ad9c2f2094e8dda
 DIST genpatches-4.19-129.base.tar.xz 3626932 BLAKE2B 68533c898d54165997b765f2efed5cc4d9d1b6193513a27b5d1f57b6b7c1107f8be1728dcee5d991c306e51ad0bb8b880b546f618eefca4eb08cd699c37e5737 SHA512 debe6881f49e27dcd9829f047734eae0e66f28ae2d87c035d69a7f57cc6622bba1e88631a479293a3cb48ef9b1570c647d04b4df305ed30d805cf578c2c2fe68
 DIST genpatches-4.19-129.experimental.tar.xz 6432 BLAKE2B a17babcb86ddab998a4ee06b3e5f1a33a5589c18fc1ee08a5f3121741eed955822d6356e8394454168d4f1b74e7dc369e33f5e14eaee279613e43bb9e454a45b SHA512 b7fb52b33d0208c6276f5d639f10ff5a6e62e2ae53c6585c9816627ce6ba7f9e53db1bce24b60842788cf0c77390bdeb8f3d3e97fe902ddf0a7a7eb6fee51733
 DIST genpatches-4.19-129.extras.tar.xz 17516 BLAKE2B 7f0959a7a6410904e97ef4e3032a490ccf716381c57c3c7f02466e8dbdea5f9d01a9245d43c07bf516d11b06193bd4643bb949393990ce9aff570be3532fb5de SHA512 d809b2433f552b895d71acf647f5d0b096685373ff283ee5b101e205fd239f327b0c74e8f41a2fd7a20ad70643d8750ba92483fa1341a0d1aa7a16056bbdd35d
+DIST genpatches-4.19-130.base.tar.xz 3652572 BLAKE2B 5f9a8f6b81b074148bbbc1b19cfa06ddf027236d2e7566b407cd0b362f13a4240a2bdf2ac601a96075ebaf6bb628acf0135b3d429ef7e3e5c056047932c20b77 SHA512 0693efa445514c5156203ac2344eec7c8e4504d1664a4d4164ff328855ae828440bc337e1a8aac2cc2313eefa4af5512489f0d80941e4519da1fbc366d9eb5ff
+DIST genpatches-4.19-130.experimental.tar.xz 6984 BLAKE2B c37cf89fe71d0284ed1bef5fb7a8da435d038bf6723b17bacc8fed0b6121d18ae3828d34d265485bd8429abb7a67ad7a92057aed39bb5916c6e77e95b19e6636 SHA512 5280a4255380d90693db3b61db437074b5f24a7786b1aaa3c9b7aaa284d25c14bae4de478d93d56f6949bc302df00f3b34cc6a07e7fd05da1494b2afef1d7292
+DIST genpatches-4.19-130.extras.tar.xz 17520 BLAKE2B ca93048b328f0691ee8cb38d979f568b12f233321e4ca253b8957b7e54cf2cbeac251a1c69b87a527fa2f6922a85cba2b1ddf23ac5003a888a5472a89b802236 SHA512 943b761c38e9f47d5bb11d5f77ecf025f4fd0bfea796d4a803314b92841dbf619f4875a6d61134ae7194428f004ac0f9ae4f48e4f5f94810316e8c131ed6268d
 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
 DIST genpatches-4.4-229.base.tar.xz 3720552 BLAKE2B 48629037475319cac031849a45a6cb36d45036ac47366739dbd737f345c2906db4249057a920a9c3ca637c5d0fd731e93b53e331ad2cde09b8088692f48177ca SHA512 e0f1e2327398f5a73b2aa7c3b8abd42722610ab35340076ba58543e3852116ceb92afa7b3ba4f3b112164c57e5000c1584be3c9390f4048242eb0bcf91699008
 DIST genpatches-4.4-229.experimental.tar.xz 83264 BLAKE2B 3cae1db18daa8072cbe45cd50942b50ab4b8c3fbcea5ad87e2b9420886d4b8f2840b06520c271944835216a4543c4d15b1547323ccc0c24a12f6983c28b8289e SHA512 96207a3069a4424b540c952a6f553caab8abb55b37d5135f344d772106d4905784982dfed7b281112ba113fcbca3366173f6a76c6e8a255df5031c608c6911f2
 DIST genpatches-4.4-229.extras.tar.xz 16492 BLAKE2B 9c0d4734997f9af0391427aad0e2f4e2c634b2bd6439ead35ff3246effec666a1b27b6a1fab059e7a0520b169a793bc87ea499e3f1a7375a21888a1ef9d5b9b7 SHA512 f369a2ea1ca60a1c89863127dc60e0d6cf7d6edf1cdae1b6298e0764fb572c47a79ce9c9056821dd485ec944dc8791380f2ec71ead49c9eebdf50e1b76761204
+DIST genpatches-4.4-230.base.tar.xz 3744276 BLAKE2B 5ed4dabf708a87ec35a0d3c58514f6084f4176d40e45a3feef461c8264d3ef0ac6c0e2a2f58522c5c92c8fa8cebc2e5e4b1a5df9a8223f03d28edd090712746f SHA512 5b2a3f840a9d2888b499a61162c918393768fb8c8aa78cd35b20fa20454598e80630d6e9137bdce7f2357329d5f0f56af6d0ca1fed6df5d83ac97ceb4a384886
+DIST genpatches-4.4-230.experimental.tar.xz 83284 BLAKE2B 82de4c8ca40559e3a625a93f476d15be465f5fe40ad67cfa6d2712fec395474e84d59d8ff9dbc11d02379eadd910ff87382d0b5be3bf1dfedcda825d4045c5e4 SHA512 84664b54bcac25f16edcf595f86ae033f3fa994055c07519fa24e9a43ad53da9e3fa43f04c26ab162d02b857113657874fcac54099a7f6d1571b11f0487d6dd5
+DIST genpatches-4.4-230.extras.tar.xz 16504 BLAKE2B d17ab976955d1c6be92982e46997220717722a265562713036649cb14850486a45cfc1a44c6c04cb890f02b4ccff6fce044551e4bbf9155371bd6824658dd363 SHA512 c1e39bb8d38368f17e35ee6e4aebc4a7cd64dc8dda4267b4d58e3b2781463bfa023cc6a067b52e638b813fabaf693f7ecd9ae356e43d55b8f656a6ae878dc5f0
 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
 DIST genpatches-4.9-232.base.tar.xz 4094296 BLAKE2B 1dd145cfd49044cacc18e713e158019608c484d20a98a63978956d4121abe5b14931e52b1cff66acfdd8318d9ec0a0961925976f435e9562e2116f2002db59ef SHA512 63c410893bde42a53f653bc91c67c31d8ce3db049dc5c633cad46b1163598687a59a69d011f2b22d2b94c3f2fe07a68dbe2b221ffc071d150f9228c7f28ac77e
 DIST genpatches-4.9-232.experimental.tar.xz 106372 BLAKE2B 94ea4508513c3b1904d1ab038cadf8ad3499a2f37ca500dcb58c38fd35aee3598e3d50754ca2de4703196d297f365a7b91c9896e8e0f18abfd8f43f1e8f8f0e6 SHA512 e317ccf6153d8e755263d855cab06488df0b6fa496bbb946febb5e854ff24155654b845cf316d09c51db77af3d60d5ca9026449fd9979e760778c78a2faa9500
 DIST genpatches-4.9-232.extras.tar.xz 17396 BLAKE2B a589764847b8fe53278357c7695ddeeaadbfbc0115f292a523975ad6f9f4ccdb58f4433667fc2a8656a8bdd728f2a7c33a5d57da1a344c18390206647eafbcfc SHA512 ffe3c83411b7bb6623edbfc63bb9f6a5e8b38a0a76fdc59ab0f29863dcaf2fe76ea7a08d115862ad921ab3ba05ed000bca4a676f569768d10ac2beb02508f011
+DIST genpatches-4.9-233.base.tar.xz 4141876 BLAKE2B 1bf7082d06ac773ec41fadaffb622d326b761c1cc30c7a8f2df4d172eb0b20fc27e97a29121f7e5e7514247d5b023c1cb55965e7863172317f3759b516f9597e SHA512 37f5abb486ab1742ce54df3229b2e40343bfe7e63755baf58150e1ed741561ae6ffaae0d99877a175309b2a3a2743020b91cf6909cb1095662a1268b4730aac3
+DIST genpatches-4.9-233.experimental.tar.xz 106376 BLAKE2B 32bc7779a19b63a15e070c52acbc1cafbc68489468209caf1d22503712abb6b9fd6345671749f0402c0034944b832d4888c91bdcea4e3b1cb97094efd61628ff SHA512 eb9261aaa4f07514aebee0084460cd0aff1ff6a5723d4223e917d0ea301cf1a7e8801d19b4fb129da3fd86a3d68278a6a2c6d5d052ca5c67c478c7f6c9a49f74
+DIST genpatches-4.9-233.extras.tar.xz 17408 BLAKE2B a51b67980a36e1c766866b1715dcdb16cb16383013049bd434a18651d3a1b01ec9ea4b1ec7bf67d5b48c3d18f55b0042084aa936df1e2f369a64f62293abb402 SHA512 c7ec6ac116cc292d26a04b0064d49b76ed251f49dc3a2c75432e4019f451170bbf6e80076770380c64c25b3f48d453a858e21d65b48f2c25457c9a990104a743
 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
@@ -37,6 +49,9 @@ DIST genpatches-5.4-48.extras.tar.xz 1768 BLAKE2B 3f281c1c36c2a52e4fe2419592377b
 DIST genpatches-5.4-49.base.tar.xz 1695772 BLAKE2B ad81358e16e2c61bcfa1649e535edbfc4aa331915e9ba7dc5844e0ac7cc9ebfafff49ba7e1cb71d4e4dd6536c8094118da0d0dd82d6be2023b031dbcdde1d25a SHA512 eb03a777c37b71456931856174eac2ac1570ae700345186dd71d978870aee08e8a76432cf777257bd21666fbc17f58fc5fb0b4d99333cc4c730931d0fbd4a496
 DIST genpatches-5.4-49.experimental.tar.xz 6140 BLAKE2B e46eb41342a59c0fcbd042317ccdd499ecf384e4485139ad66d581585922be1a3d90b947c8cea28bed0b653bc9ba78987218a2a1c1ab4ac633b211f7a035bf97 SHA512 6cbf24c226670a70b75200e9732af9b99567a57c7dd7918f2aeba057cdd84259af27686999e9cb83c0c604e4cf0ebd340294d575fe704691215857d28f469b84
 DIST genpatches-5.4-49.extras.tar.xz 1764 BLAKE2B 285ebf3fec9ec3b5507f80dce0d6e24f635597e1bbae921135bab4ad6b743108fb8fa2a390380e030dd9d9d0d7e240dabefe043a1659cbaf6c8851d5b64d0006 SHA512 43e66a2537b42f53fdee24350903d28ec6904b2dbc10a4a1b075ac8542e6acf9adaa66defdbd10cd3f9b177a369fa1a2c6e4d6c45067b83cc0b381eea97c654c
+DIST genpatches-5.4-50.base.tar.xz 1732832 BLAKE2B 46f33ab709c16a59e8bcde3a561e8d9ac4f6e0664dc61662ec82ea3e7805a1e37feaf13c5cefae1375d6c43e26cb07a14c9e030adead1cd9d9da8cedb2c2dcab SHA512 78569c984c19912afce6c10ed2b3cb9c02a0733c058c76c432f10463d7860dd73c8de034893ec2f9e5bee11b85612e5e356d33138259803b497e7da2d7e29cbb
+DIST genpatches-5.4-50.experimental.tar.xz 6700 BLAKE2B 906a8ff417b762b02e1db852d3dad9c7478a37a8e48b2ac29e59557243a59f08d5092d2ecfd26523befa2de3d2f97c84a1dd9b90bb31ee65c0fd37aca646c60b SHA512 7ed06ac1897fb416cef6c4a98d5638de67537e885f19900ff5fb5a5b42dc5f8036456571a61e085b29cc5781fb6ceae8d7f62297fb6a0f1b80ca81e7519ab52a
+DIST genpatches-5.4-50.extras.tar.xz 1764 BLAKE2B c7c6e8c2ff97fc143802142f85f6b3447ba8cf30e9be5b307781ae216854e03000127899e66546883d34f3f8659ce636ceae677e85ab932a6a8184d5da4f8214 SHA512 e9fbd2bd8224e1e13f41ebd2af9f35f3896b9cba71c656848998ac53e4a824dd1e071a4e533e8e03fdb5a49ca70b533dcab6eab503f00394729e2216acba811c
 DIST genpatches-5.6-23.base.tar.xz 540292 BLAKE2B f22ce1772f5ab80c9a20e6447a3874c7c664dfe8c1934202706e6d2e84fc378068dc98719796d45809392e7e32d6c0a2233693617f3c3ce84f42dfab00dcdbe7 SHA512 f5db5e258efc2fd0d29e1a772f03838d232b11b9fc22e9cc78ecab70cfcae819a9bc7c24234fbaf94c2b30b559f4fb88e493643e4a6e58169e62eb665564ee9c
 DIST genpatches-5.6-23.experimental.tar.xz 13688 BLAKE2B b67102c744d95ed0bbc54bc4958b68ff55d1c447594f4c153c3417fac5e2521a78f157df27a7b479ccca6cbe3b7706a2a8b2053bf1376886be89e18c6cae9b1f SHA512 a2f2546748371a311b51063595b219dddabf72956c946ee7db76d1b8a32fc015143ce29c6fd8cfee6a834d334308a1c960267ecd42ae304926b186a5de86fe1b
 DIST genpatches-5.6-23.extras.tar.xz 1764 BLAKE2B e9dc2a6c1a326782aa1b58f37ad416b39348d30bc24ef2c7af9bac1d734e8c8f058a33a43150eb9cdf7dcc7323a509066082e79eecc582977ad320c5e34fb4a9 SHA512 1c9455a8d52304bf930c1618b98bad7e1c3af47d4984fa8e65ca5723d8120b3ce8ac9106b9e3ecb5824a3220be2706febe1abcdae7c5022a02d7ed5fe07cdf2a
@@ -49,6 +64,9 @@ DIST genpatches-5.7-6.extras.tar.xz 1764 BLAKE2B db13c787489b7b21d9848cbd0079683
 DIST genpatches-5.7-7.base.tar.xz 322208 BLAKE2B 832e79c3aa2a044993ba2b0f75e844e5da0adf0b290e4c1e1883a382b94ee5ac882cb2b0db585bbb2ba133b5dbb908b6c02a29ea4384a2166146448d2e8eef15 SHA512 4321746f6acccc17d84ace29db9214528752eb7230265cb296b957797656a9bb65dc47529b0d2d3c8faada1f0866fe3e4fed79bd57d7154cf817183aa6db0e0c
 DIST genpatches-5.7-7.experimental.tar.xz 13700 BLAKE2B 3af6ae0514af32f5c881d67206085da436f4445f436c5caac0b7e3548553aa1da9843d1975a87d5256cd6a9b7ea44030ca1757621aee7f44ee328eaf138b9a90 SHA512 ce4b739c2713c3c244466b20f7225c89eb7dcae00454368828c90f460c953a0abaf25f14dd2ba6a6107bca8ba0c1cec4b9ad545ecf931517b2d67908fbe103c4
 DIST genpatches-5.7-7.extras.tar.xz 1764 BLAKE2B 01efd460c869218bda48f2b7b270d67e4da47b6ada6af38301495bfb960c64049898a8705146d40f6baf9d4782cea3e3be6aeb55a265ef5ce2b7616a8c7be657 SHA512 4fb0a24a6cbbb05cbb0c81daba926c6b71b01821f8cf60fb81fb57b5130783c99ff726e93b7a7a265ecfe1194a353189e790a5d17b8d86cd38441a1af2c3c74e
+DIST genpatches-5.7-8.base.tar.xz 388040 BLAKE2B c6c9a9d335793f3b6d87597d41c260e2d91d01341dd8e8452629f1a9338c6d11d51e1be6af4def80e647ba7b198ac96d74df93a98cce0ad11428b5db12e90fcb SHA512 43928fe27bcbbbafcc050bcffb8101223922703b0c883ba8f69b171c019ced765fb4c932a6a3fd1a56e118995bb790ac21001308fba5ed0e714829d1604005cc
+DIST genpatches-5.7-8.experimental.tar.xz 14144 BLAKE2B 7beb49158167e2484246ada291102f94a7819c9d124e09fd91fa692827225e45a62d2cd754664e36ca85de574729711fd127ec83fb27f62a8f9805f82ad843d9 SHA512 34776312b4b871ddb6a4720d36be215a46f480cc1aee6495fd82b417ddeda1376975c90f3ec6b7397132ac0e9b82d6ec69ec94a0c2a7875704deddd9dce0bf14
+DIST genpatches-5.7-8.extras.tar.xz 1764 BLAKE2B 5502d8c06613ef52c202912b7459daa2c62bd4e937c367b82a0d6e0b50c50d29c8ea32828add17f4c90ac5bd6c994ee3e6229357ac186269a22389a481da9e52 SHA512 3c4087fed105ae8055e7db9f481518ad7f02d668a958a0c19a08e3ecf0ab3e517032e36ebdc2b2a4f747019036b89692cdbfcd379687eac8791f8d5a214c2fb3
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -59,18 +77,24 @@ DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f
 EBUILD gentoo-sources-4.14.178.ebuild 729 BLAKE2B 01d8e05b136987c35644c083d51c30f6502fd55726c29c2cd2ea9d32af2909c692ae43f36cf6806556459deefb4a1a526cf141a4117e344be5a487ded575366d SHA512 52ffde54181bff1def4d0fb5b7579a2cf8e7b785a141f4364f2d0e84c9c1d41c983a180303f428ace947efc86bab66e7061fa3dee1c1e8934559afa472cb0ed2
 EBUILD gentoo-sources-4.14.185.ebuild 730 BLAKE2B 055933012d82956d06157db02cecb1544fa0a591f508606406d73ab0b53c6273647d4bed34f75ed7da24c50e6a7ae8bb38b5d986cf12e468072c96adc1c2169c SHA512 93a73f9eb9880b53f8c688b19026359f86d5b61e7776729c5dcc5cb6223517e6054ef6d235c0a1f8278e36949b7a5a27dd92f957b83a1d707efd4bb5b2f48d42
 EBUILD gentoo-sources-4.14.186.ebuild 736 BLAKE2B c14626be35019bc19fafdfb8a3860922260d2a4428a61f8632f4aa24acd6724258a0e321c4b849fffd384c255c6b1e3a7e8272ccd1a0330dcb1313e0d694e77a SHA512 c6da71dc7606203899bf438f3b8b244c1997aaa238d25fe81c6cd1e56788993190789fede567726fc38065b63d91043fb3743d711fda198bde6594cffffd5540
+EBUILD gentoo-sources-4.14.187.ebuild 736 BLAKE2B 230376c7688f44d08e3d2148956ea0f1c7b8d3fc062e464d986b6bc495876922911456b8135b32db57d9828b13a013155e0f9c05be298a88eafa4de560e85aa9 SHA512 9bb6e5fbc04fb2e0cc496e67172b7afeac26db16c6949a68eeb99dc7f06f1836953bd33965238654bddb095fe7d9dd8deaa9d8321ab1574e09ab0734ce65e51e
 EBUILD gentoo-sources-4.19.120.ebuild 729 BLAKE2B 293fd5c4504c7514cafa76da359835ed16ef486a3260b8530d2017636d9ccea4b25e498a5934c757d11cec3f04232c66daaff57fa53724dfbaae42f4de3dd7a2 SHA512 2f78ee6237d86516b4e27c0927e96e5b99c82fd8b9548b16f7b93e9e4e6d6998e2d6cf410b2457e5211d5767dec4b925c4e552c0740d260656c6f62b65b08627
 EBUILD gentoo-sources-4.19.129.ebuild 730 BLAKE2B cfb4dfcacfbd15945d4990c23342cc97759c4d9a9a480e99964b045f8af2b0e3957ae4ced08ee294579755ec4b2ea864fe4cd5461c12cea8c04c990e81f5a022 SHA512 7a5b183017703855298b6485b9babbf044ea7d51e7420cd55d4c4b1af6f546d0556531c5745e3550931d2cd0d35999588814ac785644958586c10a356f94b27b
 EBUILD gentoo-sources-4.19.130.ebuild 736 BLAKE2B 6c40eebf03bb5737c76f87b79da6a0536682f533b098a4ff117cf0a2fb2e9f53b5415b205598f1db1b41ecf04a9d83c91c01bd30087c6c92f1267c85b0edfccd SHA512 5e15875a0185e26ec263d8fe64ed01c0bf35dec66c1b6cf54643eec8aed0254b93460e7bd55ca52d9ee5fee3061b58cde54ce291d5050f1b56eb720954308635
+EBUILD gentoo-sources-4.19.131.ebuild 736 BLAKE2B 1d5e4dd89bf2b01f4344ed3a6d682af25387b74cae4c79c1c1007adea8c7881f6b82ec5af54b1be83635c5f417d03aaa7f3372e766683b6f4d107270a01fefa2 SHA512 61b6f81c057c6c0be1022005dc67600155653fbe11fef4b51556b72fe00d71ede33968f3b2452a50ce4104a36b3305b9909aed0f9fe5d8fad3cbc34aa358f0ba
 EBUILD gentoo-sources-4.4.221.ebuild 729 BLAKE2B 6ca7a8f5c029ab35fe94e9cd49bca37f553cae98300ffd0a1ba2d2cd8aa34297c0de7508ff2d32ae0eb60b65257c0ca7e7897e9af34be4d37ee245a4daea8830 SHA512 01e9c43a850a92c9c5b5f5c0a74f838ee86d49fcfbe462c55ff42beb553788f15b962c7d6f64562c94a1a496e2df9666ff6b558e64722da8987b15855885325e
 EBUILD gentoo-sources-4.4.228.ebuild 730 BLAKE2B e0b5fd63d11f098ee2cd35f92b74c46eec12b5134825bb7c99f9e0a3c6082c34aac36ca40b172048e6c1c93a9ff1bba2abacbe2eb6cb86831c8883ad7e5de129 SHA512 ec14fde115db161fb72b445baaa98a53cc24235813c49990ec0726ec4f21923fa25112c6ea4f68c88c739256bf6a55058bdecdd11573441f476e78e05d1584f7
+EBUILD gentoo-sources-4.4.229.ebuild 736 BLAKE2B 098d95c43bb0cef02351d13f5f94c4e0a059e44937e1ec5dfa7b999d076695b5fabea1b9fac0ba56854480621ce84ff89a771bb5bcb21d23bdc1aa5513a22f80 SHA512 c113f6e8e3f192e9eba4f720f72addbcfd773f9f3ac02daa59d047f64ba79233094492faea634c02af50728d1ca9271996178da009dd165b00917691f17fc9d0
 EBUILD gentoo-sources-4.9.221.ebuild 729 BLAKE2B 2f47985d51bd1f16d0fbc8d52c4edf02713ad7b8f47d230a324faddc958767f9fad93accf89c6089ffa268dbec27f61934055446b62603d900fc40814cb9ca29 SHA512 5ddd789e363975fb29927d5567373fdbaf852d324ee55ee2734970cdbb9c8d61c3f23417ab7dfe6b466afd7b12a528712f34b36b4a12e317c3a22bbd1d416f5f
 EBUILD gentoo-sources-4.9.228.ebuild 730 BLAKE2B d22725f48b0aefede033019c7531d8988fd2e5f88d0c7ba9a87c892a4cd3ed2033ef02981d36f0af7bb737e335ce8b96adadab2aad7d3fc27ad06e5d6a848450 SHA512 7b0e635a6d2c46910eb8184a4e9b59a56a272ccb6a68943b0dfdac4e254874b9a05700137576c243e670b8335d9d39747d1e28b961c12426893e35bf63dd60d8
+EBUILD gentoo-sources-4.9.229.ebuild 736 BLAKE2B c40ee5451b9d026358dee16ec82ed009950439a7d7e929f9ed6c1520eac9241d510fb3ac435037c2fef49247fda5ff9e6e49a2da15790cce8e19d1c7cb64aa62 SHA512 88b7a0fe58b6a2c637be24a07a0f34fdc11ccdf73a39c6a3ee93477d334e137ad6771672d1e5b392d060e94f59415bd24ad227e533565e88a825cf1158240db9
 EBUILD gentoo-sources-5.4.38.ebuild 728 BLAKE2B 6546a7a7b36a8947452844ff1b1fe0accaa15f75b298a3067c8d01ca88da2dcb376806918ad69d15b000b8d42078f2d49d5601d1e3a866f8fe540cb233c3f46a SHA512 a2e7a90ed18991b3e9bd610b6427a801a7df65b03d165d6addb51a3400c97fa392f6e4c07e7ac86bcee01825db3b120bd112d36a056c3d26a551dc3278a83bf4
 EBUILD gentoo-sources-5.4.48.ebuild 729 BLAKE2B caa7619691c0872377648b047825e384f990b06229594c95d7d3f606613cfe17ca9a836ee2752dac899e65675c204b69a7267c9cb58b62188721579fc6d17c77 SHA512 ec4855c11eeb193cdaa1fda69006853211531510277f78b1b25b8a729645fc11ce4d7e022136ccbd8f4e1ab17fbb76512c1dfda3a2c8b4a822071967ce6d1b38
 EBUILD gentoo-sources-5.4.49.ebuild 735 BLAKE2B ad58a2a8a0171e1ee878b8d0b005f6a1d4b66e2518b33e83fc1dc9d600ec9cac385b6058b06d2677a04eae436c634eb645d5cdf39fffb4fcd2296ef2ab9b9991 SHA512 441b89b51558050320818f85120e83f840252cd66a61f5d8ad109600462ee5e081a50dfce68b8c5845f21d68fb19fcd2b64447cdf03c8987ece23bb24d0f7d69
+EBUILD gentoo-sources-5.4.50.ebuild 735 BLAKE2B 90f8371e90027f3e757ebd4549fa8f6de2634867382fbe67f5f428995c8c7d43542aee346404a0226833741dd92e522204208fc5b45e1a0112369b9d04d62711 SHA512 db2e5b8b3b63b04ccf4dca704cebc3705d11d7eed6851d15309e181bf2672be76a53132d33844b6b09805aa2f35acfa852f7da393d80cacc9d488e7d3db50e96
 EBUILD gentoo-sources-5.6.19.ebuild 735 BLAKE2B db588ac1c7512d6f5b0e7ece577cc4ccf7e926aa7218c076d6c21148123d86dd4c7428481e7540cc260d38fa67d88c47a13ede86a2a686a2dcec672360c42a7c SHA512 b83d8f3a961262bf84df42ac87b2001547d4a9cee9154664065880ea85c095d5c33020b3104c198a7576ab33853a643ca8ce9f4770a91c5211fdb3c60e2feab7
 EBUILD gentoo-sources-5.7.4.ebuild 734 BLAKE2B 394de3dd79025b61d51744bb8dd583aacaf9636f08eabad8e9f0565713af4368b9796c1f7c2cfc67b9c90a5ccd604ea3c964d2a1b85a6e5921e45ffb639863ef SHA512 510ec265a59a2398007bfec9e5e3a3be7638a7a2f8ab9500b98fc0ffdd26f940cdfa074445bc154410cd4d099057ece1351fcef66aaa12096999c17a84827817
 EBUILD gentoo-sources-5.7.5.ebuild 734 BLAKE2B 5a4981b9e187d92f0330cecb9ad95b17fb483a766ff61fb85dffa5440eff17616e6b09787e5822bb52587aacfe8933957da460a5227fa62b9e7a3ae4b38dd14b SHA512 f4d8ae5c569f6c19dd38fb4ac411ab8bc94592069a8149cf3e8baa03a0465b0e0a894b62da62711fe5ab3cd99580b32ef78db0ada1c5e582e725e456c1342c00
 EBUILD gentoo-sources-5.7.6.ebuild 734 BLAKE2B f602927c87bbc0fb4b099b47547aef2f752cf2135a9ef3ca58fe1b1d0b55dfc6d2d20565a85bfd8a742a78b4e7527468c167960e92adfe516ed9f5bf51a98856 SHA512 bb1e4df14aa0d8ac8f4f04c9c8bbc4c58584648e958be029af894ae30772dd06f3e1150618af2e32e25e7fa892e5d17df034bdac36a38e542522cecd57f6f381
+EBUILD gentoo-sources-5.7.7.ebuild 734 BLAKE2B 712eb91fe9e4c7c28eef7bb92e5c6db6937a1931f65ea38a23d4663a8505cd700a2c2bf5565e375a1c6e9232b0238538adc4e308b77162aa8b7f71a5afd70f0d SHA512 25c21b2a089efb26a394d7f7182154a19c82011b5236d29cea7ef8796accea460096badea8ace22fe1e1200eff19af78f34880f0cd76fe3fe598606f489b9648
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.187.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.187.ebuild
new file mode 100644
index 000000000000..bc4975693ade
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.187.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="197"
+
+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.131.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.131.ebuild
new file mode 100644
index 000000000000..5ae7efc52569
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.131.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="130"
+
+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.229.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.229.ebuild
new file mode 100644
index 000000000000..d259c7da652d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.229.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-4.9.229.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.229.ebuild
new file mode 100644
index 000000000000..1c7355749754
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.229.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="233"
+
+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.50.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.50.ebuild
new file mode 100644
index 000000000000..1cc81e3342f5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.50.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="50"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.7.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.7.7.ebuild
new file mode 100644
index 000000000000..3d7aef033a80
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.7.7.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="8"
+
+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-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6880a8a8e0fe..773e34ad2e69 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 0c94e6aac961..73ae1155fe09 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,6 +1,6 @@
 DIST libsepol-2.9.tar.gz 474861 BLAKE2B 2d0941a003bbe6f15f047e3e55ce4561c36fb4946ce46b618df1b884881579cd192a0ac7cbedfb67ae5e926ab03ca35988d2a4fc279f31a88c83874e85862d13 SHA512 415af623c2b2898d98828c9bf0b12cf05d05790d2b412cad291f0759a8c3feacf1bd88c2ba6f2f1bca8f9f71e1627e9d5b1b69d60e7ef96fdd52df8a3d57d3e9
 DIST libsepol-3.0.tar.gz 473864 BLAKE2B ff4da6e12c1635de88a2aaba26bd3630576a3806543d7176d8fbdb4deda5c9c5fbf8a5a4f68c8041cca0af97429e720d908cd31052d13ac72780bc85db1f56c8 SHA512 82a5bae0afd9ae53b55ddcfc9f6dd61724a55e45aef1d9cd0122d1814adf2abe63c816a7ac63b64b401f5c67acb910dd8e0574eec546bed04da7842ab6c3bb55
 EBUILD libsepol-2.9.ebuild 1101 BLAKE2B 15d24d96643fe4cd0448a5fa917f0784bf34310ad5f326f428896e58eb7e4b4de02f6acab25c9f4f833b237a06b4ac7044e9c10d15548b8bc56dd00308515ad1 SHA512 caf47ce74e8463c2ece4bf8c39271f28c92a9700a6eaed4e39d35356a0169f09f83af257e7afa1b56099b22e6b79e373427e644a017eb9addf515ae0da2e18a6
-EBUILD libsepol-3.0.ebuild 1101 BLAKE2B a62ec13b886e70521f011caf6c1675d146e122e22d515be013540c6d6cc5f96bcbb1a8dd19674c67e48b7aefd383afddf69c0f878530e1ecf78ba026bd95a3bb SHA512 8a6a6d7259182126b896e963aa38f090da5a3dd1fa40f1526d9bce3b20c6ee3e5e19433a25a7b74942b9a151520e5e6b473f7cb9ad91e0c79ce6f75102059c75
-EBUILD libsepol-9999.ebuild 1103 BLAKE2B ee873252927fe95c23926ab16dc5b403d69fad3dcf14c3a65260cdd14b3fe02a27da4741f76c275b2021a8c537e799b526681713330488a6d64c323bcee2c127 SHA512 1e62321cf764da370247e4e12986f6aaf1ed90df2b4fa3fba87fa02ee995f7aa73ec1895dacfb1a7e7da359ebef255db73bb03b5d6945bacaff858e942debf64
+EBUILD libsepol-3.0.ebuild 1175 BLAKE2B 5a6b43474a6d61bc1f17351d50e0c95808132c4c05eb4a836e2089575c46a6fe1969fe2e5d075da05ac24831d2e51d755d92832a06e904624b6137f14494ad09 SHA512 928fd7ccbd052b9b2d66d195db9d702fea2d4c76be0e7634d52a8bad44a4934d0ec0fb211b55133aa4228beeb75e3d6de897562bbc0bad3035eaf840aa7d80d0
+EBUILD libsepol-9999.ebuild 1177 BLAKE2B 9d221ed45304b77508c36b75f178ea20d0e49e28516541e9d8533f7eaaa6370102722cdc8f4795983b05522c110a3914ef076ef50b91808fc25354cdcd3afef4 SHA512 2834dbac780b691a5d2e43e1ece46d1c25827fc822720a189b00a4c7c377de97f60e44ea633219029dadb23874e49cd46b8ad6a47a915576bd1d830d9137f985
 MISC metadata.xml 495 BLAKE2B 2cf1b786b99f7cdcbf7e393957ee741ff23b69c4f2d326f306e3576ab7e17eb17148c1f34d32797fa669a05506eee0d86ba7c9b41c24c62f72aaa2b7d97ecdb5 SHA512 bf55f1da0e997ebc521b5c74f9f721e38971630e9201a6c8aa458e44291c8480eef082b526c746b20ee7335a231fa69ac9d0f1953ee8cd5a63a1c2346708de1c
diff --git a/sys-libs/libsepol/libsepol-3.0.ebuild b/sys-libs/libsepol/libsepol-3.0.ebuild
index 950ca9db1726..91881924e6a8 100644
--- a/sys-libs/libsepol/libsepol-3.0.ebuild
+++ b/sys-libs/libsepol/libsepol-3.0.ebuild
@@ -38,6 +38,10 @@ src_prepare() {
 
 multilib_src_compile() {
 	tc-export CC AR RANLIB
+
+	# https://bugs.gentoo.org/706730
+	local -x CFLAGS="${CFLAGS} -fcommon"
+
 	emake \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
 		SHLIBDIR="/$(get_libdir)"
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index cd78384ffb9b..bffc7757949b 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -38,6 +38,10 @@ src_prepare() {
 
 multilib_src_compile() {
 	tc-export CC AR RANLIB
+
+	# https://bugs.gentoo.org/706730
+	local -x CFLAGS="${CFLAGS} -fcommon"
+
 	emake \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
 		SHLIBDIR="/$(get_libdir)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 03fecbca13d0..58186b16ef19 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index f29be3d3636a..0f3bfbf9a684 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -380,7 +380,7 @@ DIST firefox-77.0.1-zh-CN.xpi 596100 BLAKE2B 440edc453f303cb4d90f9b665bd0ab421b3
 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.10.0.ebuild 28439 BLAKE2B 553f836c27506b887d38a82ada2d0cd002b50318c4389c3e34e0409c9e2daf983282408fb373de74909ba8695344caf033f0629d35e8d38389fdb4e9ca907b36 SHA512 9b41fddfbe73593a7c7295b9aeab63e8609c24028abc791587d4874e2afa29816a09d343767b22a5c41409472b80117f73cc9dab652cf59bbeee60db124f6d2f
+EBUILD firefox-68.10.0.ebuild 28215 BLAKE2B 86bffef035613c3a60211a471e920007703aaabbdb608b09801eab32de9dcc296aa1af9ef13128bd5d2529a3bca65ddedfdc026c4d46323bc892de5badef17bc SHA512 f78cba3d0d3b7ee38c3c51d60770524b62e22a44f2174d81cb5e36be633abb1fe8c3f60d87c96edc2c425034032501bbb4bee7c2e76a1d5ed87a002039d87e8a
 EBUILD firefox-68.9.0.ebuild 28433 BLAKE2B 5ec2b131f123cf88930437b8f59865fd62f9113826d7d65d486d54b3376b8a89fe851ea24352bc8037f35ff93b9d82efa4e85117ed297de71d318eba9a84a02f SHA512 20e4708d246c99850a9583c35ebd4ba6fa99ea5138d6c8777eaead13089ce4ee17fa91b20c6d63bc0ad2310e1e35a22d0dc305b3b93b6989253fb56908043b47
 EBUILD firefox-77.0.1.ebuild 28778 BLAKE2B 77ca864b3f17fa92a72e17cbc6d6ce1d73f82cbe07dc6fc6ec8682f56f60c333fc963a29def997700735e4abfa96f030b80c024fa4b230f120695f78c3c03677 SHA512 6f9c96a903fd8d8a66b8fbf1f46a2486a5a521b18b4fdaa95c4a420d36a88582a93bd854f9fdd9cdf4ffb776fe568c22aa6f5dd4564a55ddb479f19d852981de
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/firefox-68.10.0.ebuild b/www-client/firefox/firefox-68.10.0.ebuild
index d73893c7c904..64189efee3ce 100644
--- a/www-client/firefox/firefox-68.10.0.ebuild
+++ b/www-client/firefox/firefox-68.10.0.ebuild
@@ -10,11 +10,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 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 )
+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
@@ -30,7 +31,7 @@ fi
 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"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${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}"
@@ -179,8 +180,6 @@ DEPEND="${CDEPEND}
 
 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
@@ -262,12 +261,6 @@ pkg_setup() {
 	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() {
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index ad316af8f5d9..e759aabfdbba 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 2c1c63d69ba3..9231e7a6f894 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -44,12 +44,12 @@ DIST nvidia-settings-430.64.tar.bz2 1130931 BLAKE2B 032bbe8cdb7ec3b353e8f8ef33d0
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
 DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b SHA512 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
 DIST nvidia-settings-450.51.tar.bz2 1056993 BLAKE2B a410593a3217023103c2c783c7a2ca0dee1c6a2af8dec1f0398159aa8192b307e4d27690b9987e879e863e7667b2d046f6128ca1634750863b58d4727b4d2a12 SHA512 6fd455c1910a3ff6105facc06ef65e29f88a0133794f27bf36b999cd513f5639a2c24c53bd5bca308730e6c66f10eda25d191bb815eee53d39b5632a1ce466e1
-EBUILD nvidia-drivers-340.108.ebuild 13327 BLAKE2B f1e779862f35febebe6e4efb9d58e4e33d0be1aa42fc41f403089506b23166174f9d1d82213ce6a22f67ebd35f66f34e1443af8724e3cf6243de1c19e93f79d9 SHA512 9f8a9e15fec577368cb13251fffe68107ce5a9e3bb6c4fdf8735dbfcff4bcf2d1f9b7562751e94e9353dcf41114f9071aaba3835463e38a6ecf10886827fffd1
-EBUILD nvidia-drivers-390.132-r1.ebuild 15144 BLAKE2B bdbeaa03a397e8e757f1f4e084118b7030cc953cdb2caa4c4970969c408f2af434c4d3fe7b1b27ed9bee36880b23a17ff265abe7d5485eb72cb56e132c9d24e3 SHA512 5011129e6a446a831765c859374af724f50c7ff335eb07e0562c141b40a0b1d846bb0d40be05d9d7483356c9ceef59d2e4d5c5d81e11ebfa6bcd32a4bf2b7819
-EBUILD nvidia-drivers-390.132-r2.ebuild 15582 BLAKE2B ec7efbad69e13b1bb89b98a61f8487d4a1605d573efe08a541d1a53410c815e438a55af67e43810919992ff5e289b76f6011f1d2221888c036dcce6d94772fd8 SHA512 2e46a86cca40e942c5c570c5040e01e746f80eb93b93db2842da9c7e551d8f2c1062877a26734ba0b587386c3697af14abcb53382566508e63ea357a60bd397f
-EBUILD nvidia-drivers-390.138.ebuild 15598 BLAKE2B 0a207fc2c57c2617bff21ab20b063b2d235aa8ecaee809f966735a3f7fd950e307f71fbe92c2611d0d191a78bc97de329236488c7c1426de13ff7950e3c897a6 SHA512 6cd90ba22155cb6f166bfb39afb5dbd84d9247575c4478279e629ab53ed77a62b8ae427d253a6cf276aeefd0617479e7019d204d8729fbd4ebe8a2730f193d45
-EBUILD nvidia-drivers-430.64-r5.ebuild 15157 BLAKE2B 8aac4b297ec70adae1d958d9dd5a39d1ba279e42f5c8edd7eb0851736cad85bf53180513a49f3184b4df10fe7e009544b968828ad8907924f07bdb2a41f51a7c SHA512 c44b72bd7e16e340bbb7d3d3159e879f124d9dd780a78d491867fb86bbcf6ed96e8091132cb3996db5a1d128572c5b6e4b8310f87d597714dba4a756e943a005
-EBUILD nvidia-drivers-435.21-r5.ebuild 15516 BLAKE2B 30bd6c41ff6671c221156084fe5388a70703dc068cf595c361001c061be5e90c25a5482f55e775bf11512812466dc388671c5cb4ef2ccd9712a25e4e797c3843 SHA512 78a7f4ceccf9c3837f90fde937271e94204f13dafcd475db13947e3af828fce9bb56d4e2003bf9b39dd1cb538bf8d7e8bbb236ad340d6e92f67443adb859f2e1
-EBUILD nvidia-drivers-440.100-r1.ebuild 15458 BLAKE2B 472d84718c2f17c9f4642fd8c02103dd3375d8b3b1c38f0e6d489c71d93580326e95e3508f573da240b4274417626ca88a7e75467c7119d81543de758b7d1ce4 SHA512 eacfe3aa6f5c091870fe2f2a0dc6c4dc940937a5dfac6f5f0c495c09a9efebbe8189cab1146b4c18f6873b846ea2abe40258610ad93ca288122cafd909c4ee06
-EBUILD nvidia-drivers-450.51-r1.ebuild 15484 BLAKE2B fab6b5b4f061ca765efafda22cd7f361f914265da371b2376b15335e5c986c5bb0c5aa991447465f52682a3c12835473788a2d3cb9db31e2695cbc3e18a76cbf SHA512 217911bd48bc528bdbb42b5f7c12d147dc37b4dd688713ec52317884ad2d551c907b64f7d77a678bb3f820f2b58faa1c778ad4d412cde777fe347a6bb5f9531a
+EBUILD nvidia-drivers-340.108.ebuild 13329 BLAKE2B 2a26ddac00f654738256aa8acdeac27cd5978adbf168f15cc4711b43ee206e684feb84ab09bab258e32f1a2117ea6b29834d48dc236403774c43d981305a91d6 SHA512 3e1e4f0795fbd20b887cbc3a641aa32456293160ff8056f1c63598d3a1e5321931d64ba02550bae2350aa3ccb84c1471b4e0ede2504ec945995b5e0ab9df14f0
+EBUILD nvidia-drivers-390.132-r1.ebuild 15145 BLAKE2B 25873b68d43b5d1c050ffb236615b85a6a79856ddb00c479a31dc3ed0974cf29f8a85102ad2a1e9045481c2216c6406e0621494898ee9264ac30938c0fe9fb6b SHA512 c3ba6d63fa1b439073539aa71ebd5a58deb4c0a43aa4f7bfb5b08fb83842d9ea27e764ff70f90ebed268a78d62bcbfbd773b546878b7a04c685c841202b11525
+EBUILD nvidia-drivers-390.132-r2.ebuild 15583 BLAKE2B f4a4834993024371a6851b14bb2b2e86e2792dd27bfdd709fd2407ae8a2ad0364e6381c3970bb61fd2f0dd3573d9558c496ae4a33f332a344edf1f90b55feb9d SHA512 640cc2fb46fbf8dcd149d10bec95d487533a38fa3f86e6f46477f98fac7b49c7385029f9561c22efbad579568a0d4684b4dd8fdc03f43140714bc5f8cfba309b
+EBUILD nvidia-drivers-390.138.ebuild 15599 BLAKE2B f62d4d5fd9187dd74dc99199fc1f2e59ab9879fe1dd77e2a63cae12421eb6f384238c6debf362d8ae7eb550ce76f83d5da3941fe5c4365b4b6032388e5c39147 SHA512 2fc61ef9865e29d0ddcbaf9b3c2714a8ae6d254e432ba6aa85f766131367f31521a7fe934113e953e47791a76a0845bcd2ea745022ab7943f18ac3561476cc49
+EBUILD nvidia-drivers-430.64-r5.ebuild 15158 BLAKE2B 87140ae4cfdf096ea83453b79ece53a8ff93981f498c4bf0f22aa3da84058464e28a2e42fa3782abca1d849286994c2fccef4741c46cc90448d46e860528191f SHA512 d0928d336c2407f65aab299062cc173a9b9e9cf13d1843d316266da5013d6465018e751735b83a1e5c58617c72d5ef18663e1d064b632ab1e8581555c899eb87
+EBUILD nvidia-drivers-435.21-r5.ebuild 15517 BLAKE2B 944fba0f0be2e781bf90c1a9cdfe9459c9d2e453505f2a7ea1fa2ea463fb2e492c6386fdcc11d079bd1e35ab05445dbc87f15ccebe22df3324201c111daf28aa SHA512 a2fc558c2cdfae2559740cc185760a74d5864348ed2a90acb8bbb92a19f90637ab9af3d353ce42f7dff11d883d03a15f233b67cf3e7f841c9d0196125a6e7a63
+EBUILD nvidia-drivers-440.100-r1.ebuild 15459 BLAKE2B da60a629b5c22765f17576e9ffa734ae603dd564ca14c140bd6778223b2be8571167930bed4732881075e1abe5ed60775f50b22de756557ec946a6e321627c5c SHA512 646efdea5d2e081dfecb69bdc4f8e429ed7ba22b919dab39fcdaca69e50ee739ed39f1be557a69ebfb125cd339b9050648e5fd431f31207328523f44bd01d12a
+EBUILD nvidia-drivers-450.51-r1.ebuild 15486 BLAKE2B 6325777d1d7e693f4041ea8157c74408c431c5fac5b42d75254559f9fe50171ded929846e32310ae4a4382bd2a32e7a26dd15c85f80055ba5d61f19481f5b114 SHA512 e6ebae64c8d6d50d01da14bc0d8c329a35261c567fdc730375a3a2ff67486689ae756ff4221e3df6352d96bba3e0c540affa72b90d3380a1d7dacd14c50ca07e
 MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index 94c582830348..7ab4dac5757f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -72,9 +72,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
-	DRM_KMS_HELPER
 	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
 	~SYSVIPC
 "
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
index 3f2495a4af14..211c4615cefe 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
@@ -82,8 +82,8 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
 	~!LOCKDEP
+	~DRM
 	~DRM_KMS_HELPER
 	~SYSVIPC
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
index d042a6ee3ddd..9956c57d17b5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
@@ -86,8 +86,8 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
 	~!LOCKDEP
+	~DRM
 	~DRM_KMS_HELPER
 	~SYSVIPC
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
index 3bf3c71b97c8..b100ce189184 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -86,9 +86,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
+	~DRM
 	~DRM_KMS_HELPER
 	~SYSVIPC
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
index d2aeed7b1691..9da083cdec9d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
@@ -77,9 +77,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
+	~DRM
 	~DRM_KMS_HELPER
 	~SYSVIPC
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
index a0a7e2f2d5f8..6a7a82433171 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
@@ -81,9 +81,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.4"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
+	~DRM
 	~DRM_KMS_HELPER
 	~SYSVIPC
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
index 5772b74a7c25..22a311dd0d17 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
@@ -84,9 +84,9 @@ PATCHES=(
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
+	~DRM
 	~DRM_KMS_HELPER
 	~SYSVIPC
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
index f6e28fa006f6..d4a8209c5213 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
@@ -85,10 +85,10 @@ PATCHES=(
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
 	!DEBUG_MUTEXES
-	DRM
-	DRM_KMS_HELPER
 	~!I2C_NVIDIA_GPU
 	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
 	~SYSVIPC
 "
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index acb902857dad..b372cb1a5fdf 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 93409ddfd5a6..2697dd0284fd 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,6 +1,6 @@
 AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82d3fe2db57ece7a4e564d99990de901e6a01e7b8013a840717a67ef798d34a08c9ebea03d4 SHA512 5e9685e8e2d8933e9b3bb2f3dc92ad677f38b63766bdb407cef7373590ed8d0e73aebd1ed6e489b39c8b1477c50657df499a7b5e50c09df1e675448dcad7f62c
 DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
 DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3
-EBUILD sunflower-0.2_alpha59.ebuild 2181 BLAKE2B 227baca89b619f4a135b4512c89870fd6f8da2f3a283ca92da0cc6ecbb1e2302e1a08406bc9cdc07a4d1cbeb78b91cecf9b8f7dd1c425053bb7b32807337d3b2 SHA512 3797f36f11bcfc52ca8609302535ef9630005a9ba3ef44be50e2cc9aeea70ba226c1f6d61af3b1a9929c7c168b35c0b23dc038cf5c20151c07f55bbb16cf347f
-EBUILD sunflower-0.3.61.ebuild 2246 BLAKE2B df05d167049622e22af106eda9da2c6b059da3b6c99a43b512a5ff8344e73fef6a7e7d4b2223660e60ec9b6ff35449ef38d746a3d9e93a9b0168d6b82dc11020 SHA512 69d28c2d545b004b4a8d89eb9e0db9997ccc5d1d84a6b248317ccc18430220776fa1630946d24b2ad0c090132d503553284c19509659e3f5bde07d166187d269
+EBUILD sunflower-0.2_alpha59.ebuild 2179 BLAKE2B 9190ab3dc2703b4dd1b56e3a3bd0067335d9497a4be13e8a343355c7d16d2fe3608b21a6ca1e5b4b3e3de302de79779e3a5a8436903de14a582222e396e86369 SHA512 eb5ca2f8be41572ba390286c60c687aa6b91c48bb1babdf8535e92fc1a93f496d4174e352593bb07385a9df550893a23700e0ae91f83171355f1dd7ba4f720eb
+EBUILD sunflower-0.3.61.ebuild 2247 BLAKE2B 2ed58a4bd560cd12594c7b366c593831b16c06ff54c41cda233b42fb4ec612430748089fe946c4f7b5dafc7913f6c3c827a71c8ea718a5b708ec3d6b352b5cc3 SHA512 d9134e077c77b072f1bbcb95d672d06e669f3d38b155d4f53474f3f9b9364081b0dac992e2a1f63436d4b0b269ba456fa79675bb62f59bcaaecbcd060cd7055b
 MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
index 848b84a56f6f..d1fea9c5a0c7 100644
--- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+++ b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit gnome2-utils python-r1 xdg-utils
 MY_PN="Sunflower"
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
 HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	http://sunflower-fm.org/"
+	https://sunflower-fm.org/"
 SRC_URI="http://sunflower-fm.org/pub/sunflower-${PV/_alpha/-}.tgz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild
index a556eff77ba3..e632d371fb25 100644
--- a/x11-misc/sunflower/sunflower-0.3.61.ebuild
+++ b/x11-misc/sunflower/sunflower-0.3.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ MY_PV=$(ver_rs 2 '-')
 
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
 HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	http://sunflower-fm.org/"
+	https://sunflower-fm.org/"
 SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 3702113e3003..1f4bb78fe4f2 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 48c1c78a4c65..102fa867ce92 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,8 +1,6 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
-DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
-EBUILD dwm-6.1-r1.ebuild 1490 BLAKE2B d37910e5a5d8dab132a74773d96e8e07c13fb651b5f3ddfc55bf2cdaafeb3415de7f35ae2152312c70d17d922881056b8c4a204da82a00715be59e0e7f9a1eb3 SHA512 1d585462b675b5a7dfb322ae1c4c572006b56665024f6ba56ca6e58fb7dfd65b55adfe2adf94c678c0c44cd916bc1616438f7b0e8629a40758a794e43a874220
 EBUILD dwm-6.2.ebuild 1075 BLAKE2B d32f47ca2dcc8c169fe50e8d4a05ac5b5e7696c43f2714245763222e71c5a07087088a8fcca023e47560692cf90718fc9ff65827ce8a6eca139702f061adc44f SHA512 e1f56ab69d6f4cfe1e7438db9ccc4d0b63681918d87de97891457bbe914e33863e42213c3c90a4abe0e31d8301bb9a24407af19d89927e37db466b20d60005ed
 EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
 MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.1-r1.ebuild b/x11-wm/dwm/dwm-6.1-r1.ebuild
deleted file mode 100644
index c47fada5686c..000000000000
--- a/x11-wm/dwm/dwm-6.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="a dynamic window manager for X11"
-HOMEPAGE="https://dwm.suckless.org/"
-SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="xinerama"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	xinerama? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
-		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
-		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
-		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
-		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
-		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
-		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
-		-e "s@/freetype2@ -I${EPREFIX}/usr/include/freetype2@" \
-		config.mk || die
-	sed -i \
-		-e '/@echo CC/d' \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-
-	restore_config config.h
-}
-
-src_compile() {
-	if use xinerama; then
-		emake CC=$(tc-getCC) dwm
-	else
-		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/dwm-session2 dwm
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/dwm.desktop
-
-	dodoc README
-
-	save_config config.h
-}