diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0f24b5d9dc58..59b9fd370524 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 7322a7f45c62..2f0bd3a1b478 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/fingerprint/Manifest b/acct-group/fingerprint/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/fingerprint/fingerprint-0.ebuild b/acct-group/fingerprint/fingerprint-0.ebuild
new file mode 100644
index 000000000000..0df6a20dbd2b
--- /dev/null
+++ b/acct-group/fingerprint/fingerprint-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=243
diff --git a/app-cdr/cdcover/metadata.xml b/acct-group/fingerprint/metadata.xml
similarity index 56%
rename from app-cdr/cdcover/metadata.xml
rename to acct-group/fingerprint/metadata.xml
index 88453e2e2dde..6f49eba8f496 100644
--- a/app-cdr/cdcover/metadata.xml
+++ b/acct-group/fingerprint/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cdcover</remote-id>
-	</upstream>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1c8b20e0e510..74a2d02ad7b8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conkyforecast/Manifest b/app-admin/conkyforecast/Manifest
deleted file mode 100644
index eac8e823e02f..000000000000
--- a/app-admin/conkyforecast/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST conkyforecast_2.24.tar.gz 11347231 BLAKE2B 76d77229044375e7852823b92ac60cfafd190731e823a6e0d639ece16ef0dc94b7e182b4c6735529fc1f3145baa52c25412436acfb67ea69398a873aee81b14d SHA512 dcff08915c00915f6be4cd25824e3d8de978ed15ffb6776f002d585d95856f5e0827632371dd4d37016e07d58542e2bc95a7a859ebdc8ab9d1200ac04d4364e0
diff --git a/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
deleted file mode 100644
index 2a1f73e2ee42..000000000000
--- a/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# upstream broke setup.py to install into /usr/share...
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Conky weather forecast script with support for language files"
-HOMEPAGE="https://launchpad.net/~conky-companions"
-SRC_URI="https://launchpad.net/~conky-companions/+archive/ppa/+files/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/conky"
-
-S=${WORKDIR}/src
-
-python_prepare_all() {
-	sed -i -e "s:pythoncmd=.*$:pythoncmd=${EPYTHON}:" conkyForecast* || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_optimize "${ED%/}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	elog "You have to define a partner id and registration code for "
-	elog "the weather.com xoap. You need to copy the template from"
-	elog "/usr/share/conkyforecast/conkyForecast.config into you account"
-	elog "as ~/.conkyForecast.config and edit the respective fields."
-	elog
-	elog "More details can be found in the README file."
-}
diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
deleted file mode 100644
index 3d71692a6bbd..000000000000
--- a/app-admin/conkyforecast/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="launchpad">~conky-companions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 8cac2791db1f..2be98ec9c85c 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,3 +1,6 @@
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod 133 BLAKE2B 4140d5578e9738f5f0edff83413628bcf7506e8844873be8427ab9203cb9f76ee5074cd9586fbdf6195927a74bf476c1ac622f2d9e65c884e77a727979bd6791 SHA512 192ccd509f32ea420df41a82089c720228423e16e4bcba0d667f73d92c246086c0a354643bb85f68435b5231f91b7c3364b2eda0a865196f0d991b0ec3c8b5b7
+DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip 50964 BLAKE2B ec82c1c2cc70f7de63f8b3c83fcaf85c5f4f07b166fecb520e48ad4ef0aab865193311b2f6af650e840c0019d5915e7f7361931fcb569ba8873f5f6daeeda353 SHA512 22f86d62c7a6325a294db906d3733d0904e769e9a837d12821f856842b1adac58882d6a2141c972bb804bb1829b97deb7f93427dd460dbb2d137714f854b6475
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
@@ -10,8 +13,19 @@ DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip 7610 BLAKE2B 98f86c3092146db7614ab394d67f720bc3a8852576c0ede1f7ff053df2222d8811274d0ba981efa7dc2c8fc3350c360f21ed45f429ecbcfd2a2da8663a209079 SHA512 5df11a2def2b93ec0465fffaeee22cf12802fd63574dccf977a6153aaddbe95c2a3ce20388fa3c3dba0b41d0cafbfa827ab9e6c311cfeb491e5b09aa907cb6cb
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip 21256 BLAKE2B 7b97d839138a150071d5c23287761f25dc778ce0be309e740dcc2e80902b15575647295c0b82de0737c5de96a04847c078caac89519ceaeb763ebfb8861946f3 SHA512 cb924d643de6a8f38fdb1b8b512ca17e7df4bd93f397280e89a659f90d4ca937cc33a98bea851371275b6ffaa83220e275fa36a9095631d2784b16f4515d0366
+DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod 135 BLAKE2B 972a300b4bfdb286beb205187939882ea19895d492a2deee1529d8aeb390e6825c09fabb4d40f5ba12eecbba80d4663eb8a37c88a4c7fbb7d064f29ca6f52ed3 SHA512 b3b127f9b95a0b40135dd5891ccd0a07de9fcdb010ea8566619fea1096353258e65c6a0aef50e3cd9d199635aca014de1e2e396dcda14b38b9cdb1f8f5930876
+DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip 10979 BLAKE2B 665bc1735901a3bbd3f86ca39d92ebaa9e06ed0a92fe944b402964aa8ad424b8d9fad8ae5578baad06ac6203b80b92abba260eeb19d372618feb7e91bb6c7cdb SHA512 7f1c646db51cc038a0f9ec285f3898d29255eefe0b4fdf33996a604599803b37f81f5c989e3bfd50d34485d95706777112b955bbbdb3c489bdbe12c0757bbbf7
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 5802 BLAKE2B 7e7b32a77adacd47318e42255dbbb59c85b38dbd3f80adf2795ed3b2d01ed714e8c6f1139b91c6ce19066414acd53eed14762806f28b6978bddb918fe756414b SHA512 4021b26f08a3fb25b71a3191445c9be56424f3f118f5a4839ee8957a9cabeeb33f8d5e4735ffdbccc20b84b45e4a61d3da9c2ecb6cceef6638901143bb6ea339
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 5024 BLAKE2B debe8a3f8f81708baa936e0b9c2acca92d41e718efd59a605a5352d8eea7918211c89dce1a093755bd6b051e78eaff1036c86ad48c7700d1e332c4b83a8a44f1 SHA512 05859e1e715542b64c7d63789b447f971f7cceb6fd01bd78e661891acdd94da873ae6d3f612748fefaf9507d374b62526fcfe7db5655cc297c07208bc9f22bc2
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip 246908 BLAKE2B 94b71d3c77553dca4889c6f066f6741fa9d17a0ea86b564e3e8ff05b015b87c18fd3fcbe2b3d942a8569c99ef4bdf42c686bd58485e9373447d25724ceb934ca SHA512 47991999bacf78ddfd33a4af3c0d5b8a418cb7664e05bc59d886150025a1d5aad831deacbd6da76d5a21a97ed115d4210c374459e7af8ed7b93c4c1c0e7a42fa
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
@@ -22,10 +36,15 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.zip 2093 BLAKE2B a9962cf11c8ddb52f5627865a8f4cd19d283ffe70b0113ebcdcbf21ae6bca97be280b3f10393148ab3c78dc6e360c9a6ebfaa52a8506efce2b0b44697800d132 SHA512 73b1bebd953c1a196e4577d703eac245c82985fd30b9b87bba568e05b156f1b1ec97c5d4c30a18aa07fa9d41c8c2c24ffbb61dabd94645fcd28193326b60aa63
+DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
+DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.zip 2957 BLAKE2B a0c29f8a47edebae63c9276f9e7f6420a865eaa82c6ad57c43312b974163ceb251b293eb37e03b50cee9b26bb72764cab1d1d1b2842a60b38f6f84455eb6a7b1 SHA512 f24d07d37bc5e59ef29b687ebdd9401f5f72ea049388cc808f62555873914e79cebcc88ce48265b4ec3945c5d5529abdca56a0581106fc5fc06514ff6f00f11c
 DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.mod 176 BLAKE2B 3c435505d80ca197dbb90ae2b806b2ab89d7f29dd012d454f30a8d4e1aeacc1f7fec04d18f3e5654abf6a635659dce5b2d9e606e428556afec94b2dfc8ea26d9 SHA512 a6cef71bb9131591837ea3bb0f8e46c56cde469a2c0f062481f036c00ce49b13d60b208c6c6c1cc4ab124305b1f62c26baa0336167a40e0a56a0543843cf9600
 DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.zip 46226 BLAKE2B 99ac5c2c5c69f77df602fbf62231f935434325e14b41338842fa487b8f564c115b70d4e2f553d16eee4438c4c35c40842fc54171840433890f1d681dcff84f0f SHA512 52c76c3cd9f1f0853c239bbdf8b372923da79cf92277b811adcc41014c27614385de8d10d2fd55cbf30e23f3d8a0e0a791395ee27efe693bdaea50b27360bece
 DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.mod 40 BLAKE2B 2f3acd29af54ff6db117efcbd44997cfeed321dd21c1e4765921b4189f3eff653c585a2d289d0bcf367241826985367a30d33ead7dda1055fb927a2740128f1a SHA512 1f6bcb6beb3bafb41a251b0ecf912e0151d79ad1bcc70ece5a79667df7165f149ba6d57b2317ae8008fde4df098fe265d2601721d12805e50806cc7b7880e7dd
 DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.zip 47173 BLAKE2B 3fda57610df0d4910bcbbbafe474c3135a83cacbcc2153289284242c3d11348dbea7075a8c88baf4f3a1bede52e5dd16f758326a7d2932c23af0fe67d59336d9 SHA512 09ecb725872e3195dd3ccf7568daa162d34bad4ec19cd65535a360f5b3222a07b1ed223708f6efd38dc930b4a43469a09c3914b803fd0dcb131becca58ff6fe5
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
@@ -36,22 +55,37 @@ DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
 DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
 DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip 13502 BLAKE2B 8423a01877ac7ebe40452e5e84551dc9e00a818051d5bcd5d0daa84a55939caaf2ecc130749d4664af62845820e429b8313559c6a78d79f83ad3728d17d9669d SHA512 893ecce9d3eff9ad6e845778a5499a5fa1c723afdcc4be16b323773cff61fe216624b1aeae62ef8c731edb68cfcc099a81297b261451496fe133156c6df133cd
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip 205991 BLAKE2B 75d746f36cc90088b863fa6c00c6ea30f071c5704593de0fe37b810c530170f6062c35460717a52170f7caa7e6c015ce2357384147fe4a12a9d695add2915394 SHA512 4542c6a57361c255ab89d2330c1af61cd706edf82c02bc48854e6f4407911a1657151ecc286b774e25be93bef29d63d2f031a99e24ecdb212030bcb1dbf7b17d
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip 125740 BLAKE2B 53846b62364384c96a4a1038e7c04213e5623fc97365708174ba705781fa07760fe7726615901bc18a2fa099e90b7e4a5f9023daa5c5a3db8c421360a730e97e SHA512 6ad2ac900d1a8812eb6dd037a2ad5342ef74a339eeb490f23acc207819b8ba9e0c53185364908dfb65e57510146084c7e35e75de0a9fa4bf0898112f8ca8f551
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip 126991 BLAKE2B df3a677c6b6838cab5de9c42768cc05193561ce6a5d38c1d090b31d79e9e7a31ba4b256bce05c29436e3fc10e5eb8f7157d6ff35d93562e8259a28b8678bbbde SHA512 9dec7c9cf1317ebd2e4dae9fb3dffe62a077473e2969b7c70b97c332a3e9d713d2047ea929ea01253fc7e2636fcb3851b6cc0cbe1ae16db26ae0ff99bc96d8ba
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
@@ -60,8 +94,20 @@ DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod 38 BLAKE2B 66807be55b6dea3229c9f7e7c69d5a8d2a32c3d3aceb2d1755ac55853de062aba2285a5bd09e1862ecf2e5931fca7ae34e0fdbe95a8ea4631081218326845ed2 SHA512 efb9c8a70c060e6ca149d62c78b62d389bdcfa46ff8f3a77ae0ba98f3e49799ea42d9c25f04546e2460251be6fcf6b31a6b219da6861666ac7e90da66362cba3
 DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip 9214 BLAKE2B ae1104a8066eb6c9c0548ec568845605beace57d4c04059e5701563cac1f4e7596310a5328a9e436c517dd8bd331120fd7bf08d77f81af6df9ec3f023c3e0812 SHA512 f7208bef5d4b97498b847d6436ba675109aea6b961188529a51060ee7f26dd71f524fef6ce89eb298d68f22edd2671ab7c448238bdc8ed23f18ab832cfc3c729
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip 364501 BLAKE2B c1ee7b5fc9b4e08d49fecb7dc017293e83d535e25ee098b3336dc5e6be4ebfe475cf6231a78d5a8135d79f5a5feac44a658b24f78b1cf27a1cc8ea5846c6fde8 SHA512 8f63bfa6ae4f589b512e1126600d53a121e932944e25e1b8cf315214304b473c86b1f9d5cbaebe9c112ac397b9a88a217a04204eb12368910e3ba1ceeb823da6
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip 377696 BLAKE2B e61d2572e080ddf8195c86101ba7995c38c124b4eaa918edc9b082448ea0f1ca44b6fca9788277aad332f7786577f6fe52e6c9d4b702c6773a7cecac7ef9f2c4 SHA512 4e191b6dce1ec399df8ed24ec2fd6756f2ec048741005256f076af6b127d43753f3ca0cda89c4f50bd0555b8a830d4994ddfe7cbf00d6e3fef905fbc782667a8
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
@@ -77,6 +123,8 @@ DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d6
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
@@ -87,46 +135,107 @@ DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
+DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod 518 BLAKE2B cab9e78c6c835ffe72bb26db0b47da1b364d93c1bc450ceef0d25fc7ba39e1cc5330d6e38dc955c0237e04c781e968569697ebe81867030407b7bc6efaab5e96 SHA512 d0e4dcf05a6ef0bae5c79290669ed2bb6d5ba6d1a2f99b03fd95f966197ba013da352f35a62348f315793f77d6ae1a23e5de7c2f69f6bacef4ac516aca8dfae8
+DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.zip 388879 BLAKE2B 97d2cdf5100314a456fd292e040e9d4071bbf3f64794dfc27b2cb0d5dff1360575f78dc459e098a71665fff1d3809c0e841bf99b0fe50f5dd4f68c9d52b35552 SHA512 e07e47f7f3cfb442ba28bef49030622c4393a11e9f848ed527e9d07378aeca3669560523e871c503fa5465341a5c80688e60b9206cc2874254897f2cf320a6f0
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod 43 BLAKE2B b6996dd7e1e75268f4018828d23802d360e28d700e6be0c0fecc9a17fd4ba79e00e81aff04166b461295b95f7225f12a1fc22bc5462ffe6a0f7eeb35e58aee5c SHA512 eb0cee04d26b4a0acf1b45504ab73931c10f98ebd41a6d96788aad477178f8172da402757c1fb8853ac513fff0aadbe3a9a4f74134c88cf9e26928896af55785
 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip 11977 BLAKE2B 885bab4a5c6632cb919fadde65d0c7257c15030e8c12e545705fdafa498a55a941154fb39d572e623db85a5672e85edd473d3411d24e5dbe64b4836d169da62d SHA512 046a755112a19a9fc80e25e5031185394d25da265b67a07fcc0eb3091168f47ed14c8c502b9ffd35d93d60056a6e2dc0d540e8149ddf402a5cc20d57776e312d
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 6840 BLAKE2B fd31c7c067d62fa45add54abba9b29b205bd525e389b37eaced2f3c99ecd1a748a9a248e32c44820d4003cec7b598b3786163af26a6142ec789b246a6025c979 SHA512 3351800fe88326135f6f9b401d8d6ee9ceb83a5a30865d103dba4d22198a48751e79d9b5a8a964705107049924ab9bef128186a5796b6cde33d89a3a921f6b9d
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 27732 BLAKE2B e81d64b0ad8f66484eef94d0b8aa352e9923aa3122ece6736536720e03416e05aee4f6d0e0445edc2f1918e0e67330df4e12796af81984c546b04c20b4ce5250 SHA512 4ed6c37c3f6341a596770a186bdca2255456bbbc646231e007dbde73a56eee253a9d00a6b2673eba421193e8a4ba7d8b8bcaf8057bdeb110ac6b56ed0e35b8b6
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod 112 BLAKE2B 50b4b6b4d07888fd6bbcc3d88b7f4b542bf2f3c61733319c918104f9f3a8cbbd9c8c2b724751ea2ee4bb09369dee4cf22dca0cd334733826ac882f270300f944 SHA512 bf10719acba9ec2fab1e504fc2a02f542b347cdc4b891237fb9cac81f5aa72882adc25bef2a4a9d43dc33c5d2dfe8f0398c698e65ba74352a8b498b7445e3aa6
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip 11581 BLAKE2B 6faf8c5d4368c6456db989791fa327e341a791b601e6a561ef3081ffababa7dd0a97190c1e96888f41b1d6af8b9231db09434adad8471737d54b25f515260e7f SHA512 3bf633884ff896d94b70815ad990806ebcb89ab69e297bb3f07b8b186697216053b886eb2029df3769910df7be6f7c99b590606b0a02e5fa46aa5e68281cefb1
 DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.mod 112 BLAKE2B 1dc44bd5ccdd4e327130d587d3c79204209dcdd52210365bb473cc35cb765b52ae7dcd4500539f97e53516789994613d4d20528a4e8fd43c80accb7d66983ffa SHA512 2eeb6ee54be862261bbce1fef101e855631d7dfc6933c710721a4b04fe189149ddc3b19c32c2e8f5ed1e94c11514556c06d8c7661a1d3b6d0982e986947453da
 DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.zip 9869 BLAKE2B da2716aad7472147c432a5979bc5254474a7cd4961edb5f4643c96bcf9e19d35d6e7d47b62b61ec510594a5c93cca3e5b69c6f08d2f1f8b1666cd391de074797 SHA512 29fa8b4914ed77a6bd35b8c3b786a1f3e4773cda67621bbb5b0c31658defe5f8e77eeecb5e976a94dcbc709e03cef643db036c4888b9ab50e98876b8b0b56c65
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip 881205 BLAKE2B 29945db060d9c8d855f4ec068e1730050de56c0c446e1fa3996c3fc8d1e6d60562f8b29835e572e1db83e761f325cc1a29b1c1aac92528e832c398ad12522c7d SHA512 9995dc61d55f1235e5e7a0a232a0b7b7f34faaf983f21a64f9fc97f455b21326a8d04c3514a3f0e6b8e10a393fea5fc31dc9b3797f41bca07016a893d2e1bd40
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
 DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod 39 BLAKE2B 1fe1086bdd2304d771c53f56cb46df742a3e49d6bcd3dfb6f10fd81cd70ff372a34ac31088ef79e51a211068ee248437f5e6dfe4edd739a5719f783fed79b478 SHA512 3e1d6747fa7a97d9ee969060130b0e5bdcf162274f9c5faf66f1974cb7d34e59f569bfe1a2339a71047cc86db2422ce486aaf5d7d47feb61f89b5e6e429c8075
 DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip 636486 BLAKE2B 08c35fef4d5561ffa1bc3de75524f50fe1c791559b162aaff74cd6c7a0667ef2c5b8f53cc39a1cd7a3faec4c3137412b2f3b27d94af7b72d7f25fcf9ca32190e SHA512 99a05815aaceedf4eacb645b5180d6591a696d2b51f04d8848c0b3d03a10975a166d1492ee3611aea595f6588e4c48fbcf8de097ef0bad40b2e281c5312093c8
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod 301 BLAKE2B 8898fe7003c9143aa51d94430241d950aa22446ba5b7fd087844593db1c99701dcbc9cb2dde3356d22867e72c654bb3e0b30ff2d9c376cb3ef434f70e788ea97 SHA512 7c1f73f33624409363131d5765917cdc40a8666c1d462d72a7206ce4cca74c9fe61738df4f4a48265a9d89faa0b04c3aa49b0e87d8a37ac4f53310fd04913bd9
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.mod 34 BLAKE2B fce952a243794343a8e85170c6ab3cc518a9080ea83d12effdeac8e42af930ebf247bd2b3ad5a234be26808eaacc3e5d38b913f9a36231fd1bd585c7816c8e08 SHA512 6e445bd52c07c412bbaf8770168707b5e01d8327b305df406a8fd72feb26502bec6c8ca0199f601a1c102f06882b8dc23f53a09ed265eaffc7a2ca76cf27049c
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.zip 46526 BLAKE2B 5b071b1f25998c6475082ae4609b6e88a44627468ce99c8ce5260f471a722caa977e20d385fdeaf7367aca848b48dc90aae4017c243c4540c7f35b6a96334acc SHA512 c66ecc4b694cebaa36a172550348e086eb161df7625230b2b50342f39760d47d595aab202f0ad700be1c3748a8f42919c189b66496f9c9ed3dd6fcb1013b0e03
+DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce
+DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip 120718 BLAKE2B 4caa06b2d4c8c61d2688000ea73b7203e52a9f4318d4ce03be8c524389b719870db5fe61ef431131372d1ae1752d5f14b20f4c62faef5ccc630f92f66e746790 SHA512 60eb1355065dfa54084b5c59b88c98f872a94c75541cff15cdaec5cec915f280156d398823abf578853cb54360c3f20e98c090f6e109d1a94f018e88bf7d139b
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47efe3fc06e2b99b939997554e58fc2548310656f990cc44dc1787d061a4bcfdf6010a20bd9d469c6b66dbf16dabc205357f28cd46322a2442a1c3c093 SHA512 087961c76752484ae4be8d7f0b79538638428e35ec47db185f57a6ec07e3b60d55873ee0801919b169acd5a1e36c5150613e528fc051910eafa362830791fda4
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip 1589821 BLAKE2B ff92776e0df9cba4f2f1f3eede7264ed5c3fda1b7c5d1550d9500fad32f2e2a8ad860d3e8f84a369f84d4a7cf8a4b3756db63afe561e169f9c2c409e1fc62b99 SHA512 b4d6e66ba2b9362aa265bdf405beeeb55b31c72d2df59c4faaa6231f0796c4893db5b5acd45ebde4c1cb7e35b1886fa82adb53a0b2b54d52cdf607ebda5ed7d0
+DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
+DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.zip 1827540 BLAKE2B 0858b3c62e1a18ce64d7612cb716c0754678a9aee956af8fb51fd654f57d532bf5a0a5f4dd28cebcbceb9ffe7ee620a6d0b1a7744f65603069c02f6224d736c6 SHA512 f1469fbdaa90a0d341bc53bf77cb928d2bc80cb41267ec453aedff7d3f56a7b7597019a420b93fc86617ee0b9be584f31f7d4d2ddd66afbf051a9031c5f13c55
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip 1500505 BLAKE2B aed582fa92d06c76e5c250a9eaf7645b4147d384422e263ecff6136b660dd2af8a40cdf539b9966059e754301afed01b3fcf59d2680ed88bc438d6297a44d7b3 SHA512 7cfa0dc01fa55ff83d10087ddc6358e2e7021d1a8a27393f5778607cf3dfe0c31363676e1663ab4ee485273e580d6f92a486ea62d5944892104f13cac5080b82
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -134,25 +243,70 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip 1471954 BLAKE2B 0ed87e29adaaf2e15dfa803fef857f82f73f5e45864a2d52a21e94a1436fd22773b5921c229472ccdb1e715c081f4865feffe618ddbf258a1ebdac5636386b84 SHA512 bf736828279ead6fabd59a1608870ed72ea610e32effb1c65015c925d214e81712f636ae60e39636dc7820e88a4e6a728f18b3f08b517d9c5877cb08f85bfa60
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.zip 1484367 BLAKE2B a512590e02d5d2282e07b9385bb15d1285d529f0ade14159e6b2ff6b0a8e7a2ab01d2acc1a3b7308e4e937162a04b25a7efbddaeb3ac2449d574a4cb7f60d75e SHA512 46daf2fbf8c5d70abc5d6f4044865999004208adfb15f7db924d603980ccac5f87dd4264628dd65087837eec6c34c57528ad5376e019545523af4260f1c3b792
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST gopass-1.10.1.tar.gz 475921 BLAKE2B 5f62c099c36b0222ba0764a0b8290522201373b80141c8f5b90c17c979269d99d756a72aa04525d31641dab247b4e5a8ae6fe4f94e3c0489d27389c0d48a7060 SHA512 9bbaefe8642cd1eea94c5b4d582835c636ad511ab4e315997f5f2b0b74d9d0f3cd430182f84ce2cc36080f14b8cbf03c71a8f4a84f6365a6cdd5e6aaac90f7fc
 DIST gopass-1.9.2.tar.gz 420384 BLAKE2B ca8190fa65a74dccdb645741dfff0b9e30572bced4f8c6438e6bd23d97ed9d567b698bcceaece52a6cbbd4a9d9ef5051b24435d3933eb08498370faf7f39f227 SHA512 90be234718c4c26ee6e92565ce609d5f075d5e574827e15ff57a6d9e71f1933add7d76aa26b39602d5a72485890bfe8e158dc89213098377899d0f721aacf1d7
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip 48918 BLAKE2B aca803aaefb327d186b7f703ca85ce70caabd200938d8fdaae4a0c8fb41e73adc0a3a9fafc15483a2e6f13d5854a79a2753b8a67a3e33b39a351016856297bd4 SHA512 653c33136dadca777b3c9863cf7fd3f71d6fd51346cd1b812f30c901298728aeeceb03b48a87becca5eb3e980ca2b26ca374cb713d92d017e4d8e8873f3a6c98
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip 64742 BLAKE2B 55c7f791bb3ba2d1af24dd0791ae53153550b4c53aeb446dc1b549cf366409738957e41798eb879beff02b5748e670a75f1e7eac31eb8a7ac0ae047cd4e9e598 SHA512 46f6bbb5f44ab422ecd68254f559b1eb07c9bcaaa6bc08c966cf6aacfba8f8dfcfc6ba6cb928d16fa112d97600c56ebe78832fa234f4a4c19b96abd579faa61a
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
diff --git a/app-admin/gopass/gopass-1.10.1.ebuild b/app-admin/gopass/gopass-1.10.1.ebuild
new file mode 100644
index 000000000000..934fd1f58cad
--- /dev/null
+++ b/app-admin/gopass/gopass-1.10.1.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module bash-completion-r1
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"filippo.io/age v1.0.0-beta4"
+	"filippo.io/age v1.0.0-beta4/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c"
+	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c/go.mod"
+	"github.com/atotto/clipboard v0.1.2"
+	"github.com/atotto/clipboard v0.1.2/go.mod"
+	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
+	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
+	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
+	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dominikschulz/github-releases v0.0.3"
+	"github.com/dominikschulz/github-releases v0.0.3/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
+	"github.com/gokyle/twofactor v1.0.1"
+	"github.com/gokyle/twofactor v1.0.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.5.0"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/klauspost/cpuid v1.2.3"
+	"github.com/klauspost/cpuid v1.2.3/go.mod"
+	"github.com/klauspost/cpuid v1.3.1"
+	"github.com/klauspost/cpuid v1.3.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.7"
+	"github.com/mattn/go-colorable v0.1.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/minio/md5-simd v1.1.0"
+	"github.com/minio/md5-simd v1.1.0/go.mod"
+	"github.com/minio/minio-go/v6 v6.0.57"
+	"github.com/minio/minio-go/v6 v6.0.57/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v1.0.0"
+	"github.com/mitchellh/go-ps v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/muesli/crunchy v0.4.0"
+	"github.com/muesli/crunchy v0.4.0/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.5.0/go.mod"
+	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
+	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v1.0.0"
+	"github.com/smartystreets/assertions v1.0.0/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/urfave/cli/v2 v2.2.0"
+	"github.com/urfave/cli/v2 v2.2.0/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
+	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b"
+	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9"
+	"golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.25.0"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/ini.v1 v1.57.0"
+	"gopkg.in/ini.v1 v1.57.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"rsc.io/qr v0.2.0"
+	"rsc.io/qr v0.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.11"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+src_install() {
+	dobin gopass
+
+	einstalldocs
+
+	# install fish completion
+	./gopass completion fish > "${T}"/${PN}.fish || die
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/${PN}.fish
+
+	# install bash completion
+	./gopass completion bash > "${T}"/${PN} || die
+	dobashcomp "${T}"/${PN}
+
+	# install zsh completion
+	./gopass completion zsh > "${T}"/${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins "${T}"/${PN}.zsh _${PN}
+}
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 6996734fed31..b0bddc0a7605 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -227,6 +227,7 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.zip 151304 BLAKE2B 4641e10e54dc01533f56c100dff3cd2040c5e8f2f0799c57677302ab606513baca4648388c864c0ce6769b7774d7326534d2638b97cc045514b0f057966e3b37 SHA512 488bcd931431778593f50e78cd421149590f317f953b7bbe61205c2af9e8a1e41c4c56780895b6d4fcd30936461a6fce2876f9a88d5da9da528950fa2900fdac
 DIST kubectx-0.9.0.tar.gz 510570 BLAKE2B c8126686c10755d69132f3dfaeae39ea115210426f552116305a1c97d98207de7ee81829ef4e5b04fc20ad07750103fc48abf2182a489832fcfec6357d596e51 SHA512 ac9b5258c23d07ee1ab1d3017645bb0588c7da8537c63b330b01039fb86164af41d2e37adb1e0619acf49e4265ee1ad4ed1d4a59e7ec878f78aa75e6da0dd829
+DIST kubectx-0.9.1.tar.gz 512901 BLAKE2B b6d79d5cc7a1a4b55e76f9402d97629bf5ca5e97ab8c42d492640108019e8cc7011cb27422e327e6abbed9a59f684c634378871d7c7145618280a0588bc228ec SHA512 f9872bb2a0a354d6e4b07715dea434482fb61f34914354d0d458e723d87b41e09eb94fb302185631700aad09a29268e00925016fa1b2d4c80f30402f35b6e6e4
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip 113591 BLAKE2B 48dc385dfb491334ddc6da2544979d139421be19fe2398ac9ca9fd9488f820da66fe9c22dd8fb7f1995b431bd17d963aaa304937e605c667c63361150feea5ed SHA512 9d61710361110d7739e705b05320a3cef7c7caf6cee358c01e695e66eaf8c5bd144fecf34142f24065c3a87eeef51fd75bcb24644f4e082fbdbca81e211d497e
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
diff --git a/app-admin/kubectx/kubectx-0.9.1.ebuild b/app-admin/kubectx/kubectx-0.9.1.ebuild
new file mode 100644
index 000000000000..5352eb60489a
--- /dev/null
+++ b/app-admin/kubectx/kubectx-0.9.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
+HOMEPAGE="https://github.com/ahmetb/kubectx"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb"
+	"facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.9"
+	"github.com/imdario/mergo v0.3.9/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.8"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1"
+	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"k8s.io/api v0.17.0"
+	"k8s.io/api v0.17.0/go.mod"
+	"k8s.io/apimachinery v0.17.0"
+	"k8s.io/apimachinery v0.17.0/go.mod"
+	"k8s.io/client-go v0.17.0"
+	"k8s.io/client-go v0.17.0/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+	"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66"
+	"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	GOBIN="${S}"/bin \
+		go install ./cmd/kube{ctx,ns} || die
+}
+
+src_install() {
+	dobin bin/*
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/kubectx.zsh _kubectx
+	newins completion/kubens.zsh _kubens
+
+	newbashcomp completion/kubectx.bash kubectx
+	newbashcomp completion/kubens.bash kubens
+}
diff --git a/app-admin/kubectx/metadata.xml b/app-admin/kubectx/metadata.xml
index 9e9987aa33a7..78e33a95ed5e 100644
--- a/app-admin/kubectx/metadata.xml
+++ b/app-admin/kubectx/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->	
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ahmetb/kubectx</remote-id>
 	</upstream>
diff --git a/app-admin/sudo/sudo-1.9.2.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild
index 5a282e6e5c44..6fd939eff467 100644
--- a/app-admin/sudo/sudo-1.9.2.ebuild
+++ b/app-admin/sudo/sudo-1.9.2.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ffa3b6a733d3..f74088205841 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest
deleted file mode 100644
index 694f2edf5fa1..000000000000
--- a/app-arch/cfv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cfv-1.18.3.tar.gz 68030 BLAKE2B 72372ebf7fa2d72a68b20cc0bf82823e973de5e8acacdcded85f50ad0e2f3e867c6924828b0a4ee42663e623d0d6d2e55b3f4b94addd83a703e4502edb1dda35 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71
diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild
deleted file mode 100644
index 3fdafa44a202..000000000000
--- a/app-arch/cfv/cfv-1.18.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Utility to test and create .sfv, .csv, .crc and md5sum files"
-HOMEPAGE="http://cfv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bittorrent"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/python-fchksum[${PYTHON_MULTI_USEDEP}]
-		bittorrent? ( net-p2p/bittornado[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	python_fix_shebang cfv
-	dobin cfv
-	doman cfv.1
-	dodoc README Changelog
-}
diff --git a/app-arch/cfv/metadata.xml b/app-arch/cfv/metadata.xml
deleted file mode 100644
index f4989687fc0b..000000000000
--- a/app-arch/cfv/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		cfv is a utility to both test and create .sfv, .csv, .crc,
-		.md5(sfv-like), md5sum, bsd md5, sha1sum, and .torrent files. These
-		files are commonly used to ensure the correct retrieval or storage of
-		data.
-	</longdescription>
-	<use>
-		<flag name="bittorrent">Enable support for checking .torrent files</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">cfv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
index d34b15292598..234310a6e243 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 6836be8bc80e..35615829539b 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cdcover/Manifest b/app-cdr/cdcover/Manifest
deleted file mode 100644
index 975aec157997..000000000000
--- a/app-cdr/cdcover/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cdcover-0.7.4.tar.gz 908267 BLAKE2B dc048bf756e8e9a55f477462a81975ace669c2ecd8d062b5880dce60b286f98d5a5b573704ef4323093e92d3802dc9087114b333462bd5d0979720b207b7d7fd SHA512 5da176559595608ac6565d23a390364b0fff332084206e819f91d22baee86a752677424fdf90e6a6ecf85fa30eab00edc89fb419f3ae82e0fcce0e714dbb1985
diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
deleted file mode 100644
index 156c79a1be0a..000000000000
--- a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=tk
-
-inherit eutils python-single-r1
-
-DESCRIPTION="cdcover allows the creation of inlay-sheets for jewel cd-cases"
-HOMEPAGE="http://cdcover.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb"
-
-RDEPEND="${PYTHON_DEPS}
-	cddb? (
-		$(python_gen_cond_dep 'dev-python/cddb-py[${PYTHON_MULTI_USEDEP}]')
-	)
-	media-sound/cd-discid"
-DEPEND=""
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
-}
-
-src_compile() {
-	emake prefix="${D}"/usr target=/usr
-}
-
-src_install() {
-	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install
-
-	python_fix_shebang "${D}"
-
-	make_desktop_entry ${PN} ${PN}
-
-	dodoc doc/cdcover.pdf
-}
diff --git a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
deleted file mode 100644
index c1026bf23503..000000000000
--- a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -9,8 +9,8 @@
- IMAGES=./share/images
- TEMPLATES=./share/templates
- 
--DOCFILES=BUGS COPYING INSTALL README VERSION
--IMAGEFILES=autonum.gif cddb.gif exit.gif gv.gif logo.gif nocddb.gif ps.gif
-+DOCFILES=README VERSION
-+IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
- TEMPLATEFILES=CD-Classic.pst CD-Modern.pst CD-Tracktime.pst CD-TwoColumns.pst DVD-Classic.pst
- 
- INSTALL=install -D
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
new file mode 100644
index 000000000000..00b1082b508b
--- /dev/null
+++ b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT="8f47670dd582c96ad1b6dd3c9b9da0acebded5d8"
+
+DESCRIPTION="A tool to dump and debug bootable CD-like images"
+HOMEPAGE="https://github.com/rhboot/dumpet"
+SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+#Restrict tests since required test file is unavailable
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/valgrind )"
+
+PATCHES=( "${FILESDIR}"/musl-byteswap-fix.patch )
+
+src_prepare() {
+	sed -i Makefile \
+		-e "s/^install : all$/install :/" \
+		-e "s/^CFLAGS:=/CFLAGS?=/" \
+		-e "s/^CC:=/CC?=/" \
+		-e '/^LFLAGS/ s/$/$(LDFLAGS)/' \
+		|| die
+	default
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" dumpet
+}
+
+pkg_setup() {
+	tc-export CC
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a0f7d8e69ae5..26509fb4ebc7 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2eaa97cae3da..4adaaa9f9213 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,2 +1,3 @@
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
 DIST gnupg-2.2.21.tar.bz2 6813160 BLAKE2B b4708fd34c23dec8ec5be0740a502d155b649b4c88a89e5cc6f3cb99a15f7c6e31c50247ccacfedad55600dac3e7f91a8567424d335ab5e537082261dc98aceb SHA512 b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9
+DIST gnupg-2.2.22.tar.bz2 7098444 BLAKE2B b5f306485032acadc852f4f71f2e968795843faacd5dda24ed2b20df78a3d38a364c2feade7ef8389a203e8b037fbb92129207cbc6d60b89cfb0945dded56a97 SHA512 3e5a8bb91c122f97acee2a93e3233db89bff9b96c6ec052c95bd2fe7e46c79a8afaac536c05675a7129e332272d62c677722a12cb05386b54a8d12ef82b6c5fa
diff --git a/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild
index ec52f6640695..248abe46da5e 100644
--- a/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild
@@ -17,8 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
+DEPEND=">=dev-libs/libassuan-2.5.0
 	>=dev-libs/libgcrypt-1.7.3
 	>=dev-libs/libgpg-error-1.28
 	>=dev-libs/libksba-1.3.4
diff --git a/app-crypt/gnupg/gnupg-2.2.21.ebuild b/app-crypt/gnupg/gnupg-2.2.21.ebuild
index 69c3b392a833..e41bbd941513 100644
--- a/app-crypt/gnupg/gnupg-2.2.21.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.21.ebuild
@@ -17,8 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
+DEPEND=">=dev-libs/libassuan-2.5.0
 	>=dev-libs/libgcrypt-1.7.3
 	>=dev-libs/libgpg-error-1.28
 	>=dev-libs/libksba-1.3.4
diff --git a/app-crypt/gnupg/gnupg-2.2.22.ebuild b/app-crypt/gnupg/gnupg-2.2.22.ebuild
new file mode 100644
index 000000000000..71679032de61
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.22.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=()
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--with-mailprog=/usr/libexec/sendmail \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
+
+pkg_postinst() {
+	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
+	elog
+	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
+}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 15e17c6c389f..67e593d4c58c 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -9,10 +9,6 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
-	<longdescription>
-	GnuPG is a complete and free implementation of the OpenPGP standard as
-	defined by RFC4880.
-	</longdescription>
 	<use>
 		<flag name="smartcard">
 		Build scdaemon software. Enables usage of OpenPGP cards. For
diff --git a/app-crypt/gpgme/gpgme-1.14.0.ebuild b/app-crypt/gpgme/gpgme-1.14.0.ebuild
index d047e8f67c7d..328bdcd4cc22 100644
--- a/app-crypt/gpgme/gpgme-1.14.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5"
 
 RDEPEND=">=app-crypt/gnupg-2
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 5a230179747c..cee5ce41e8ef 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild
index 6123d911e434..b80d567832cf 100644
--- a/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 LOCALES=( de it ja pt ru )
 IUSE="${LOCALES[*]/#/l10n_}"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 751149feeed1..86c5fb9a9481 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a7e44ca48b3c..2814ce630eda 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,5 +1,4 @@
-DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
-DIST emacs-18.59-patches-12.tar.xz 22252 BLAKE2B 14cb456f83447b298b280e11920d486c8cbe824f329ed841ceaa3751e68123bc8c7eda1ed4e2070eaf479d0cf8f8319294ab9f2c31cacc7a9a822bab7a2c70d0 SHA512 24a259383b4fd303d267c9c1bce0e7c99ec8838a45b62ff16ea1f37879d240f000844cdd5e1de5ec6f87fee7cb42b23447dc6958e9fb4b2fc83e5f2d5c21a6b2
+DIST emacs-18.59-patches-13.tar.xz 33532 BLAKE2B 17682fb03c3606794743e702f8389a9476fe09a8c0cc970828aa515a5fc2b1d2df620cdc168d4727635492b38da81ab525c05e20cb77c86d5ae691976deb8d94 SHA512 912afbb4e42efb9e42df4e06c21bcf1d7e2f203d35edb2b410b80c9e25f2e4b37dbb28e6fa36691ce44c53da9f3eb57518da164ecca1599147072219244a8b35
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild
similarity index 93%
rename from app-editors/emacs/emacs-18.59-r12.ebuild
rename to app-editors/emacs/emacs-18.59-r13.ebuild
index 964b14b1384e..4f56535c58dd 100644
--- a/app-editors/emacs/emacs-18.59-r12.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild
@@ -8,23 +8,22 @@ inherit toolchain-funcs flag-o-matic multilib
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-12.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz"
 
 LICENSE="GPL-1+ GPL-2+ BSD HPND"
 SLOT="18"
 KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32 X"
+IUSE="abi_x86_x32 gui"
 
 RDEPEND="sys-libs/ncurses:0=
 	amd64? (
 		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
 		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
 	)
-	X? ( x11-libs/libX11 )"
+	gui? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
-	X? (
+	gui? (
 		x11-base/xorg-proto
 		x11-misc/xbitmaps
 	)"
@@ -35,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs
 RDEPEND="${RDEPEND}
 	app-eselect/eselect-emacs"
 
-PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
+PATCHES="../patch"
 
 src_prepare() {
 	default
@@ -62,7 +61,7 @@ src_configure() {
 		*) die "Architecture ${ARCH} not yet supported" ;;
 	esac
 	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+	use gui && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
 	sed -e "${cmd}" src/config.h-dist >src/config.h || die
 
 	cat <<-END >src/paths.h
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r19.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-23.4-r18.ebuild
rename to app-editors/emacs/emacs-23.4-r19.ebuild
index a84fad2f8d3a..a7ebc3b34702 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r19.ebuild
@@ -14,10 +14,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	kerberos? ( virtual/krb5 )
@@ -25,7 +24,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	games? ( acct-group/gamestat )
 	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -71,15 +70,13 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
@@ -144,7 +141,14 @@ src_configure() {
 		myconf+=" $(use_with sound)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
@@ -191,12 +195,6 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf+=" --with-x-toolkit=no"
 		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	# According to configure, this option is only used for GNU/Linux
@@ -313,7 +311,7 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r8.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-24.5-r7.ebuild
rename to app-editors/emacs/emacs-24.5-r8.ebuild
index e82a60ec1c26..19dd854cd077 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r8.ebuild
@@ -13,10 +13,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
@@ -30,7 +29,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	zlib? ( sys-libs/zlib )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -81,10 +80,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
 	virtual/pkgconfig
@@ -137,7 +136,14 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with gsettings)"
@@ -194,12 +200,6 @@ src_configure() {
 		fi
 		! use gtk && use gtk2 && ewarn \
 			"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	econf \
@@ -307,7 +307,7 @@ src_install() {
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r7.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-25.3-r6.ebuild
rename to app-editors/emacs/emacs-25.3-r7.ebuild
index c5fbd04048e8..d54d8a9d32f4 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r7.ebuild
@@ -13,10 +13,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	net-libs/liblockfile
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
@@ -30,7 +29,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	zlib? ( sys-libs/zlib )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -84,10 +83,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
 	virtual/pkgconfig
@@ -140,7 +139,14 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with gsettings)"
@@ -202,12 +208,6 @@ src_configure() {
 		fi
 		! use gtk && use gtk2 && ewarn \
 			"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	econf \
@@ -317,7 +317,7 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r2.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-26.3-r1.ebuild
rename to app-editors/emacs/emacs-26.3-r2.ebuild
index 334f327910fc..764b1ea0cc7c 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r2.ebuild
@@ -12,10 +12,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -32,7 +31,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -92,10 +91,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
 	virtual/pkgconfig
@@ -143,7 +142,14 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with gsettings)"
@@ -214,12 +220,6 @@ src_configure() {
 			use xwidgets && ewarn \
 				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	econf \
@@ -343,7 +343,7 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emacs/emacs-27.1.ebuild b/app-editors/emacs/emacs-27.1-r1.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-27.1.ebuild
rename to app-editors/emacs/emacs-27.1-r1.ebuild
index 9258d36369f9..b2548c76e2c3 100644
--- a/app-editors/emacs/emacs-27.1.ebuild
+++ b/app-editors/emacs/emacs-27.1-r1.ebuild
@@ -40,11 +40,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
 	sys-apps/texinfo
@@ -182,7 +181,14 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with gsettings)"
@@ -254,12 +260,6 @@ src_configure() {
 			use xwidgets && ewarn \
 				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	econf \
@@ -386,7 +386,7 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 78fc06dd7e03..bd826f2edf16 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -40,11 +40,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
 	sys-apps/texinfo
@@ -181,7 +180,14 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with gsettings)"
@@ -253,12 +259,6 @@ src_configure() {
 			use xwidgets && ewarn \
 				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	econf \
@@ -385,7 +385,7 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 8137dcdd89b8..478d84767fce 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -40,11 +40,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
 	sys-libs/ncurses:0=
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	X? (
+	gui? ( !aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 				) )
 			)
 		)
-	)"
+	) )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
 BDEPEND="app-eselect/eselect-emacs
 	sys-apps/texinfo
@@ -180,7 +179,14 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
-	if use X; then
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
 		myconf+=" $(use_with gsettings)"
@@ -252,12 +258,6 @@ src_configure() {
 			use xwidgets && ewarn \
 				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
 		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
 	fi
 
 	econf \
@@ -384,7 +384,7 @@ src_install() {
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
 		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+	use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
 		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
 		machine would satisfy basic Emacs requirements under X11.
 		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
diff --git a/app-editors/emact/emact-2.58.0.ebuild b/app-editors/emact/emact-2.58.0.ebuild
index 9b91001721d2..bf90ddb88e86 100644
--- a/app-editors/emact/emact-2.58.0.ebuild
+++ b/app-editors/emact/emact-2.58.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,17 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+ BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="X"
+IUSE="gui"
 
 RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )"
+	gui? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
+	gui? ( x11-base/xorg-proto )"
 
 src_configure() {
 	econf \
-		$(use_with X x) \
+		$(use_with gui x) \
 		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
diff --git a/app-editors/jasspa-microemacs/files/20091011-glibc-2.32.patch b/app-editors/jasspa-microemacs/files/20091011-glibc-2.32.patch
new file mode 100644
index 000000000000..7e2f57c934bf
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/20091011-glibc-2.32.patch
@@ -0,0 +1,57 @@
+Fix compilation with glibc-2.32.
+
+--- me091011-orig/src/file.c
++++ me091011/src/file.c
+@@ -1325,7 +1325,7 @@
+                    )
+                 {
+                     /* READ ONLY DIR */
+-                    mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, sys_errlist[errno]);
++                    mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, strerror(errno));
+                     /* Zap the filename - it is invalid.
+                        We only want a buffer */
+                     mlwrite (0,(meUByte *)"[New buffer %s]", getFileBaseName(fname));
+@@ -1355,7 +1355,7 @@
+             {
+                 /* We are not allowed to read the file */
+ #if ((defined _UNIX) || (defined _DOS))
+-                mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, sys_errlist[errno]) ;
++                mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, strerror(errno)) ;
+ #else
+                 mlwrite(MWABORT,"[cannot read: %s]", fn) ;
+ #endif
+--- me091011-orig/src/fileio.c
++++ me091011/src/fileio.c
+@@ -2331,7 +2331,7 @@
+                                 if(meRename(filename,filename2) && (ffFileOp(filename,filename2,meRWFLAG_DELETE,-1) <= 0))
+                                 {
+                                     mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]", 
+-                                            filename2,errno,sys_errlist[errno]) ;
++                                            filename2,errno,strerror(errno)) ;
+                                     if(meUnlink(filename))
+                                     {
+                                         mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ;
+@@ -2346,7 +2346,7 @@
+                         mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ;
+                     else if(meRename(filenameOld,filename) && (ffFileOp(filenameOld,filename,meRWFLAG_DELETE,-1) <= 0))
+                         mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]", 
+-                                filename,errno,sys_errlist[errno]) ;
++                                filename,errno,strerror(errno)) ;
+                     else if(bp != NULL)
+                     {
+                         meUShort ss;
+--- me091011-orig/src/spawn.c
++++ me091011/src/spawn.c
+@@ -219,10 +219,10 @@
+         case 0:
+             /* we want the children to die on interrupt */
+             execlp("xterm", "xterm", "-sl", "200", "-sb", NULL);
+-            mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]);
++            mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno));
+             meExit(127);
+         case -1:
+-            ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]);
++            ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno));
+         default:
+             ss = meTRUE ;
+         }
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
index e41568ee3659..a2277979f14d 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@@ -17,10 +17,10 @@ SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nanoemacs X xpm"
+IUSE="gui nanoemacs xpm"
 
 RDEPEND="sys-libs/ncurses:0=
-	X? (
+	gui? (
 		x11-libs/libX11
 		xpm? ( x11-libs/libXpm )
 	)
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses:0=
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? (
+	gui? (
 		x11-base/xorg-proto
 		x11-libs/libXt
 	)"
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-ncurses.patch
 	"${FILESDIR}"/${PV}-linux3.patch
 	"${FILESDIR}"/${PV}-cc-detect.patch
+	"${FILESDIR}"/${PV}-glibc-2.32.patch
 )
 
 src_unpack() {
@@ -62,7 +63,7 @@ src_compile() {
 	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
 	local me="" type=c
 	use nanoemacs && me="-ne"
-	use X && type=cw
+	use gui && type=cw
 	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
 
 	cd src || die
@@ -77,23 +78,23 @@ src_compile() {
 src_install() {
 	local me=me type=c
 	use nanoemacs && me=ne
-	use X && type=cw
+	use gui && type=cw
 	newbin src/${me}${type} ${me}
 
 	if ! use nanoemacs; then
 		keepdir /usr/share/jasspa/site
 		insinto /usr/share
 		doins -r "${WORKDIR}"/jasspa
-		use X && domenu "${FILESDIR}"/${PN}.desktop
+		use gui && domenu "${FILESDIR}"/${PN}.desktop
 	fi
 
 	dodoc faq.txt readme.txt change.log
 }
 
 pkg_postinst() {
-	use X && xdg_desktop_database_update
+	use gui && xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	use X && xdg_desktop_database_update
+	use gui && xdg_desktop_database_update
 }
diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild
index b6609a508346..570f81253bbd 100644
--- a/app-editors/jed/jed-0.99.19-r1.ebuild
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,11 @@ SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="X gpm xft"
+IUSE="gpm gui xft"
 
 RDEPEND=">=sys-libs/slang-2
 	gpm? ( sys-libs/gpm )
-	X? (
+	gui? (
 		x11-libs/libX11
 		xft? (
 			>=media-libs/freetype-2
@@ -23,7 +23,7 @@ RDEPEND=">=sys-libs/slang-2
 		)
 	)"
 DEPEND="${RDEPEND}
-	X? (
+	gui? (
 		x11-libs/libXt
 		x11-base/xorg-proto
 	)"
@@ -46,7 +46,7 @@ src_configure() {
 
 src_compile() {
 	emake
-	use X && emake xjed
+	use gui && emake xjed
 }
 
 src_install() {
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
index 33bd0f7ba89a..efbed2aa6c70 100644
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.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
@@ -13,18 +13,18 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ~ppc x86"
-IUSE="X png unicode xv"
+IUSE="gui png unicode xv"
 RESTRICT="test"
 
 RDEPEND="
-	X? ( x11-libs/libX11
+	gui? ( x11-libs/libX11
 		x11-libs/libXext
 		xv? ( x11-libs/libXv ) )
 	png? ( >=media-libs/libpng-1.2:0= )"
 
 DEPEND="${RDEPEND}
 	>=app-text/texi2html-5
-	X? ( x11-base/xorg-proto )"
+	gui? ( x11-base/xorg-proto )"
 
 S="${WORKDIR}/${PN}"
 
@@ -45,7 +45,7 @@ src_configure() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--cc="$(tc-getCC)" \
-		$(use_enable X x11) \
+		$(use_enable gui x11) \
 		$(use_enable png) \
 		$(use_enable xv) || die
 }
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 88d5025874cb..86f38a778289 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
index 3fbcc4fac46f..6e93fa9e0178 100644
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ruby"
+RESTRICT="test"
 
 DEPEND=""
 RDEPEND="|| (
diff --git a/app-emacs/ddskk/ddskk-16.3.ebuild b/app-emacs/ddskk/ddskk-16.3.ebuild
index 396611aca952..4f37c7983dae 100644
--- a/app-emacs/ddskk/ddskk-16.3.ebuild
+++ b/app-emacs/ddskk/ddskk-16.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ruby"
+RESTRICT="test"
 
 DEPEND=""
 RDEPEND="|| (
diff --git a/app-emacs/ddskk/ddskk-17.1.ebuild b/app-emacs/ddskk/ddskk-17.1.ebuild
index c36507bd934b..beefab39e5ae 100644
--- a/app-emacs/ddskk/ddskk-17.1.ebuild
+++ b/app-emacs/ddskk/ddskk-17.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ruby"
+RESTRICT="test"
 
 DEPEND=""
 RDEPEND="|| (
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild
index c2b1fbb5a4e4..8db157fc8295 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.51-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild
new file mode 100644
index 000000000000..5e3c59617424
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common desktop xdg-utils readme.gentoo-r1
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="games gui"
+
+RDEPEND="games? ( acct-group/gamestat )"
+DEPEND="${RDEPEND}"
+PDEPEND=">=app-editors/emacs-23.1:*"
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+	newins site-gentoo.el{,.orig}
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use games; then
+		keepdir /var/games/emacs
+		fowners 0:gamestat /var/games/emacs
+		fperms g+w /var/games/emacs
+	fi
+
+	if use gui; then
+		local i
+		domenu emacs.desktop emacsclient.desktop
+
+		pushd icons || die
+		newicon sink.png emacs-sink.png
+		newicon emacs25_48.png emacs.png
+		for i in 16 24 32 48 128; do
+			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
+			newicon -s ${i} emacs23_${i}.png emacs23.png
+			newicon -s ${i} emacs25_${i}.png emacs.png
+		done
+		doicon -s scalable emacs23.svg
+		newicon -s scalable emacs25.svg emacs.svg
+		popd
+	fi
+
+	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+		added to ${SITELISP}/site-gentoo.el. In order for this site
+		initialisation to be loaded for all users automatically, a default
+		site startup file /etc/emacs/site-start.el is installed. You are
+		responsible for maintenance of this file.
+		\n\nAlternatively, individual users can add the following command:
+		\n\n(require 'site-gentoo)
+		\n\nto their ~/.emacs initialisation files, or, for greater
+		flexibility, users may load single package-specific initialisation
+		files from the ${SITELISP}/site-gentoo.d/ directory."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
+		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+	fi
+	if [[ -d ${EROOT}${SITELISP} ]]; then
+		elisp-site-regen
+		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+	fi
+
+	if use games; then
+		local f
+		for f in /var/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+			chgrp gamestat "${ED}${f}" || die
+			chmod g+w "${ED}${f}" || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5a41741a138c..dc7d471b3d30 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/firecracker/firecracker-0.21.1-r1.ebuild b/app-emulation/firecracker/firecracker-0.21.1-r1.ebuild
index b79e1177b8bc..da29ed53e5af 100644
--- a/app-emulation/firecracker/firecracker-0.21.1-r1.ebuild
+++ b/app-emulation/firecracker/firecracker-0.21.1-r1.ebuild
@@ -55,6 +55,8 @@ RESTRICT="test"
 
 BDEPEND="acct-group/kvm"
 
+QA_FLAGS_IGNORED='.*'
+
 set_target_arch() {
 	case "$(tc-arch)" in
 		amd64) target_arch=x86_64 ;;
@@ -67,7 +69,7 @@ pkg_setup() {
 	if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
 	else
-		        CONFIG_CHECK+=" ~KVM_AMD" || \
+				CONFIG_CHECK+=" ~KVM_AMD" || \
 			CONFIG_CHECK+=" ~KVM_INTEL"
 			ERROR_KVM="${P} requires KVM in-kernel support."
 	fi
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 938be0ef813a..03ef8d07a7c8 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/foremost/files/foremost-1.5.7-fno-common.patch b/app-forensics/foremost/files/foremost-1.5.7-fno-common.patch
new file mode 100644
index 000000000000..8506f59cf95a
--- /dev/null
+++ b/app-forensics/foremost/files/foremost-1.5.7-fno-common.patch
@@ -0,0 +1,99 @@
+diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c
+--- foremost-1.5.7/api.c.me	2020-02-06 14:15:48.218200745 +0100
++++ foremost-1.5.7/api.c	2020-02-06 14:16:42.624853860 +0100
+@@ -20,6 +20,7 @@ int				currFATblk;
+ int				highblk = 0;
+ int				block_list[OUR_BLK_SIZE / sizeof(int)];
+ extern int		errno;
++struct DIRECTORY *dirlist, *dl;
+ 
+ /*Inititialize those globals used by extract_ole*/
+ void init_ole()
+diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c
+--- foremost-1.5.7/extract.c.me	2020-02-06 14:10:30.446386101 +0100
++++ foremost-1.5.7/extract.c	2020-02-06 14:15:14.736798823 +0100
+@@ -25,6 +25,7 @@ extern char *extract_name;
+ extern int	extract;
+ extern int	FATblk;
+ extern int	highblk;
++extern struct DIRECTORY *dirlist, *dl;
+ 
+ /********************************************************************************
+  *Function: extract_zip
+diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h
+--- foremost-1.5.7/main.h.me	2020-02-06 13:48:46.923922983 +0100
++++ foremost-1.5.7/main.h	2020-02-06 13:50:08.001849830 +0100
+@@ -292,7 +292,7 @@ char *__progname;
+ /* -----------------------------------------------------------------
+    State Variable and Global Variables
+    ----------------------------------------------------------------- */
+-char wildcard;
++extern char wildcard;
+ typedef struct f_state 
+ {
+   off_t mode;
+@@ -344,7 +344,7 @@ typedef struct s_spec
+     int written; /*used for -a mode*/
+ }s_spec;
+ 
+-s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/
++extern s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/
+ 
+ typedef struct f_info {
+   char *file_name;
+@@ -367,7 +367,7 @@ typedef struct f_info {
+ } f_info;
+ 
+ /* Set if the user hits ctrl-c */
+-int signal_caught;
++extern int signal_caught;
+ 
+ /* -----------------------------------------------------------------
+    Function definitions
+@@ -433,7 +433,7 @@ off_t find_file_size(FILE *f);
+ char *human_readable(off_t size, char *buffer);
+ char *units(unsigned int c);
+ unsigned int chop(char *buf);
+-void print_search_specs(f_state *s);
++extern void print_search_specs(f_state *s);
+ int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive);
+ int charactersMatch(char a, char b, int caseSensitive);
+ void printx(unsigned char* buf,int start, int end);
+diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h
+--- foremost-1.5.7/ole.h.me	2020-02-06 14:08:16.524783353 +0100
++++ foremost-1.5.7/ole.h	2020-02-06 14:10:02.954056080 +0100
+@@ -84,8 +84,8 @@ struct DIRECTORY
+ 	int		s2;
+ 	int		d1;
+ 	int		d2;
+-}
+-*dirlist, *dl;
++};
++
+ 
+ int				get_dir_block(unsigned char *fd, int blknum, int buffersize);
+ int				get_dir_info(unsigned char *src);
+diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c
+--- foremost-1.5.7/state.c.me	2020-02-06 14:06:44.514684887 +0100
++++ foremost-1.5.7/state.c	2020-02-06 14:08:03.329625827 +0100
+@@ -2,6 +2,9 @@
+ 
+ #include "main.h"
+ 
++s_spec search_spec[50];
++char wildcard;
++
+ int initialize_state (f_state * s, int argc, char **argv)
+ 	{
+ 	char	**argv_copy = argv;
+diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c
+--- foremost-1.5.7/main.c.me	2020-02-06 14:20:09.918342282 +0100
++++ foremost-1.5.7/main.c	2020-02-06 14:20:42.531733786 +0100
+@@ -15,6 +15,7 @@
+  *
+  */
+ #include "main.h"
++int signal_caught;
+ 
+ #ifdef __WIN32
+ 
diff --git a/app-forensics/foremost/foremost-1.5.7-r3.ebuild b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
index 56cdeee6ed5d..c3742c315533 100644
--- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
@@ -1,32 +1,38 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="A console program to recover files based on their headers and footers"
+DESCRIPTION="Console program to recover files based on their headers and footers"
 HOMEPAGE="http://foremost.sourceforge.net/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 # starting to hate sf.net ...
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc x86"
-IUSE=""
 LICENSE="public-domain"
 SLOT="0"
-PATCHES=("${FILESDIR}/${PN}-1.4-config-location.patch"
-		"${FILESDIR}/${PN}-1.5.7-format-security.patch"
-		"${FILESDIR}/${PN}-1.5.7-set-but-unused.patch")
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4-config-location.patch"
+	"${FILESDIR}/${PN}-1.5.7-format-security.patch" # bug 521038
+	"${FILESDIR}/${PN}-1.5.7-set-but-unused.patch" # bug 706886
+	"${FILESDIR}/${PN}-1.5.7-fno-common.patch" # bug 722196
+)
 
 src_compile() {
-	emake RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \
+	emake \
+		RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" \
+		RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \
 		CONF=/etc
 }
 
 src_install() {
 	dobin foremost
-	gunzip foremost.8.gz
+	gunzip foremost.8.gz || die
 	doman foremost.8
 	insinto /etc
 	doins foremost.conf
diff --git a/app-forensics/honggfuzz/honggfuzz-2.3.1.ebuild b/app-forensics/honggfuzz/honggfuzz-2.3.1.ebuild
index 4cb2cc639af8..e3754c110db3 100644
--- a/app-forensics/honggfuzz/honggfuzz-2.3.1.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.3.1.ebuild
@@ -12,12 +12,13 @@ SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="clang"
 
 RDEPEND="
 	>=sys-libs/binutils-libs-2.29:=
 	sys-libs/libunwind:=
 	app-arch/xz-utils
+	clang? ( sys-libs/blocksruntime )
 "
 
 DEPEND="${RDEPEND}"
@@ -35,7 +36,7 @@ PATCHES=(
 
 pkg_pretend() {
 	if tc-is-clang; then
-		die "${P} does not work on clang due to incomplete -fblock support: https://bugs.gentoo.org/729256. Please try gcc."
+		use clang || die "${P}: to use clang enable USE=clang for ${P} (bug #729256)."
 	fi
 }
 
diff --git a/app-forensics/honggfuzz/metadata.xml b/app-forensics/honggfuzz/metadata.xml
index 06de019661a3..c314b69929b8 100644
--- a/app-forensics/honggfuzz/metadata.xml
+++ b/app-forensics/honggfuzz/metadata.xml
@@ -5,6 +5,9 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
+	<use>
+		<flag name="clang">Enable clang support (pull <pkg>sys-libs/blocksruntime</pkg> dependency).</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">google/honggfuzz</remote-id>
 	</upstream>
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 37777bd501e0..414caa6209fa 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 76e3b6f6d469..48dfef77e538 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,2 +1,3 @@
 DIST ibus-table-1.11.0.tar.gz 1312790 BLAKE2B 2f4edf8c52fd24f8f6735cfae8fe471e3c30ed6aea341758fc891fd7aa3ebc0dc3bbbf2bd4135586b8400c3e39035e877a0486be58a74ad5eb78bfdeef547f0e SHA512 269d7516d2580436d3bcdef2c77717c8b21c277dae0f55da3703e2bb3f26669dac29ddf3d4291854b205b5b2f5ab54d1894b32d541d084b03cb6cbb870e6b256
+DIST ibus-table-1.12.0.tar.gz 1344881 BLAKE2B 7b463799dd8adebce2f626a82f469fa8bc77b6e9dc6812eca47b11ed84bf2fea97990262c15738e2e0a97620edf19415c3e4016c48029b29393e70492a96e666 SHA512 f99b4164c7304bc6137be07001d52fbf8267fa068d8a6e96e5cb7856d00f3a0b82ad0b8fa9ae577bb82daab78ddfab7a222e2ef8891515e9edbb4db6fac84862
 DIST ibus-table-1.9.21.tar.gz 615801 BLAKE2B f6b3fb4fe67e5f43cc7d21bd03cc530c03b3a161e099fbca0b116319f1590374ddcef2e97c2f4702c2cd8748e8009d703abfff51f93ffb933a1aecb028e03362 SHA512 354f7e8ece5c23b84251bd0d5ff06d7a368678ade25e340341ef9f85571b440c455d56660c743be97ff6776ff041c4da35079ce090955c5f87b8f3b587e35866
diff --git a/app-i18n/ibus-table/ibus-table-1.12.0.ebuild b/app-i18n/ibus-table/ibus-table-1.12.0.ebuild
new file mode 100644
index 000000000000..f1c8d6b62e38
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.12.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index cc98f7fb910d..921a4bd2efce 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-typing-booster-2.9.4.tar.gz 8222228 BLAKE2B 8ba79ceaff6cd5ce37d093b08438a22ffb7b1295bba6d0b3af141b5804e89d04807d14fa5c5ce959ff728d76fcc5e60c0a51f113baa172710d59866733bd9741 SHA512 9c323301deccec0904cb2a2e34015ef11885ecd635ddb99afc6811a7f684dca448a026301155ae26fe0a38c00ca0a4d714ff933c39a60e4299434cfbca455d58
 DIST ibus-typing-booster-2.9.5.tar.gz 8236281 BLAKE2B 749890cc3477db890603c9a700bff1a097fd2cd09d01477f319658c65c73688903171e49a0284176ce396d83587ef23a067a0aabe81c57bf70479050a15e8c80 SHA512 58db7d7e687512d8c436b23c28e1c614d56f486de13153f5ddfddecf32595f6de8c8289273b288c1df857dac5577df3eea48ca900b709a13b9c91b2e0ec21286
+DIST ibus-typing-booster-2.9.6.tar.gz 8238571 BLAKE2B f0d64d71c778bc47427ae7b87a23d53f77a537765113334cada73312452cfc0c66f8a321ff17f7722da6554230347253ac2bd0e311b4c5a8831dc17f34e8ef72 SHA512 d3038b744ba5049fed8cf4ba9d455502ef3061f35604d135ffb15604bbac78be1b4ba4232528daf87cb750772309cc9745d7ebc31ced2fc989395e0c62701eb4
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.4.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.6.ebuild
similarity index 100%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.4.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.6.ebuild
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 739cced63f0f..83e5e415893c 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
index 70b76b0106e5..293a0a673c58 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index adfba0354a79..62c1c256c929 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,2 +1,3 @@
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
+DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
new file mode 100644
index 000000000000..e686d591c39c
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
+
+inherit autotools systemd
+
+DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
+HOMEPAGE="http://www.lcdproc.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
+REQUIRED_USE="
+	ethlcd? ( lcd_devices_hd44780 )
+	freetype? ( lcd_devices_glcd )
+	png? ( lcd_devices_glcd )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - svga: It needs media-libs/svgalib, which is masked and obsolete.
+IUSE_LCD_DEVICES=(
+	bayrad CFontz CFontzPacket curses CwLnx ea65
+	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
+	icp_a106 imon imonlcd IOWarrior irman irtrans
+	joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
+	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
+	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
+	sdeclcd sed1330 sed1520 serialPOS serialVFD
+	shuttleVFD sli stv5730 SureElec t6963 text
+	tyan ula200 vlsys_m428 xosd yard2LCD
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE="${LCD_DEVICE,,}"
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_cfontz? ( dev-libs/libhid:= )
+	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
+	lcd_devices_cwlnx? ( dev-libs/libhid:= )
+	lcd_devices_futaba? ( virtual/libusb:1= )
+	lcd_devices_g15? (
+		app-misc/g15daemon
+		dev-libs/libg15render:=
+		virtual/libusb:0=
+	)
+	lcd_devices_glcd? (
+		app-misc/glcdprocdriver:=
+		dev-embedded/libftdi:1=
+		dev-libs/libhid:=
+		dev-libs/serdisplib:=
+		virtual/libusb:0=
+		x11-libs/libX11:=
+	)
+	lcd_devices_hd44780? (
+		dev-embedded/libftdi:1=
+		dev-libs/libugpio:=
+		virtual/libusb:0=
+	)
+	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
+	lcd_devices_irman? ( media-libs/libirman:= )
+	lcd_devices_iowarrior? ( virtual/libusb:0= )
+	lcd_devices_lirc? ( app-misc/lirc )
+	lcd_devices_lis? ( dev-embedded/libftdi:1= )
+	lcd_devices_lb216? ( dev-libs/libhid:= )
+	lcd_devices_mdm166a? ( dev-libs/libhid:= )
+	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
+	lcd_devices_mx5000? ( app-misc/mx5000tools )
+	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
+	lcd_devices_picolcd? ( virtual/libusb:1= )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
+	lcd_devices_xosd? (
+		x11-libs/libX11:=
+		x11-libs/xosd:=
+	)
+"
+
+RDEPEND="${DEPEND_LCD_DEVICES}"
+
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/xmlto
+	)
+	freetype? ( media-libs/freetype:2= )
+	nfs? ( net-fs/nfs-utils )
+	png? ( media-libs/libpng:0= )
+	samba? ( net-fs/samba )
+"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+DOCS=( "CREDITS.md" "TODO" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" )
+
+src_prepare() {
+	default
+
+	# Fix path for modules
+	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local enable_ftdi="--disable-libftdi"
+	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
+		enable_ftdi="--enable-libftdi"
+	fi
+
+	local enable_hid="--disable-libhid"
+	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
+		enable_hid="--enable-libhid"
+	fi
+
+	local enable_png="--disable-libpng"
+	use lcd_devices_glcd && enable_png=""
+
+	local enable_usb0="--disable-libusb"
+	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
+		enable_usb0="--enable-libusb"
+	fi
+
+	local enable_usb1="--disable-libusb-1-0"
+	if use lcd_devices_futaba || use lcd_devices_picolcd; then
+		enable_usb1="--enable-libusb-1-0"
+	fi
+
+	local enable_x11="--disable-libX11"
+	use lcd_devices_glcd && enable_x11="--enable-libX11"
+
+	local myeconfargs=(
+		--enable-drivers="${myeconfargs_lcd_devices#,}"
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable doc dot)
+		$(use_enable doc html-dox)
+		$(use_enable doc latex-dox)
+		$(use_enable ethlcd)
+		$(use_enable extra-charmaps)
+		$(use_enable freetype)
+		$(use_enable menu lcdproc-menus)
+		$(use_enable nfs stat-nfs)
+		$(use_enable samba stat-smbfs)
+		$(use_enable test-menu testmenus)
+		${enable_ftdi}
+		${enable_hid}
+		${enable_png}
+		${enable_usb0}
+		${enable_usb1}
+		${enable_x11}
+		--with-lcdport="13666"
+		--with-pidfile-dir="/run"
+		--without-included-getopt
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake dox
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			cd "${S}"/docs/"${docbook}" || die
+			xmlto html "${docbook}".docbook || die
+		done
+	fi
+}
+
+src_install() {
+	default
+
+	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
+	rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
+	insinto /usr/share/lcdproc/clients
+	doins clients/examples/*.pl clients/metar/*.pl
+
+	newinitd "${FILESDIR}"/LCDd.initd LCDd
+	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
+	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
+
+	systemd_dounit "${FILESDIR}"/LCDd.service
+	systemd_dounit "${FILESDIR}"/lcdexec.service
+	systemd_dounit "${FILESDIR}"/lcdproc.service
+
+	if use doc; then
+		dodoc -r docs/html
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			docinto "${docbook}"
+			dodoc docs/"${docbook}"/*.html
+		done
+	fi
+}
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index 389066a08925..e085328a8354 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -24,12 +24,15 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}"
+	seccomp? ( sys-libs/libseccomp )
+"
 # >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+	${RDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
+"
 BDEPEND="
 	caps? ( virtual/pkgconfig )
-	kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
 	seccomp? ( virtual/pkgconfig )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f8e2e06d6acb..2ca0384efcfb 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnucash/gnucash-4.1.ebuild b/app-office/gnucash/gnucash-4.1.ebuild
index 0b6edcc84098..f99092410b21 100644
--- a/app-office/gnucash/gnucash-4.1.ebuild
+++ b/app-office/gnucash/gnucash-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
 	  python quotes -register2 smartcard sqlite test"
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index ca6453a923d4..3f84809af7ed 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,3 +1,2 @@
-DIST texstudio-2.12.16.tar.gz 34528802 BLAKE2B acf13d8bcd9a2017f19ab4484f6eab3f41868bcbbe364d869466d971b10f602652145be4082f1cef6a6d3be91c51d7bfa35e992b00cca0748f2178ddf36a263c SHA512 0c17fda78e0cd491d2869ccb1a164ae2348281a39f9883d813ceb2ed6a0287c4cf9e784cafb9c0a12b8839d7afc8897f8f74acffd87a5dfcb50d3b344f33ad28
-DIST texstudio-2.12.22.tar.gz 35965795 BLAKE2B 28d78e4c429d306e86abf54701395bcc6457c51f3264094f9d5737082161bf157d248f7913bda4eec8319632c4b2c38e8a3d4916c902cc3b86cd91b64c0238d9 SHA512 c589285d1fba00812583a3d58602a99e044eb4bcf6a84b939d00ad7fe4ba8f15788031361fc9b4cb8df19f8098911c437d1de5459c1736fa40888b88d13b10d1
+DIST texstudio-3.0.0.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
 DIST texstudio-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
diff --git a/app-office/texstudio/texstudio-2.12.22.ebuild b/app-office/texstudio/texstudio-2.12.22.ebuild
deleted file mode 100644
index 860d5319a1c3..000000000000
--- a/app-office/texstudio/texstudio-2.12.22.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix qmake-utils xdg-utils desktop
-
-MY_PV="${PV/_/}"
-
-DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
-HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
-SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="video"
-
-COMMON_DEPEND="
-	app-text/hunspell:=
-	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	app-text/psutils
-	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	default
-	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
-
-	if use video; then
-		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
-	fi
-
-	sed \
-		-e '/qtsingleapplication.pri/d' \
-		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
-}
-
-src_configure() {
-	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
-}
-
-src_install() {
-	local i
-	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
-		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
-	done
-	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-office/texstudio/texstudio-2.12.16.ebuild b/app-office/texstudio/texstudio-3.0.0.ebuild
similarity index 92%
rename from app-office/texstudio/texstudio-2.12.16.ebuild
rename to app-office/texstudio/texstudio-3.0.0.ebuild
index 860d5319a1c3..549dc6356a4c 100644
--- a/app-office/texstudio/texstudio-2.12.16.ebuild
+++ b/app-office/texstudio/texstudio-3.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit prefix qmake-utils xdg-utils desktop
 
-MY_PV="${PV/_/}"
+MY_PV="3.0.0alpha6"
 
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="video"
 
 COMMON_DEPEND="
@@ -49,7 +49,6 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
 	default
-	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
 
 	if use video; then
 		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 84cb847b7fa8..95dbc0108bb3 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/gemato-15.1.ebuild b/app-portage/gemato/gemato-15.1.ebuild
index 823a1340e968..54a8e3f8fa80 100644
--- a/app-portage/gemato/gemato-15.1.ebuild
+++ b/app-portage/gemato/gemato-15.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg tools"
 
 RDEPEND="
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 5dba74eda21a..9c2762186e12 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -2,3 +2,4 @@ DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215ea
 DIST portpeek-2.1.29.tar.gz 13067 BLAKE2B c0385849738303a3fab8123f6af321bd000f88975b26d363c08aacf873b657b872a898af92a0396f1e3060b5b804fc9f2ddd8579101d2f5da18628080dc4e490 SHA512 3933b39c248e3758d67e0c1dd04cb93727eecbda4ae35d55fc266d01f01d7f87c535701cbc54d48a212e1c642a4447d487f2c62aa649f084e1d1fca458263b27
 DIST portpeek-3.0.1.tar.gz 12906 BLAKE2B bca14b3d1c82b270a5418ca3ff1e5422a16251bd5d7ef775311c9bf86cbb3b5c1304c688c0631247aa1e6f479d5e7eb5313c83fac5a9e197dc70bda6aa48b569 SHA512 8e0d71d71afb6b6d990e88f3c212a7e999b544cdc7a06d44cadb59ae3b70849fbbd864d855f014bb4090a031efc0713c84dc2a3079e37ab8967e546c8d165394
 DIST portpeek-3.1.3.tar.gz 13698 BLAKE2B 67b37e4e02a178076bfa57da850eff7cdf2664e34ffbe287daa92b5db924d17f486eae078b7d09e497a2a6e21588134e8167d113d6181d9b3760ba7e20fa6635 SHA512 31d85e9d8c742409a7429695dd73a49da6d4b3fce67716b2e8ea766df95e130e16ef5cc05c4cd27278d51956e9b78fd17eadbf615da1e237a15e0649dba6b5e2
+DIST portpeek-3.1.4.tar.gz 13703 BLAKE2B 9afba0c81e63761160182aaea5f505e640867936e0ac982bfff15dc7c8ae201eede211e04f29b832d8989f9b0e63789234fab08c9cb073ea0d4c7fa96d87d90e SHA512 aae4d79d32c6a8c0bdcce83e3ea67235007db96cc3655e26861b11431bea1e7ac3cf90bed12d3f79cb354381f0590ed0b409c2c7593717ada8b2bf8d8ae4de37
diff --git a/app-portage/portpeek/portpeek-3.1.4.ebuild b/app-portage/portpeek/portpeek-3.1.4.ebuild
new file mode 100644
index 000000000000..9bda36898f42
--- /dev/null
+++ b/app-portage/portpeek/portpeek-3.1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.8
+	|| (
+		>=sys-apps/portage-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0bf531faad06..94750eacac22 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
index 5b081877a7a2..b74e2e79bc1a 100644
--- a/app-text/discount/files/gethopt-undefined.patch
+++ b/app-text/discount/files/gethopt-undefined.patch
@@ -1,12 +1,11 @@
-diff -aur discount-2.2.6/Makefile.in discount-2.2.6-new/Makefile.in
---- discount-2.2.6/Makefile.in	2019-04-16 03:28:20.000000000 +1200
-+++ discount-2.2.6-new/Makefile.in	2020-06-21 07:39:32.256757588 +1200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -139,7 +139,7 @@
  
  pandoc_headers.o: tools/pandoc_headers.c config.h
  	$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
 -pandoc_headers: pandoc_headers.o
-+pandoc_headers: pandoc_headers.o $(MKDLIB)
++pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON)
  	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
  
  branch.o: tools/branch.c config.h
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 65a73c599ed0..a1670523fa43 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/poppler/poppler-0.90.1.ebuild b/app-text/poppler/poppler-0.90.1.ebuild
index 4c2c2787fc42..b9da881ac295 100644
--- a/app-text/poppler/poppler-0.90.1.ebuild
+++ b/app-text/poppler/poppler-0.90.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/101"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index 49accc94ae42..3763c227f7bf 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
+
+inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index 5869d4ab6b86..81dd25281b35 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index fe4a9fd81fc6..f7ab7af931ba 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<use>
 		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
 	</use>
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 4ea6c4e06d02..02161bbe37da 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
index 694ca9a6e5e0..7391f652318f 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ppc ~ppc64 ~x86"
 IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
 gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
 svg tiff truetype vnc wxwidgets xrandr +zlib"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 98ff2714c06c..07d32aa1c8c8 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/dictionary-sharing/Manifest b/dev-haskell/dictionary-sharing/Manifest
new file mode 100644
index 000000000000..8ee7eef9198c
--- /dev/null
+++ b/dev-haskell/dictionary-sharing/Manifest
@@ -0,0 +1 @@
+DIST dictionary-sharing-0.1.0.0.tar.gz 2524 BLAKE2B d8a5a942749add31b4622b8bcea9784273fde2cb87865f5d7103f06f2fe9dbd82f247101b235ed7b716a8fb5e3dc813e897776778ee377442685d2b7d08d37b8 SHA512 5af84caae1339ddb006ba77f2505da63e0977368f93f4d84dbd8f31c0e45cea988a9175b5273cc2280b8d8f44dd8c921385ea2c38b239f08a565cae7c1fd6415
diff --git a/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild b/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild
new file mode 100644
index 000000000000..ea60ad0ba50c
--- /dev/null
+++ b/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Sharing/memoization of class members"
+HOMEPAGE="http://hackage.haskell.org/package/dictionary-sharing"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+src_prepare() {
+	default
+
+	#https://hackage.haskell.org/package/dictionary-sharing-0.1.0.0/revisions/
+	cabal_chdeps \
+		'containers >=0.5 && <0.6' 'containers >= 0.5'
+}
diff --git a/dev-tex/herm-pic/metadata.xml b/dev-haskell/dictionary-sharing/metadata.xml
similarity index 55%
rename from dev-tex/herm-pic/metadata.xml
rename to dev-haskell/dictionary-sharing/metadata.xml
index 13170c3184d8..b7878815d80d 100644
--- a/dev-tex/herm-pic/metadata.xml
+++ b/dev-haskell/dictionary-sharing/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
index cc09d809b16e..32b45d0e6b4c 100644
--- a/dev-haskell/encoding/Manifest
+++ b/dev-haskell/encoding/Manifest
@@ -2,4 +2,5 @@ DIST encoding-0.6.7.2.tar.gz 832564 BLAKE2B b61a113be8ac4d26c85343d5e459c35a4cdf
 DIST encoding-0.7.0.2.tar.gz 320988 BLAKE2B f1fdef3e4b9d247c03f9669b7506cbd9082acdd85bd2d96e988c8731b3e9c774bb498717e49089cf4030d50a94e24bc461d65ef3923a14a0212d4e8741547c91 SHA512 60ede0397d68bcea292ed9fb09fe2bafcbc0afdd7d374b098049afe9a7146cc4be5615a83dbfb13c1a44db2e52a77f231fbac3ab2249398d3fb9921041aadd04
 DIST encoding-0.8.1.tar.gz 1034198 BLAKE2B 67bcc5c36698e21eeb827d19585bafe4a8ce599703863295097c83b1c6908bec82bcf98c2d9b9c4ea492bfd79435d064330a7d1d1e57f7d7ea27f587145bcbbb SHA512 f77088138888673f0802b57cba3f14cf84a1bee15ad013a1335d8a9e8d7206d716078c3b2ab299545f49174d9de9db4c67089f1b01664c86337c31ec91c5cf46
 DIST encoding-0.8.2.tar.gz 412630 BLAKE2B 2e6fd3599d4c1062c85389a1d12d332e982beecfb4f98b92ee8b1618e50ed1f91ec65b94273a325995bcbaa8fc6f41878870069c6400365e899b946592b740da SHA512 e8cbb1b64f3555945c185485688bfb7e73ca7104cbbbf5bec8ec55937656df1e3b99bae24aa1513c0c690d3521bca9c111f0258f2245637c7c8d706709cdcd62
+DIST encoding-0.8.5.tar.gz 380798 BLAKE2B 0b8ccca2de17e00c59b114c8b6b7107a80e92e376cc3bf9d5e95eadf2a2c1e5a2d2a12294e7ec669b1203d4b4c6809c8a129aaf17f1022f361b64542fcf45d9b SHA512 2ae2f44007735bdcb6b7cd35614ffcb5fe211321d516350555b03d9074c679995260f30de1df788b800711613bfdca037cb9c24cf90afc88d32a706c237df386
 DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
diff --git a/dev-haskell/encoding/encoding-0.8.5.ebuild b/dev-haskell/encoding/encoding-0.8.5.ebuild
new file mode 100644
index 000000000000..48de713accc6
--- /dev/null
+++ b/dev-haskell/encoding/encoding-0.8.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for various character encodings"
+HOMEPAGE="http://code.haskell.org/encoding/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+systemencoding"
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/regex-compat-0.71:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	>=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.2-overflow.patch
+)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'regex-compat >=0.71 && <0.95' 'regex-compat >=0.71' \
+		'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag systemencoding systemencoding)
+}
diff --git a/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch b/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch
new file mode 100644
index 000000000000..c8085c827197
--- /dev/null
+++ b/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch
@@ -0,0 +1,41 @@
+https://github.com/dmwit/encoding/pull/11
+
+From ce27249d4260c7eb3f514c95d5edd762804dd4f3 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 29 Aug 2020 13:52:33 +0100
+Subject: [PATCH] Data/Map/Static/Builder.hs: avoid shiftL with negative offset
+
+On ghc-8.8 building `encoding` fails as:
+
+```
+Preprocessing library for encoding-0.8.5..
+arithmetic overflow
+```
+
+This happens because `findSplitSize` can't handle
+small values, like `findSplitSize 1` and calls `shiftL`
+with negative value, which is forbdden:
+    https://hackage.haskell.org/package/base-4.14.0.0/docs/Data-Bits.html#v:shiftL
+
+Work it around by always passing non-negative offset.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ Data/Map/Static/Builder.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Data/Map/Static/Builder.hs b/Data/Map/Static/Builder.hs
+index 486e19c..61851cd 100644
+--- a/Data/Map/Static/Builder.hs
++++ b/Data/Map/Static/Builder.hs
+@@ -37,6 +37,6 @@ treeDepth sz = find' [0..]
+ findSplitSize :: Int -> Int
+ findSplitSize len = let depth = treeDepth len
+                         free = (maxSize depth) - len
+-                    in if free <= (1 `shiftL` (depth - 2))
++                    in if 2 * free <= (1 `shiftL` (depth - 1))
+                        then maxSize (depth - 1)
+                        else len - (maxSize (depth - 2)) - 1
+-- 
+2.28.0
+
diff --git a/dev-haskell/git/Manifest b/dev-haskell/git/Manifest
new file mode 100644
index 000000000000..2a824293977c
--- /dev/null
+++ b/dev-haskell/git/Manifest
@@ -0,0 +1 @@
+DIST git-0.3.0.tar.gz 45846 BLAKE2B 93eb07d136085a0512f51b67e2e3b906fc7bee2c63e1bb621570a6123da0e08e87c829c88f7f17ddaf2a9f3cb3b8d5ddc485f83a14c814da86f2863fe17087f5 SHA512 f50061a6b3bccb063f7af74cbdcad33561b45c353ce35b8071ad03b0dd0b6e0d215381d6145dfeeff8bb66fbcef0379a9d749a8a1c1f8e45857b0c6bc4574f29
diff --git a/dev-haskell/git/files/git-0.3.0-monadfail.patch b/dev-haskell/git/files/git-0.3.0-monadfail.patch
new file mode 100644
index 000000000000..ffca3a1534e1
--- /dev/null
+++ b/dev-haskell/git/files/git-0.3.0-monadfail.patch
@@ -0,0 +1,103 @@
+From ad1e877d8e32bc3f573d92cadf697f0bb67a7da2 Mon Sep 17 00:00:00 2001
+From: Jack Todaro <solpeth@posteo.org>
+Date: Fri, 10 Jul 2020 07:01:08 +1000
+Subject: [PATCH] Data.Git.Monad.hs: port to MonadFail proposal
+
+Signed-off-by: Jack Todaro <solpeth@posteo.org>
+---
+ Data/Git/Monad.hs | 30 ++++++++++++++++++++++--------
+ 1 file changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Data/Git/Monad.hs b/Data/Git/Monad.hs
+index 480af9f..44a7018 100644
+--- a/Data/Git/Monad.hs
++++ b/Data/Git/Monad.hs
+@@ -17,7 +17,7 @@
+ --
+ -- You can also easily create a new commit: see 'CommitM' and 'withNewCommit'
+ --
+-
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE FlexibleInstances #-}
+ {-# LANGUAGE OverloadedStrings #-}
+ {-# LANGUAGE Rank2Types #-}
+@@ -74,7 +74,9 @@ module Data.Git.Monad
+     , Git.Person(..)
+     ) where
+ 
+-
++#if !MIN_VERSION_base(4,11,0)
++import qualified Control.Monad.Fail as Fail
++#endif
+ import Data.ByteString (ByteString)
+ import qualified Data.ByteString as B
+ import qualified Data.ByteString.Lazy as BL
+@@ -240,7 +242,11 @@ instance Applicative GitM where
+ instance Monad GitM where
+     return = returnGitM
+     (>>=)  = bindGitM
+-    fail   = failGitM
++#if !MIN_VERSION_base(4,11,0)
++    fail   = Fail.fail
++#endif
++instance MonadFail GitM where
++    fail = failGitM
+ 
+ instance GitMonad GitM where
+     getGit  = getGitM
+@@ -313,7 +319,11 @@ instance Applicative CommitAccessM where
+ instance Monad CommitAccessM where
+     return = returnCommitAccessM
+     (>>=)  = bindCommitAccessM
+-    fail   = failCommitAccessM
++#if !MIN_VERSION_base(4,11,0)
++    fail   = Fail.fail
++#endif
++instance MonadFail CommitAccessM where
++    fail = failCommitAccessM
+ 
+ instance GitMonad CommitAccessM where
+     getGit  = getCommitAccessM
+@@ -423,7 +433,7 @@ getDir fp = do
+ -- >        l <- getDir []
+ -- >        liftGit $ print l
+ --
+-withCommit :: (Resolvable ref, GitMonad git)
++withCommit :: (Resolvable ref, GitMonad git, MonadFail git)
+            => ref
+                 -- ^ the commit revision or reference to open
+            -> CommitAccessM a
+@@ -474,7 +484,11 @@ instance Applicative CommitM where
+ instance Monad CommitM where
+     return = returnCommitM
+     (>>=)  = bindCommitM
+-    fail   = failCommitM
++#if !MIN_VERSION_base(4,11,0)
++    fail   = Fail.fail
++#endif
++instance MonadFail CommitM where
++    fail = failCommitM
+ 
+ instance GitMonad CommitM where
+     getGit  = getCommitM
+@@ -599,7 +613,7 @@ deleteFile path = do
+ -- >        setFile ["README.md"] $ readmeContent <> "just add some more description\n"
+ -- >    branchWrite "master" r
+ --
+-withNewCommit :: (GitMonad git, Resolvable rev)
++withNewCommit :: (GitMonad git, MonadFail git, Resolvable rev)
+               => Git.Person
+                 -- ^ by default a commit must have an Author and a Committer.
+                 --
+@@ -670,7 +684,7 @@ withNewCommit p mPrec m = do
+ --         )
+ -- @
+ --
+-withBranch :: GitMonad git
++withBranch :: (GitMonad git, MonadFail git)
+            => Git.Person
+                 -- ^ the default Author and Committer (see 'withNewCommit')
+            -> Git.RefName
+-- 
+2.27.0
+
diff --git a/dev-haskell/hit/hit-0.6.3.ebuild b/dev-haskell/git/git-0.3.0.ebuild
similarity index 59%
rename from dev-haskell/hit/hit-0.6.3.ebuild
rename to dev-haskell/git/git-0.3.0.ebuild
index 8751b75ec770..521fbe6b0456 100644
--- a/dev-haskell/hit/hit-0.6.3.ebuild
+++ b/dev-haskell/git/git-0.3.0.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.3.9999
+# ebuild generated by hackport 0.6.2
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Git operations in haskell"
-HOMEPAGE="https://github.com/vincenthz/hit"
+HOMEPAGE="https://github.com/vincenthz/hs-git"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug executable"
+IUSE=""
 
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
+RDEPEND="dev-haskell/basement:=[profile?]
+	>=dev-haskell/cryptonite-0.22:=[profile?]
 	>=dev-haskell/hourglass-0.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/patience:=[profile?]
+	>=dev-haskell/memory-0.13:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/system-fileio:=[profile?]
 	dev-haskell/system-filepath:=[profile?]
@@ -33,8 +30,6 @@ RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
 	dev-haskell/zlib:=[profile?]
 	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	executable? ( >=dev-haskell/hashable-1.2:=[profile?]
-			dev-haskell/hashtables:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
@@ -43,8 +38,4 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-quickcheck )
 "
 
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag executable executable)
-}
+PATCHES=( "${FILESDIR}/${P}-monadfail.patch" )
diff --git a/dev-haskell/git/metadata.xml b/dev-haskell/git/metadata.xml
new file mode 100644
index 000000000000..4cbbb473028d
--- /dev/null
+++ b/dev-haskell/git/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="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		
+		A Haskell implementation of git storage operations, allowing users
+		to manipulate git repositories (read and write).
+		
+		This implementation is fully interoperable with the main C implementation.
+		
+		This is strictly only manipulating the git store (what&#39;s inside the .git directory),
+		and doesn&#39;t do anything with the index or your working directory files.
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hit/Manifest b/dev-haskell/hit/Manifest
index 99895faea16e..46c6f5f1d37e 100644
--- a/dev-haskell/hit/Manifest
+++ b/dev-haskell/hit/Manifest
@@ -1 +1 @@
-DIST hit-0.6.3.tar.gz 38690 BLAKE2B 928a532cacb2393b46b9e5abeee6d66bf140e9e4a71f359b8a35016f97db4eeb32f4efb6c56d74528d3311ae4d6477716670c14ae6ad7361a7892575185dd336 SHA512 82ccfeb77a439caa1792f1ae29535636764be9e6e94f75973f37a86db6627a492e57da835954384ef8468799de9f0897e20905f65dad256fe3547a4248d5fffc
+DIST hit-0.7.0.tar.gz 4919 BLAKE2B ff48cdc9421da4d2ef122a93859d82748c951f445f02d91cb1b320646a1cc68251380bfb6dfbe358ddf009e3664f258c1b7fe1e0f4dc402b2223ccc1bb929fe2 SHA512 d900c768bd60533092cf01627021b5b09804a0f29e3188bf4b9c6c2c79c709afb1c461a8d49459d5434d0d4d1241f5863a242e38ac9e28ddfaa02ef7565b9270
diff --git a/dev-haskell/hit/hit-0.7.0.ebuild b/dev-haskell/hit/hit-0.7.0.ebuild
new file mode 100644
index 000000000000..f5754a04b7a8
--- /dev/null
+++ b/dev-haskell/hit/hit-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="Git operations in haskell"
+HOMEPAGE="https://github.com/vincenthz/hit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-haskell/git-0.3.0:=
+	>=dev-haskell/hashable-1.2:=
+	dev-haskell/hashtables:=
+	dev-haskell/hourglass:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
index aeb520f51526..2d822f7e7d49 100644
--- a/dev-haskell/hit/metadata.xml
+++ b/dev-haskell/hit/metadata.xml
@@ -14,7 +14,4 @@
 		This is stricly only manipulating the git store (what's inside the .git directory),
 		and doesn't do anything with the index or your working directory files.
 	</longdescription>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
new file mode 100644
index 000000000000..1c6c599b9cd7
--- /dev/null
+++ b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
@@ -0,0 +1,13 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,5 +3,10 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Distribution.Simple(defaultMainWithHooks ,simpleUserHooks ,preConf)
+ import Distribution.Simple.Setup(ConfigFlags)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.PackageDescription
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
index 0e404b50ee54..ed0ebe28b8f6 100644
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 # ebuild generated by hackport 0.2.13
 
-EAPI=4
+EAPI=6
 
 CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
+RDEPEND=">=dev-haskell/hsql-1.8.2:=[profile?]
+		>=dev-lang/ghc-6.10.1:=
 		>=dev-db/unixODBC-2.2"
 DEPEND="${RDEPEND}
 		dev-haskell/cabal"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
diff --git a/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
new file mode 100644
index 000000000000..b421fbb9362a
--- /dev/null
+++ b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
@@ -0,0 +1,14 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,2 +3,3 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Control.Monad(when)
+@@ -13,3 +14,7 @@ import Distribution.PackageDescription
+     ,emptyBuildInfo)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.Simple(UserHooks(preConf,postConf) ,simpleUserHooks 
diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
index 0f537298e791..5385305b3fd8 100644
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
+++ b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.3.1.9999
 
@@ -22,3 +22,7 @@ RDEPEND=">=dev-db/sqlite-3.0
 		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
index d79bf330ba67..fdc114280533 100644
--- a/dev-haskell/logict-state/Manifest
+++ b/dev-haskell/logict-state/Manifest
@@ -1,2 +1 @@
-DIST logict-state-0.1.0.2.tar.gz 5669 BLAKE2B 4596ac415c48c14f7d1c74f6f8613756582405467779a1a185111861f3374842c02a56b6665311b6b6c0c7ce12d908682572dcaaf37a5c61e8f937d01996b5bc SHA512 b3e113c3f124ee6716a0532060e7ca9a5c4dcac2a4de565562f3aeff8884310bb84c2631c555c881e2cdf02ab73afb6323b1a5d33bc743eaece7e382c74298d6
 DIST logict-state-0.1.0.5.tar.gz 4525 BLAKE2B 9dbd41d4b1f1f9023082836a852bc3f2d273f920db6caa4383fc23c967e588dcb2e94b053a5c7a3fb3c28afbd714f7006583a65dd87c3eb3b535202caf2223fc SHA512 f641907213c23de22a779f1dd065aa3c02de5686dae0fac86403d958ba6d2cba23d86d6a43b8c78fff0963f7ed62837d704243eeac006163eb6fa2ab26fe9ad4
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
deleted file mode 100644
index ca8bd82ad6e5..000000000000
--- a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for logic programming based on haskell package logict"
-HOMEPAGE="https://github.com/atzedijkstra/logict-state"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/logict-0.6.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.4.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index 6bd4a8ef6783..c59eda725001 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1,2 +1 @@
-DIST logict-0.6.0.2.tar.gz 5370 BLAKE2B c66d17f4595a27c83d9b2fddfb3c9e824d838ab353a8a71d6a78f436e20f529d7f408cf818b7034500bbfb5a14da7c6b8b2b067d36e4820898379f870922a3c7 SHA512 dfb72d006d9b7a5f0d7447d956ea0c3d083e200a616efc4b34fafa0582c2dc7e9369156cf4f51a472b97f7afb6167030edeb84e77c7bc410bfe58a44f0ac4fc4
-DIST logict-0.7.0.2.tar.gz 5892 BLAKE2B 13f521f69c2c3453d54ccfd87bb4ffde9dc7b222e8989757567bd91bb1c3e20c8fa85a37b078675bbc25c906acde1b4651381ac348180583f03b4214cc81afc1 SHA512 f7019533ed1ccd7e2c87b6f78aaece5d4062b378c75ff52ffb3d618a27e23ec1d8fdd823904fc94df017f682b49aef2b0549b91c7c45e395eb79ed2772c107b5
+DIST logict-0.7.0.3.tar.gz 5924 BLAKE2B 1d5fe5a78ff0448e70b68c063f3e1a4d632208e4b5bc35c51c17d12bf0ae5175db31b5c8854776ae41d7ca1fe450f8767a9f5db113c85e60ffc26bb949f1406e SHA512 0d845daffb841efea93b59e48ee86daeb0dbacbe4fc7fa417ff71d1dcda3a5551901f589097416441736007d256197932b83de76a2f630a5f7835909cd758e79
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
deleted file mode 100644
index 6f613d9a92a6..000000000000
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A backtracking logic-programming monad"
-HOMEPAGE="https://github.com/Bodigrim/logict"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/logict/logict-0.7.0.2.ebuild b/dev-haskell/logict/logict-0.7.0.3.ebuild
similarity index 85%
rename from dev-haskell/logict/logict-0.7.0.2.ebuild
rename to dev-haskell/logict/logict-0.7.0.3.ebuild
index fda9f35cc82f..9215ee27620a 100644
--- a/dev-haskell/logict/logict-0.7.0.2.ebuild
+++ b/dev-haskell/logict/logict-0.7.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -22,7 +22,7 @@ RDEPEND="dev-haskell/fail:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
+	>=dev-haskell/cabal-1.10
 	test? ( dev-haskell/tasty
 		dev-haskell/tasty-hunit )
 "
diff --git a/dev-haskell/size-based/Manifest b/dev-haskell/size-based/Manifest
new file mode 100644
index 000000000000..0d52f56d587a
--- /dev/null
+++ b/dev-haskell/size-based/Manifest
@@ -0,0 +1 @@
+DIST size-based-0.1.2.0.tar.gz 10324 BLAKE2B 789cf4603a0539ef3a919c43f64d9613d8473ea9b59c6a4e77a22b07916b01ad773a2c758b54439fab961b4c89891122651a21fb19231cd561a7a2af5f766f74 SHA512 661bcf34fa52253a54c2a0530bc484ef74c687ea98f7de7ff11232ac3be1f653dabb70e641bc5724ee35bdf19b86a20ed0fc9b56a4730c07aaf7a11900a99409
diff --git a/dev-tex/aastex/metadata.xml b/dev-haskell/size-based/metadata.xml
similarity index 55%
rename from dev-tex/aastex/metadata.xml
rename to dev-haskell/size-based/metadata.xml
index 13170c3184d8..b7878815d80d 100644
--- a/dev-tex/aastex/metadata.xml
+++ b/dev-haskell/size-based/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/size-based/size-based-0.1.2.0.ebuild b/dev-haskell/size-based/size-based-0.1.2.0.ebuild
new file mode 100644
index 000000000000..8dc2d61f064c
--- /dev/null
+++ b/dev-haskell/size-based/size-based-0.1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Sized functors, for size-based enumerations"
+HOMEPAGE="http://hackage.haskell.org/package/size-based"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?]
+	<dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+	cabal_chdeps \
+		'template-haskell  >=2.5 && <2.15' 'template-haskell  >=2.5'
+}
diff --git a/dev-haskell/testing-feat/Manifest b/dev-haskell/testing-feat/Manifest
index 79cc2777616e..258c90b61a82 100644
--- a/dev-haskell/testing-feat/Manifest
+++ b/dev-haskell/testing-feat/Manifest
@@ -1 +1,2 @@
 DIST testing-feat-0.4.0.3.tar.gz 17864 BLAKE2B ff57b181e3ed34a5e9794b9c3830122e2bd36a8199a641e2025cd5a2e467dae15cfc5d9cb4e21f198cdb667d7b9b6a5f88850f68c69d00da016200c5a12c33ce SHA512 0dabd9129472d9cf91b87a31aec9265369cdf58ec47fe74997df08097d4e93edb4f4bf52050bbca0c345e5993c12d0fcf755b94dd80093a33ba8fef366b08516
+DIST testing-feat-1.1.0.0.tar.gz 15291 BLAKE2B e590af9bbe5b5382bdefb4375cff05340e9be2bfa75e7dde895dee7bf1a84e8494f304306a979c8120b98c5fe9899d9ad8d271456e6318b5a78b1381306d4838 SHA512 b6480e990f9b8065d9f5e9fcf0dfeefe7e722830848ed5614cbe11581329f4341eb90547b67c1471d8b2e8b230490040714b1f560456797980c5cec9d0aef6e0
diff --git a/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild b/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild
new file mode 100644
index 000000000000..b49fdd83ecf5
--- /dev/null
+++ b/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Functional Enumeration of Algebraic Types"
+HOMEPAGE="https://github.com/JonasDuregard/testing-feat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	<dev-haskell/semigroups-0.19:=[profile?]
+	<dev-haskell/size-based-0.2:=[profile?]
+	<dev-haskell/testing-type-modifiers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/testing-type-modifiers/Manifest b/dev-haskell/testing-type-modifiers/Manifest
new file mode 100644
index 000000000000..bd6c2430b09c
--- /dev/null
+++ b/dev-haskell/testing-type-modifiers/Manifest
@@ -0,0 +1 @@
+DIST testing-type-modifiers-0.1.0.1.tar.gz 2275 BLAKE2B 664760d4655f7c4ae4fea0b52f1687b81a754ec9d24aa940600279e6b029924b9505b29f24d7dfd07f6100e99b263727186ec8b65bd48b3d953be7554448c50b SHA512 21b76e469f2af199593a90579e9e2f0105444f508a3b244872936c95b28574cb8a782d74244249e4cf045d885b6878d8ae237ccd578c755f7314336137da56b8
diff --git a/dev-haskell/testing-type-modifiers/metadata.xml b/dev-haskell/testing-type-modifiers/metadata.xml
new file mode 100644
index 000000000000..a475c390c584
--- /dev/null
+++ b/dev-haskell/testing-type-modifiers/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Property based testing libraries such as QuickCheck tend to include type modifiers. Most of them
+		are used to quantify over subsets of a type. For example a property on non-empty lists:
+		
+		@  prop_tail_length (NonEmpty xs) = length (tail xs) == length xs - 1 @
+		
+		This library is intended to supply these modifiers to be used by testing libraries, in an effort to make
+		properties more portable between testing frameworks.
+		
+		For every modifier it also provides an access function that converts to the underlying type, which
+		enables point-free style properties as such:
+		
+		@
+		prop_tail_length2 = (&gt; 0) . length . nonEmpty
+		@
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild b/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild
new file mode 100644
index 000000000000..4d6f60eac4d4
--- /dev/null
+++ b/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Data type modifiers for property based testing"
+HOMEPAGE="http://hackage.haskell.org/package/testing-type-modifiers"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
index 283448e73244..bba482616668 100644
--- a/dev-haskell/text-show/Manifest
+++ b/dev-haskell/text-show/Manifest
@@ -1 +1 @@
-DIST text-show-3.4.tar.gz 105127 BLAKE2B 4ea8f7cddaaad4630f0c8317dbe4d5505f27f3008c5e17117d9100f94bb49439edd2761acef60696ef8a97dc8412964d0a9750353f91b30257b025c9e88fd054 SHA512 48b7fdd801c4fc31e12f14a9ba0589e0971481a2f8562d00c697a9fd48f6420e73df0a7318ff4579a786cd606a1fda2287eab3f8c423810c0d00919c68eeebed
+DIST text-show-3.8.5.tar.gz 95620 BLAKE2B 51c1a5f9b29d60e305b53db1a47bc415f8cec3fa4c29c22d103ffc20dd4585bc8241f471031eaaf798c0df379c589cd4a9622877b7f69cedc5f15c3fa94c9291 SHA512 17e6e4d188280d4545867b31210f9e8e69337996c80b8c4f9fd846e50605acb29ebb2429e72ce76545426741055c4806c20a32b59d47e190a38d0f1ed9405947
diff --git a/dev-haskell/text-show/text-show-3.4.ebuild b/dev-haskell/text-show/text-show-3.4.ebuild
deleted file mode 100644
index 3e0806d71e12..000000000000
--- a/dev-haskell/text-show/text-show-3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into Text"
-HOMEPAGE="https://github.com/RyanGlScott/text-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1
-		>=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text-show/text-show-3.8.5.ebuild b/dev-haskell/text-show/text-show-3.8.5.ebuild
new file mode 100644
index 000000000000..0bd37f1302be
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.8.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
+	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9
+		>=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                  >= 4.9 && < 4.14' 'base                  >= 4.9' \
+		'base      >= 4.5    && < 4.14' 'base      >= 4.5' \
+		'base                  >= 4.5 && < 4.9' 'base                  >= 4.5' \
+		'ghc-boot-th           >= 8.0  && < 8.9' 'ghc-boot-th           >= 8.0' \
+		'template-haskell      >= 2.11 && < 2.16' 'template-haskell      >= 2.11' \
+		'template-haskell      >= 2.5  && < 2.11' 'template-haskell      >= 2.5' \
+		'QuickCheck            >= 2.12   && < 2.14' 'QuickCheck            >= 2.12'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a1ba4147ddfb..4b754ff738ef 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mujs/mujs-1.0.7.ebuild b/dev-lang/mujs/mujs-1.0.7.ebuild
index 7565be4d6b63..c8a8ab68360c 100644
--- a/dev-lang/mujs/mujs-1.0.7.ebuild
+++ b/dev-lang/mujs/mujs-1.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 LICENSE="ISC"
 # subslot matches SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index e5adc77b764f..4187477b36b9 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,3 +1,4 @@
 DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81
 DIST nasm-2.15.03.tar.xz 984060 BLAKE2B f6d6e7618e23d1b6ab89620ed37b3539e18dc5d4c800796afea0242250e9148eb7a59cbc9a9633a971fe4d000373b9f362c2be2bd7b08fc69a61dd7e31368298 SHA512 be98e8e0a3b5f5296bc941a7bbcbf44c4084c65d11aed60d17a803b9647d59bd14ec06e780ac22c4bbe8869625eb8e6139d18a88e25310edfce0fe0fc0172950
 DIST nasm-2.15.04.tar.xz 988252 BLAKE2B 57d619e1374cb76b1112b40d9a5bb97eb38a0d233d4ebdd9dab50ae38bc9bf7c2d254df0f48dace7ad418e38e50b621626e5374d06ce71dad23fdcb8934adef7 SHA512 96d3131a422282f78e5326314570826d312bbab3c4ce3fdbad36578daf5963cc9a41672b4596d37ecdc002877b720bff44e2ce5b83f34b7a797f0b9ca5ca7c3c
+DIST nasm-2.15.05.tar.xz 995732 BLAKE2B a41434965c2125577b762d907a0a3c251c75d9f9beac230fba4099182c7f7beb08c6d2c05c2432b0dc8ba829f24077f44c3096faea9bd0a533250e6dbbfaef35 SHA512 512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7
diff --git a/dev-lang/nasm/nasm-2.15.05.ebuild b/dev-lang/nasm/nasm-2.15.05.ebuild
new file mode 100644
index 000000000000..50972bc3e57f
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.15.05.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="https://www.nasm.us/"
+SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+# [fonts note] doc/psfonts.ph defines ordered list of font preference.
+# Currently 'media-fonts/source-pro' is most preferred and is able to
+# satisfy all 6 font flavours: tilt, chapter, head, etc.
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		app-text/ghostscript-gpl
+		dev-perl/Font-TTF
+		dev-perl/Sort-Versions
+		media-fonts/source-pro
+		virtual/perl-File-Spec
+	)
+"
+
+S=${WORKDIR}/${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
+)
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
index 1602b6f94f4d..d0446034982f 100644
--- a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc rls rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
index 81bc03d8c0ab..73d6910fdb1f 100644
--- a/dev-lang/rust/rust-1.45.2.ebuild
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -18,7 +18,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d014def83655..f870332feed2 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 3cd164570b4f..f030c27477c6 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 4b4c5fd4f5da..c599c979f75b 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -3,3 +3,4 @@ DIST libfilezilla-0.21.0.tar.bz2 552491 BLAKE2B fb2729c1c2616b4dbdc292651fd5afe8
 DIST libfilezilla-0.22.0.tar.bz2 557320 BLAKE2B 864f286844a3693ae1aa9f0176dbcf32a6a483174aa4b29e23ebccd309f88e97cb84368b3b5d22f07f94d396885b992e2e2e4b2f64bfec490bbcb898c88e0dc5 SHA512 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e
 DIST libfilezilla-0.23.0.tar.bz2 560028 BLAKE2B f5ef9001babc1cdf5f36ecaa88aacdbab99d2f65fb6554296c54ed63c6131cc03f16b92635b7c71375b94394d02b0596500c6c796c4efa6fc2c74f561c640d1b SHA512 a69040b7767e4568ba155adce67a5755b2947a73626bad89c89c88c773cb99147349ec5c3b8cc746715c9270b54ac6bc70fd57c77fe125b2dc6753669dfe93d7
 DIST libfilezilla-0.24.0.tar.bz2 560451 BLAKE2B 2806820e3aca63e1a018b01b990e7580c53d32d6e0e519a316a172a516c4b24aa38e5e1847fb40db7d21c22b68caffdafd3701273ac96561305661b9b8a86716 SHA512 f5fd2ca426235e03e26209b975e2eda4763ef1bef16a1b424ce4a248245163038d4e56089d523d77b8370f52a2947873d8439f4fc9478ba57fcef453c2f54861
+DIST libfilezilla-0.24.1.tar.bz2 560439 BLAKE2B f4848149839fa121ed856726769a9517932ab0b34dd19696d66bd15ad8208fa0bb3e7dbf9cb31baeabea02ec6e0b7d0c8e48fbca3956c26251dcbbb4332c727c SHA512 f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c
diff --git a/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild
new file mode 100644
index 000000000000..06fb1f38b744
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/9" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index d59f609305d9..c6e935f2e544 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86 ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
index 2342fd3e1537..81c4ebbb55b0 100644
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ b/dev-libs/libofx/libofx-0.9.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index eaf2be21f9ab..013ed8025dd6 100644
--- a/dev-libs/libpcre/libpcre-8.44.ebuild
+++ b/dev-libs/libpcre/libpcre-8.44.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
index 330a5cdd9972..c4d816f332bb 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index b2046fc41d49..6a7c206f59b3 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1 +1,2 @@
 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
+DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40
diff --git a/dev-libs/libzia/libzia-4.22.ebuild b/dev-libs/libzia/libzia-4.22.ebuild
new file mode 100644
index 000000000000..4977fe81e7dc
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.22.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
index 07b4836319d4..5e0465060898 100644
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -8,9 +8,9 @@
  
  AC_LANG(C++)
  ACX_PTHREAD
-@@ -25,6 +26,12 @@
- AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
- AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found]))
+@@ -40,6 +41,12 @@
+ AC_CHECK_FUNCS([fopen64], ,[AM_CFLAGS=-DUSE_FILE32API])
+ AC_SUBST(AM_CFLAGS)
  
 +PKG_CHECK_MODULES([MINIZIP], [minizip],
 +  [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
@@ -23,7 +23,7 @@
    [epoll_option=$withval],
 --- a/framework/common/Makefile.am
 +++ b/framework/common/Makefile.am
-@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+@@ -23,7 +23,6 @@
  	httpparser.cpp \
  	httprequest.cpp \
  	httpreply.cpp \
@@ -31,7 +31,7 @@
  	job.cpp \
  	langlib.cpp \
  	listener.cpp \
-@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+@@ -40,16 +39,13 @@
  	stringlessignorecase.cpp \
  	tntconfig.cpp \
  	tntnet.cpp \
@@ -49,7 +49,7 @@
  
  nobase_include_HEADERS = \
  	tnt/applicationunlocker.h \
-@@ -145,3 +141,13 @@ noinst_HEADERS += \
+@@ -144,3 +140,13 @@
  	tnt/stressjob.h
  endif
  
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
index 8f1ea542f980..6012e52da3e1 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Modular, multithreaded web application server extensible with C++"
 HOMEPAGE="http://www.tntnet.org/"
@@ -12,13 +12,14 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="gnutls libressl server ssl examples static-libs"
+IUSE="gnutls libressl server ssl examples"
 
-RDEPEND=">=dev-libs/cxxtools-2.2.1
+RDEPEND="
+	>=dev-libs/cxxtools-2.2.1
 	sys-libs/zlib[minizip]
 	ssl? (
 		gnutls? (
-			>=net-libs/gnutls-1.2.0
+			net-libs/gnutls:0=
 			dev-libs/libgcrypt:0
 		)
 		!gnutls? (
@@ -27,18 +28,19 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
 		)
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	app-arch/zip"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
 
 src_prepare() {
 	# Both fixed in the next release
-	eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+	default
 	rm framework/common/{ioapi,unzip}.[ch] || die
 
 	# bug 426262
-	if has_version ">sys-devel/autoconf-2.13"; then
-		mv configure.in configure.ac
-	fi
+	mv configure.{in,ac} || die
 
 	# bug 423697
 	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
@@ -46,54 +48,46 @@ src_prepare() {
 	eautoreconf
 
 	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-
-	default
 }
 
 src_configure() {
-	local myconf=""
+	# default enabled, will not compile without sdk
+	local myconf=( --with-sdk )
 
-	# Prefer gnutls above SSL
+	# Prefer gnutls over SSL
 	if use gnutls; then
 		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
+		myconf+=( --with-ssl=gnutls )
 	elif use ssl; then
 		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
+		myconf+=( --with-ssl=openssl )
 	else
-		myconf="${myconf} --with-ssl=no"
+		myconf+=( --with-ssl=no )
 	fi
 
-	# default enabled, will not compile without sdk
-	myconf="${myconf} --with-sdk"
-
 	econf \
+		--disable-static \
 		$(use_with server) \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README TODO doc/tntnet.pdf
+	default
+	dodoc doc/tntnet.pdf
 
 	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
+		emake -C sdk/demos maintainer-clean
+		rm -r sdk/demos/{Makefile*,*/Makefile*,*/*.{la,lo},*/.libs} || die
 
 		docinto examples
-		dodoc -r sdk/demos/*
+		dodoc -r sdk/demos/.
 	fi
 
 	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
+		rm -f "${ED}"/etc/init.d/tntnet || die
+		newinitd "${FILESDIR}"/tntnet.initd tntnet
 	fi
 
 	# bug 737184
-	if ! use static-libs; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
new file mode 100644
index 000000000000..abe2b09cf26e
--- /dev/null
+++ b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=1.15
+inherit perl-module
+
+DESCRIPTION="A Module::Build subclass for building Alien:: modules and their libraries"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Alien-Build for Alien::Base::PkgConfig
+RDEPEND="
+	>=dev-perl/Alien-Build-1.200.0
+	dev-perl/Archive-Extract
+	>=virtual/perl-Archive-Tar-1.400.0
+	>=dev-perl/Capture-Tiny-0.170.0
+	>=dev-perl/File-chdir-0.100.500
+	>=virtual/perl-HTTP-Tiny-0.44.0
+	>=dev-perl/Module-Build-0.400.400
+	>=dev-perl/Path-Tiny-0.77.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	dev-perl/Shell-Config-Generate
+	dev-perl/Shell-Guess
+	dev-perl/Sort-Versions
+	>=virtual/perl-Text-ParseWords-3.260.0
+	dev-perl/URI
+	virtual/perl-parent
+	dev-perl/HTML-Parser
+	virtual/perl-JSON-PP
+"
+DEPEND="
+	dev-perl/Module-Build
+"
+# Test2-Suite for Test2::Require::Module and Test2::V0
+BDEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-perl/Test2-Suite-0.0.60
+	)
+"
diff --git a/dev-perl/Alien-Base-ModuleBuild/Manifest b/dev-perl/Alien-Base-ModuleBuild/Manifest
index 5c2bdb9a87f9..ace0d5575108 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Manifest
+++ b/dev-perl/Alien-Base-ModuleBuild/Manifest
@@ -1 +1,2 @@
 DIST Alien-Base-ModuleBuild-1.14.tar.gz 62072 BLAKE2B 64a94621b36b13ad32861c228e787ca44ae8fbec5f1a2fcd65ade8188c44021dbca45fc7f62aa390d10920f670779511ceb96f214b41c4cce2a6424a0f72b47e SHA512 6fcfb7e5525972d5ca565441717143b036ed9c4079700426df2e96d76a91baeaf103ac406a8fa86dfd820929041525d7bb66c32762258cfb7752fb7634171fbf
+DIST Alien-Base-ModuleBuild-1.15.tar.gz 63870 BLAKE2B dc89d63c31cfe618db58cc11c17190b8e881efa3b245c5bb81a99f4c4263a621747579ea5313f646b171bf7446261b01aa2eda45b81ee0a6ef6cb16c5c4092d2 SHA512 6aa366c9748c8470abef2597684bdd68edb952ec9e8f36e31741a3376bd96aea7cd62caeea47a5ff0fb205f6d2087a63a20baf4767f87321fd54dda2727e1a70
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.270.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.270.0.ebuild
new file mode 100644
index 000000000000..325edf9be2b8
--- /dev/null
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.270.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=1.27
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Localization support for DateTime"
+
+LICENSE="|| ( Artistic GPL-1+ ) unicode"
+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 ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Exporter
+	dev-perl/File-ShareDir
+	virtual/perl-File-Spec
+	>=dev-perl/Params-ValidationCompiler-0.130.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	>=dev-perl/Specio-0.150.0
+	virtual/perl-Storable
+	>=dev-perl/namespace-autoclean-0.190.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		virtual/perl-CPAN-Meta-Requirements
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Temp
+		dev-perl/IPC-System-Simple
+		dev-perl/Path-Tiny
+		dev-perl/Test-File-ShareDir
+		>=virtual/perl-Test-Simple-1.302.15
+		dev-perl/Test2-Plugin-NoWarnings
+		dev-perl/Test2-Suite
+	)
+"
+PERL_RM_FILES=(
+	# https://github.com/houseabsolute/DateTime-Locale/issues/27
+	t/nonexistent-locale.t
+)
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.280.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.280.0.ebuild
new file mode 100644
index 000000000000..980aac922025
--- /dev/null
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.280.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=1.28
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Localization support for DateTime"
+
+LICENSE="|| ( Artistic GPL-1+ ) unicode"
+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 ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Exporter
+	dev-perl/File-ShareDir
+	virtual/perl-File-Spec
+	>=dev-perl/Params-ValidationCompiler-0.130.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	>=dev-perl/Specio-0.150.0
+	virtual/perl-Storable
+	>=dev-perl/namespace-autoclean-0.190.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		virtual/perl-CPAN-Meta-Requirements
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Temp
+		dev-perl/IPC-System-Simple
+		dev-perl/Path-Tiny
+		dev-perl/Test-File-ShareDir
+		>=virtual/perl-Test-Simple-1.302.15
+		dev-perl/Test2-Plugin-NoWarnings
+		dev-perl/Test2-Suite
+	)
+"
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 93a6fcc31fd6..497b2f404270 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -4,3 +4,5 @@ DIST DateTime-Locale-1.03.tar.gz 959190 BLAKE2B 025075d0606c83afacc0b21309068b23
 DIST DateTime-Locale-1.05.tar.gz 959564 BLAKE2B 14ce7e84922d3897829c464e6fff864088a6570afeb2a104802d55468845f8bcd3650b7267216a7c2c6e5337ee2b993175341dd5c8fc5589600b0671a9e220eb SHA512 8e5484e20ccd6f21343dd8eed708f4ec70a0a11f86b83d4a304ebc01b6f8a613d8b08b3a51cf520eeac7730720a996ef36b5e93e771f5fd03f92e283e4ff1f94
 DIST DateTime-Locale-1.16.tar.gz 1228443 BLAKE2B 43b9bc0439d269dd29856538c87ff866337dc989b85d7e677e62ececf93a194b65cfb99eae07c17a97e8d7c2c917cf533e751856e09c1d63684c70de99aac4a9 SHA512 66b09f2f2d9cbb9ed969c6e881dd68a48957d69d5d4cd8a998b7a79538050807d862813eae677ef28ec2ce645c8fc15b9b5de2b15ed077e936d63a44e072a145
 DIST DateTime-Locale-1.26.tar.gz 1389665 BLAKE2B 65423f466472f25de7fd82379183d422a1bb3fbde59defe3a46aeb5d3b3a4806866365af4998a424c0e734ed7072b4f7a3619d07355fba9b681740d389f3f58d SHA512 2b664f931abf4c81b6ff80752b3eb03c7d71aa6cd11da0e925a157ea0838234bc1ccb243ddd129d65f7f47e5e739176591bfe1c7ed2ec4d1476e56bdbe66c1b1
+DIST DateTime-Locale-1.27.tar.gz 1390926 BLAKE2B bb23a61d5649a613028c743e7215e3245786c3a07a6eba4d525451a81deb0755aff6824a91626e74657213fc9b51b5ce685683a941552f3b305a69d60fcc14b9 SHA512 31db31b08535c9d939223475786c85da4eb91ed2de2355b3b7e052603c6ed17c7ee5efb17952aa7868c3e1a25afb2d1c99241e2ff277584e8aa29a538e14ffce
+DIST DateTime-Locale-1.28.tar.gz 1391000 BLAKE2B ec19047a6d0e55db0235db480e96d49d3ef091df8a3b37acd87fc54936923298cb70b55480b048ac64376e28784f6995ce5f42793f626b5e8022078b03c98eee SHA512 5c6349e9115bd8d6dba0b33809f9d8544f0d40802bbf0111005fda4990d3d815b236c44f60a1b5fe8d28d3f2f19343627df2d7ac87158be07e7de4f05c19a763
diff --git a/dev-perl/File-Flat/File-Flat-1.70.0.ebuild b/dev-perl/File-Flat/File-Flat-1.70.0.ebuild
new file mode 100644
index 000000000000..4f0478b194cf
--- /dev/null
+++ b/dev-perl/File-Flat/File-Flat-1.70.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.07
+inherit perl-module
+
+DESCRIPTION="Implements a flat filesystem"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/File-Copy-Recursive-0.350.0
+	>=dev-perl/File-Remove-0.380.0
+	>=virtual/perl-File-Spec-0.850.0
+	>=virtual/perl-File-Temp-0.170.0
+	virtual/perl-IO
+	>=dev-perl/prefork-0.20.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		>=dev-perl/Test-ClassAPI-1.40.0
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
diff --git a/dev-perl/File-Flat/Manifest b/dev-perl/File-Flat/Manifest
index b11ea513d3d8..d0faff580045 100644
--- a/dev-perl/File-Flat/Manifest
+++ b/dev-perl/File-Flat/Manifest
@@ -1 +1,2 @@
 DIST File-Flat-1.04.tar.gz 47183 BLAKE2B a8b4a15057407ad6e3a7c8055e378914d7662d2a6de382957e9a17d20452aea78badbeb7382d9ea7e09eed07202058e72b7ecfe5105f1dad807579e6ffc859bb SHA512 5271c45be6ec057247310f74da13c59e9549d1514e13e8111708ca9288439a198dae95a71d561c07afd2ec32663fac436f7b8df1160c3a7f071b597ba12bd789
+DIST File-Flat-1.07.tar.gz 50489 BLAKE2B 6530483b7f4c44251df9423d733665a368e2ef730f5e4775221e7db10f739f7eae8ec8ee9c38dd6816b59e3e6ec6a01742c9d007c8e18df4b68649fb6ca71780 SHA512 98ae462c3f840c5e661753aa37d1501ded78e8e20d49d00811187e280c70caf3431fcb2cc83311116adb3303676837b20e421da646d7d05c0573b22f6549f9ce
diff --git a/dev-perl/File-Flock/File-Flock-2014.10.0-r1.ebuild b/dev-perl/File-Flock/File-Flock-2014.10.0-r1.ebuild
new file mode 100644
index 000000000000..d49cd04c19de
--- /dev/null
+++ b/dev-perl/File-Flock/File-Flock-2014.10.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MUIR
+DIST_VERSION=2014.01
+DIST_SECTION=modules
+inherit perl-module
+
+DESCRIPTION="flock() wrapper.  Auto-create locks"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/AnyEvent
+	dev-perl/Data-Structure-Util
+	>=dev-perl/IO-Event-0.812.0
+	dev-perl/Event
+	virtual/perl-Time-HiRes
+"
+DEPEND="dev-perl/Module-Build"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		dev-perl/File-Slurp
+		dev-perl/Test-SharedFork
+	)
+"
diff --git a/dev-perl/File-Flock/metadata.xml b/dev-perl/File-Flock/metadata.xml
index 41f16e582e36..a4ee96de855f 100644
--- a/dev-perl/File-Flock/metadata.xml
+++ b/dev-perl/File-Flock/metadata.xml
@@ -8,5 +8,7 @@
   <upstream>
     <remote-id type="cpan">File-Flock</remote-id>
     <remote-id type="cpan-module">File::Flock</remote-id>
+    <remote-id type="cpan-module">File::Flock::Forking</remote-id>
+    <remote-id type="cpan-module">File::Flock::Subprocess</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.4.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.4.0.ebuild
new file mode 100644
index 000000000000..8961d0d6ed87
--- /dev/null
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.4.0.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=REHSACK
+DIST_VERSION=1.004
+inherit perl-module
+
+DESCRIPTION="Get home directory for self or other user"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+xdg test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-File-Path-2.10.0
+	>=virtual/perl-File-Spec-3.120.0
+	>=virtual/perl-File-Temp-0.190.0
+	>=dev-perl/File-Which-0.50.0
+	xdg? ( x11-misc/xdg-user-dirs )
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.900.0
+	)
+"
diff --git a/dev-perl/File-HomeDir/Manifest b/dev-perl/File-HomeDir/Manifest
index e34015e6ef08..6ae68b2faf2e 100644
--- a/dev-perl/File-HomeDir/Manifest
+++ b/dev-perl/File-HomeDir/Manifest
@@ -1 +1,2 @@
 DIST File-HomeDir-1.002.tar.gz 35441 BLAKE2B 01cbebbcc18958cb0056160383880c9749a1e43a4c27e2da9d6a190985929b53b25d3cb50d84766a1a9bc9607c64265c2fd622dc1d0eb4884d7c799edb02ff12 SHA512 4862c78f65785579d4978d3c4d36ba2a71fb78f069b5671d0cedabd6d187fb4377ae40be45b0abfb00df8dd362fbc28032aab2f39acbbe9f1d7bc4a5b24863d4
+DIST File-HomeDir-1.004.tar.gz 35400 BLAKE2B 8628feff38783af9b2035f9bf44ed5b6e6dc121683422da23ff48ffb7492be5e9afa8221f5e21ce36de99151ea0c0cef830628a8fd69668e9db6c2717f9c7df2 SHA512 21671f6badb23fc7e89ef7507266a0b85b9bbf38897b24651f6a84795b5174dd4bfa43251231cbdb1566183e12b253e2504f1fe0f8e195c35d9b5e3d639aa334
diff --git a/dev-perl/File-HomeDir/metadata.xml b/dev-perl/File-HomeDir/metadata.xml
index 96e1c43b26a8..76605c58efa6 100644
--- a/dev-perl/File-HomeDir/metadata.xml
+++ b/dev-perl/File-HomeDir/metadata.xml
@@ -14,7 +14,6 @@
     <remote-id type="cpan-module">File::HomeDir::Driver</remote-id>
     <remote-id type="cpan-module">File::HomeDir::FreeDesktop</remote-id>
     <remote-id type="cpan-module">File::HomeDir::MacOS9</remote-id>
-    <remote-id type="cpan-module">File::HomeDir::TIE</remote-id>
     <remote-id type="cpan-module">File::HomeDir::Test</remote-id>
     <remote-id type="cpan-module">File::HomeDir::Unix</remote-id>
     <remote-id type="cpan-module">File::HomeDir::Windows</remote-id>
diff --git a/dev-perl/File-LibMagic/File-LibMagic-1.220.0-r1.ebuild b/dev-perl/File-LibMagic/File-LibMagic-1.220.0-r1.ebuild
new file mode 100644
index 000000000000..c2d48c908888
--- /dev/null
+++ b/dev-perl/File-LibMagic/File-LibMagic-1.220.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR="DROLSKY"
+DIST_VERSION="1.22"
+
+inherit perl-module
+
+DESCRIPTION="Perl wrapper for libmagic"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-apps/file
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-XSLoader
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Config-AutoConf
+	virtual/perl-ExtUtils-CBuilder
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+src_configure() {
+	unset LD
+	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
+	# Note: the usual approach of passing this to compile doesn't work here
+	# as something is weird and recompiles the code 3 times, once in `make`,
+	# once in `make test` and once again in `make install`, the latter clobbering
+	# the same files generated in other passes. The only sane way to avoid this is
+	# to convince EUMM to hardcode the settings in Makefile, and at least then, it does
+	# the same thing in all 3 stages. BUT THIS SHOULDNT BE HAPPENING
+	# https://github.com/houseabsolute/File-LibMagic/issues/28
+	myconf=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_configure
+}
diff --git a/dev-perl/File-LibMagic/metadata.xml b/dev-perl/File-LibMagic/metadata.xml
index 89daaefc1d56..f40eb4f38cd5 100644
--- a/dev-perl/File-LibMagic/metadata.xml
+++ b/dev-perl/File-LibMagic/metadata.xml
@@ -14,5 +14,6 @@
   <upstream>
     <remote-id type="cpan">File-LibMagic</remote-id>
     <remote-id type="cpan-module">File::LibMagic</remote-id>
+    <remote-id type="cpan-module">File::LibMagic::Constants</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Listing/File-Listing-6.40.0-r2.ebuild b/dev-perl/File-Listing/File-Listing-6.40.0-r2.ebuild
new file mode 100644
index 000000000000..d64609465d01
--- /dev/null
+++ b/dev-perl/File-Listing/File-Listing-6.40.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GAAS
+DIST_VERSION=6.04
+inherit perl-module
+
+DESCRIPTION="Parse directory listings"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Date-6.0.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/File-MMagic/File-MMagic-1.300.0-r2.ebuild b/dev-perl/File-MMagic/File-MMagic-1.300.0-r2.ebuild
new file mode 100644
index 000000000000..a280f03d820c
--- /dev/null
+++ b/dev-perl/File-MMagic/File-MMagic-1.300.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KNOK
+DIST_VERSION=1.30
+inherit perl-module
+
+DESCRIPTION="The Perl Image-Info Module"
+
+SLOT="0"
+LICENSE="File-MMagic"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/File-Map/File-Map-0.670.0.ebuild b/dev-perl/File-Map/File-Map-0.670.0.ebuild
new file mode 100644
index 000000000000..e99adaf70939
--- /dev/null
+++ b/dev-perl/File-Map/File-Map-0.670.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.67
+inherit perl-module
+
+DESCRIPTION="Memory mapping made simple and safe"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/PerlIO-Layers
+	>=dev-perl/Sub-Exporter-Progressive-0.1.5
+	virtual/perl-XSLoader
+"
+DEPEND="dev-perl/Module-Build"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		virtual/perl-IO
+		virtual/perl-Scalar-List-Utils
+		dev-perl/Test-Fatal
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-Warnings-0.5.0
+		virtual/perl-Time-HiRes
+	)
+"
+src_configure() {
+	unset LD
+	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
+	perl-module_src_configure
+}
+src_compile() {
+	./Build --config "optimize=${CFLAGS}" build || die
+}
diff --git a/dev-perl/File-Map/Manifest b/dev-perl/File-Map/Manifest
index 6bd07ab93eda..d73e5c32beea 100644
--- a/dev-perl/File-Map/Manifest
+++ b/dev-perl/File-Map/Manifest
@@ -1 +1,2 @@
 DIST File-Map-0.64.tar.gz 78083 BLAKE2B 66e11275141e72782e9fb4dbb4bbfad75600de0a2b88671d858fe8df2f9a05cd71603998def5f480fe672fb240e4b97b6b2137a4563d9139372f269b9104f4af SHA512 dc1182e79d20e835e19c78f5187dd108b45938209933a7074674d472ac300277fc1fb7604b023ad7d3456ef5837bb8274a94e1cac79f95f2a2235855c59d3809
+DIST File-Map-0.67.tar.gz 104595 BLAKE2B 6a35bb47ca606d905806f8c49cef853067db3f391db3f27657d5b1cf66e24520734ce3aa8f9725d25c859190365bf3bac2a617131bdc99746a0afe5a552dab6a SHA512 52bd9ebb546e6b0e0d58cce3e5f5983c0f89bf05ba3f29d220b6d83ca150e200ac9c6e7d2adb717838c0b20e9ddd68c94509b47775d27273c37bc44dcff1d507
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.ebuild
new file mode 100644
index 000000000000..22e255fcf020
--- /dev/null
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.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=MICHIELB
+DIST_VERSION=0.29
+inherit perl-module
+
+DESCRIPTION="Determine file type"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=dev-perl/File-BaseDir-0.30.0
+	>=dev-perl/File-DesktopEntry-0.40.0
+	x11-misc/shared-mime-info
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+PERL_RM_FILES=(
+	t/06_pod_ok.t
+	t/07_pod_cover.t
+	t/08_changes.t
+	t/09_no404s.t
+)
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index aa8c33f1fbff..4cf96e2e8340 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -1 +1,2 @@
 DIST File-MimeInfo-0.28.tar.gz 32561 BLAKE2B 18a200876fd5b466c52866bb68c6343a8a814b66b5a25511c74af6c759563096bd893ae9ec4732ded9aecdb7caa910a928dde88d00f5147648099df8035971c9 SHA512 894bf234cb5ff01d6bc995f857549e854457cd3eb8df17ce55bb63348def2c63e818d1add8617ad1ace20d9024e68cce954984328707ab51afcc818d47a9d5c0
+DIST File-MimeInfo-0.29.tar.gz 33113 BLAKE2B 5653316aea954cf82ad1c13474b6bb2740834185e12c150b4dba27c1f194986e4c1685764635c1a82659d1c6eb0fdccf66d456a67f9845153e21bd5133c16182 SHA512 3b012843a0934e2df78a28e52efec3cbe10b06fd2be7f3d63f64309752240af2e7ef9440a839aa170197f1037baee5fdcf1c1303fd57349841f37ee7001b68dd
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.470.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.470.0.ebuild
index d65404c8cd0c..9b2ce26b6ff0 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.470.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.470.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild b/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild
index 993e256a166e..252f89e7b203 100644
--- a/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild
+++ b/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extension for manipulating a table composed of HTML::Element style components"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-perl/HTML-Tree-3.01"
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
index 2a15d33bdfb4..f5cca70f2a48 100644
--- a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Perl Table-Extract Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 8c9849718c9c..74cc3f5a4c42 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..43c240075533
--- /dev/null
+++ b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.011
+
+inherit perl-module
+
+DESCRIPTION="Querying your filehandle's capabilities"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# needs List::Util
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-XSLoader
+"
+DEPEND="dev-perl/Module-Build"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.100
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.820.0
+	)
+"
+PERL_RM_FILES=(
+	t/release-pod-coverage.t
+	t/release-pod-syntax.t
+)
+src_configure() {
+	unset LD
+	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
+	perl-module_src_configure
+}
+src_compile() {
+	./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f42845fcdb4b..cdffb5681376 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
index b2eac4903f28..2fa73d3d3f05 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index ef80cb6f557e..80ec6109b58c 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 5216fe8a9b75..5dc62a085516 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index ce7dc6e31ce3..50f51197d3ba 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,3 +2,4 @@ DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7
 DIST dask-2.22.0.tar.gz 2831467 BLAKE2B 641f71c868fe49a027adab11b0a84c091537bfe56a786bbb00215ade5ba5fa7687176f70f12802b06bbcaf00db76f0c97eaa5b87cb65fc28bbe3e37c8b55f2a6 SHA512 90d6391a8dfc36788e819bf09f4ea65a89f37b14d0755fe4ade9179e5d3edd6dada30d5c08ad730f4ac9e08a0cc64a354933f52b92eb13fb8e60093dbcf28567
 DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318dc019573ce6deb7f3a64504608e1e27c3bd9c6766dd98a071ed075065da9beda3f2e5fef27c7bfc9918516d0a SHA512 6ce0f1471357cfa4f5c7f2e2ab31009e68d3e5de363569867d67038ae2e1a9c69552797fb232fb92deafc3b57aa040df9e60669c1856cbb53505a905c4f4b052
 DIST dask-2.24.0.tar.gz 2826106 BLAKE2B fc63bf33f8441a70412e7872c696c071c5e156137fe767007a57f6d2c6a976bd29fff4db20f42c76014bbaf8b763f0a9d974ed1fc62530a3a91633ab97a1a466 SHA512 cf9a781c64eca4be84b82d026cfa1883d54ce18c93625e28c085a7bd63ac129befeded808c817e4adab790c28aa2eeca4f79c7086be683f1a7d30c6d1961c0ae
+DIST dask-2.25.0.tar.gz 2842089 BLAKE2B 048a116a60dd98c7c1f3800426af13c2d8d116772a6b3133823b9a78ae6fcd34ab32dbfb9ae8db9eb6c948bce381e5d6e91caaab78203ae56159493ed7689038 SHA512 0d6e8e8c1efbaa4dc77e1a505e5c2df45eefc43868ce923ec674c5f768f12beb30e06c8712f621e44a826fc11f86fd50e60f0f6a78e261d74273f73b49503301
diff --git a/dev-python/dask/dask-2.25.0.ebuild b/dev-python/dask/dask-2.25.0.ebuild
new file mode 100644
index 000000000000..eb47b5d4660c
--- /dev/null
+++ b/dev-python/dask/dask-2.25.0.ebuild
@@ -0,0 +1,43 @@
+# 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 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
index ed96ef70587a..d8dd48a3bb5a 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index d17b10b1d9d4..0126ae00ea28 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,2 +1,3 @@
 DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
 DIST ecdsa-0.15.tar.gz 122119 BLAKE2B ceeb0204b15d75ada1b201321caff2eb28080bbbf5f6436e6cb50203828eb318d9fe8b8343157b59370183d122e47399a3d2cd6ae569b80d81809d7c778639df SHA512 7b7491d1abdb5ca43456d943c96525fa5d722635c496bbddd04ef8e1baad9dc0aef3d1752afea7820f7796421b18295ee260657ec1e8faf7564613b316c0d603
+DIST ecdsa-0.16.0.tar.gz 125851 BLAKE2B d7fce3fdb0b6e37edb62482bdfc1df6b02f9fba677a6370dd3cb19f04be9cac62900d8347b318bf1d1e39b2af5672d0dde620dedf7b2ed6aefad3392df5279fa SHA512 94ccefe19899a5e56393bb0e6624e9af66bdc60ad370d65900a24a0465c430a3a001ed9c25970e48834cb25ca730bc9279af98d17ecd3ad66189c64c8f864b42
diff --git a/dev-python/ecdsa/ecdsa-0.16.0.ebuild b/dev-python/ecdsa/ecdsa-0.16.0.ebuild
new file mode 100644
index 000000000000..b52fc50c087c
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.16.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=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="https://github.com/warner/python-ecdsa"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gmpy[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/idna[${PYTHON_USEDEP}]' -2)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 87cca397048d..17285bfbc374 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,3 +6,4 @@ DIST hypothesis-python-5.27.0.tar.gz 9067945 BLAKE2B 29cd1fd1b7cd4a2258a84d4dc12
 DIST hypothesis-python-5.28.0.tar.gz 9069739 BLAKE2B c7b404b815053441a7446c947a03a50eaf3030cb2b0387dda697e677af94b1b90e7570603ef3b4f8b26b9afbcdfc1b3708f713202c4a3617c73494f9e13781aa SHA512 7d3f7a88d70d48465a5bb6b995a73dafc4273f4a0cc3d3f2ee0ae125e1b2f52b9a840268acebf80f4dd1e86b5b5998996f2506a665f24044643a299aded0ced1
 DIST hypothesis-python-5.29.0.tar.gz 9070261 BLAKE2B 38781893d6fdf68deae890a150ca07ba5d1fb3c9ba717ea356af8b0b10b21c7e6a4b94b1ec9bca7ba5cb02b0baa18c5a773892fac342767b6dd79cbf2f89bdad SHA512 e3fc350181f86bb9669d4b0d0a43291056550bb73545070e2c7931006393895e7010050f90a063935bedb60bd18a3bad904ca92b147d81254ab50d4868adc8d0
 DIST hypothesis-python-5.29.3.tar.gz 9070885 BLAKE2B 6e106fbc6ed6719c787083c85e3047c49af94478148f4038b59d4ae130b272cffa86a2c117fd2a4f6a798255aa33b0f4714ec08baaf8fb1d5f1d0fb8d4de336a SHA512 fb820057ec257d4dd749f0c6caf10bdcc1e3a090c788900f159456620bec6bd2130e9ffad0ced0155a9f97e2186ed397fa72dbd5548b132ac2c129735c1e716d
+DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
new file mode 100644
index 000000000000..19018a948f1d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+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="~amd64 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		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/ipython/Manifest b/dev-python/ipython/Manifest
index e71d153bdb93..790af047ba73 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1,3 @@
 DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
 DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
+DIST ipython-7.18.0.tar.gz 5138647 BLAKE2B cb6e81468ff7b0d452bd4666a8dc47dda7a7ee7b4685391f222a84db6fddcffa3d41514c1d8a346f07e0c3a89a942893cc7e16ac5888e1c35cc2603698527846 SHA512 2c1cb414d0125aba54dcf98221011d3024d7db0779b2ba79d7c283e2fe918822b59a7771f67e45bf3a60d1a2582862ff3a97475163278961564644373b416029
diff --git a/dev-python/ipython/ipython-7.18.0.ebuild b/dev-python/ipython/ipython-7.18.0.ebuild
new file mode 100644
index 000000000000..cf8e9ceba1a8
--- /dev/null
+++ b/dev-python/ipython/ipython-7.18.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+BDEPEND="
+	test? (
+		${CDEPEND}
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 91a6feffa39e..a3a74cd71d1b 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1,3 @@
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
+DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
diff --git a/dev-python/more-itertools/more-itertools-8.5.0.ebuild b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
new file mode 100644
index 000000000000..b1c4f1688dec
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index e7caf510a82a..ac2db9b50d5b 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 61bcc6c3ae55..278b612c5d9c 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1 +1,2 @@
 DIST numexpr-2.7.1.tar.gz 99196 BLAKE2B 14912a0a50a46c085215f0a40467371859aedeaaf999f747d735df4c244529709b26c1257d3c5c05ed0ceea801d117bf6a330dbd30573fe274522e1101e2f4b3 SHA512 e8852ed1c7bd7f7e94ce5ad78de7a8a7ca30a5873dbfa4fae0a179fbcf956b1e66f2a09c1785f0d8d9e83a5cba359a55840a21784bc225aa01915a322709d370
+DIST numexpr-2.7.2.gh.tar.gz 118982 BLAKE2B b032f00c36ffadb88cf9a4cd6323137b920bce48ec73f88f006d3186f9a8c1d75a11ceb6bd32f412cba5c10cbe3cb518cdbdb19ef022100fcc408fc82ede9881 SHA512 41946df6d642e226b4a38b11d5db67ef91d63d56b33d3b52f09377c022d236ea4e9a5aaaf380737d18405ee25109260ae60f79d0c9465b95de14465f41c40075
diff --git a/dev-python/numexpr/numexpr-2.7.2.ebuild b/dev-python/numexpr/numexpr-2.7.2.ebuild
new file mode 100644
index 000000000000..81aa1d3663c2
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="
+	https://github.com/pydata/numexpr/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )
+"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys,numexpr; sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/pillow/pillow-7.2.0.ebuild b/dev-python/pillow/pillow-7.2.0.ebuild
index 644efb5f2fab..31537f9889ef 100644
--- a/dev-python/pillow/pillow-7.2.0.ebuild
+++ b/dev-python/pillow/pillow-7.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1.ebuild
index 8f9b561a5731..a930d87b203f 100644
--- a/dev-python/pygobject/pygobject-3.36.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 1b6ca4c8a95f..a5e9f3e9241f 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1 +1,2 @@
+DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
 DIST pytest-django-3.9.0.tar.gz 70498 BLAKE2B 0f3cf7ffd528f00dd0c7dd6babcb64833ec3684c7b62dcb8757b0f90cdcdddabffdbff240774ed6fb2a294e27da2acd7f396298ff2884be6e5b4c8d9c632d008 SHA512 92985e66f47c91363d19fe2bfe8ccab14212be577692f90923dbbae4c8d406cf698796d485af2b721863392810fc07c6f11ada0c61589cd1861f0d34a732effe
diff --git a/dev-python/pytest-django/pytest-django-3.10.0.ebuild b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
new file mode 100644
index 000000000000..0dbf356c69a9
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
@@ -0,0 +1,34 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.org
+	https://github.com/pytest-dev/pytest-django"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/reportlab/reportlab-3.5.42.ebuild b/dev-python/reportlab/reportlab-3.5.42.ebuild
index 14abd20e320c..5d22adf0bae2 100644
--- a/dev-python/reportlab/reportlab-3.5.42.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.42.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/responses/responses-0.11.0.ebuild b/dev-python/responses/responses-0.11.0.ebuild
index 0149945ed184..6b113d33a72c 100644
--- a/dev-python/responses/responses-0.11.0.ebuild
+++ b/dev-python/responses/responses-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index dba98937e083..62f537be6043 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1 +1,2 @@
 DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
+DIST statsmodels-0.12.0.tar.gz 17502050 BLAKE2B 8621882d920db652d1244fcd4a0bc4f31310663c4dc6582421cd64a040e0b64917070aef5962515b07a8e92c0d690d43dea19d8ee9b71c7a3c2548e903e69125 SHA512 a9cbba0c8cd7e11bef4fbb303c204d5d4db4eb9f3f93f608b9be5b3c0d7feccc08dd84b4904557fbd1c12f49f3376b2aa7fabd06daf5649fd72c16b7041afac9
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
new file mode 100644
index 000000000000..dfa23119e7a4
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -0,0 +1,83 @@
+# 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 eutils
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/statsmodels-0.11.1-tests.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/ipykernel' \
+	'dev-python/jupyter_client' \
+	'dev-python/matplotlib' \
+	'dev-python/nbconvert' \
+	'dev-python/numpydoc'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	# these tests require internet
+	sed -i -e 's:test_results_on_the:_&:' \
+		statsmodels/stats/tests/test_dist_dependant_measures.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	"${EPYTHON}" -c "
+import statsmodels
+statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
+		|| die "tests fail with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index a05ed2f40bfd..47744da48461 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
index 1a3954e7eceb..d1423f502b17 100644
--- a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 # TODO: linuxfb
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 196be060c31c..245599c7d370 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index d5a606d94101..9312abeb84e9 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1 +1,2 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
+DIST concurrent-ruby-1.1.7.tar.gz 4370284 BLAKE2B ea9120fa6c0c58d758c71d54a7a1371a2a94987141343be92e5d8150167d774b513003bc945b7a54dbae8ef1f15b371f6ec28e6e84828d653fdad5b6b58c63e1 SHA512 2af2f1236850666ef56f6024db3b094051de88bb0495b902f5be9471ded733e998b2845aacba2ff8b166d5097fccd597203502ce58766017cb67c529c2840d29
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild
new file mode 100644
index 000000000000..2b5e4b9e1366
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -i 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 44e632f4c1e5..921d539f3839 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/aastex/Manifest b/dev-tex/aastex/Manifest
deleted file mode 100644
index e93b125c4fe4..000000000000
--- a/dev-tex/aastex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aastex52.tar.gz 1047075 BLAKE2B 8fedbfb392aa87bb6c2e646869f9eb32d725f2c5c5ac9729591bb1c0472ba7845f1b2b9d5f61a49354ac03ff66644bb14f268a574e29bfe7a72c70b7e4a86234 SHA512 1015733b1413cb559d6d96b0d526939f5c505d3cc947c39f790a8c83b4b7316de465f15fb682ca79a2de06d6b826b9a11af4554787eb5a9ff5de9c24a005c9ef
diff --git a/dev-tex/aastex/aastex-5.2.ebuild b/dev-tex/aastex/aastex-5.2.ebuild
deleted file mode 100644
index 14eb473046f6..000000000000
--- a/dev-tex/aastex/aastex-5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-MY_P=${PN/latex-/}${PV//./}
-
-DESCRIPTION="LaTeX package for American Astronomical Society journals. (AASTeX)"
-HOMEPAGE="https://journals.aas.org/authors/aastex.html"
-SRC_URI="https://www.journals.uchicago.edu/AAS/AASTeX/${MY_P}.tar.gz"
-
-LICENSE="LPPL-1.3"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	export VARTEXFONTS="${T}/fonts"
-	latex-package_src_install
-}
diff --git a/dev-tex/herm-pic/Manifest b/dev-tex/herm-pic/Manifest
deleted file mode 100644
index bee1414214b7..000000000000
--- a/dev-tex/herm-pic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hermpic_1.0.2.tar.gz 29668 BLAKE2B d7788e04200ded289447e4ab0a1b49593e36968e86f0da254f5401600f872e3a6114e742cc75c3ad3fce81471c72b694097d161d54c90c0ac6200a2041df8ae4 SHA512 d61b53cd89ccb4bb1d0d7c46fb4dec7517e010bd828beab05c3c8f96353a0881d03d53781c93f9c0e88b9bb97a33a1f405f12148f8dd017fc77266012a8d322c
diff --git a/dev-tex/herm-pic/herm-pic-1.0.2.ebuild b/dev-tex/herm-pic/herm-pic-1.0.2.ebuild
deleted file mode 100644
index 62e39236119b..000000000000
--- a/dev-tex/herm-pic/herm-pic-1.0.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="LaTeX class for creating ERM and HER diagramms"
-HOMEPAGE="http://www.svenies-welt.de/?page_id=26"
-SRC_URI="http://my.dex.de/~sven/downloads/${PN/-}_${PV}.tar.gz"
-
-LICENSE="LPPL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN/-}"
-TEXMF="/usr/share/texmf-site"
diff --git a/dev-tex/hlatex/Manifest b/dev-tex/hlatex/Manifest
deleted file mode 100644
index 0c9797bff26a..000000000000
--- a/dev-tex/hlatex/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST HLaTeX-1.0.1.tar.gz 1133770 BLAKE2B 5f513898cb274493bb7b64e545afe1ed4cf6621ba46a42f9229ac1aca914fd0a8d2627da7c46c61ccf5ffa14f99f660b833a0f9373074e468bc6324614fbb931 SHA512 3a8c3992d8f68a53adc844e413f04aa69404a71bcd1829cbbbe421ee8f2cd4d0bb9e911d7bbe13bd4316522022b7d5e3335eeac41c862855e2c96104a84431a2
-DIST uhc-bom-1.0.tar.gz 1229417 BLAKE2B 0d09cd44f04e4216735c138781715ec6e7268034ef6cf66d2a3fa4d0759a4554e637a2bc9b3ec7287d8f3ff05f5bc832311e5197b5e39617ad5492583c52ae14 SHA512 ca91b9cf248c473e6680d99e2d2b5d9774e90e68527a397fb22ca70742930b6a17939f0552448d20e4083178625a8e15421fd35f79c5f41a1b5fe9b8285a713d
-DIST uhc-dinaru-1.0.tar.gz 4370729 BLAKE2B 99b3e4da956ffbdf23c36476919fc8456ea4470cae38a72030baa69ab47711c753a553ddeeb17c8d618cf6616da28ff0d1aa3279259b8434b39cede104488f72 SHA512 9465851f52891ae091ac9637924d913c9fc7ae84c2ac8221a9d69cec18c146e249b922953c7d4e1d48f658269d21c78a39fe04cda522ef86b2cd977f6b3d5320
-DIST uhc-fonts-1.0.tar.gz 987905 BLAKE2B c87f277e3c4ec432edbda505dc4435ad36cad41e4aa8077d616e841f9ec506d4a1fe8384b03f16960c09d0227fd6b163d879110e14894048e9ae426cac7431f2 SHA512 1f8de83ae0a864690d70ce9ffee9b52c82f1b37c7060f74f807f32464909bd124bd00e9b923bea0d3036773e5e81e99fb488d1d54b0dc4366bf185a966c8dbaa
-DIST uhc-gothic-1.0.tar.gz 8467565 BLAKE2B 71c118961dc486662cf57600af4ba395692cd57792f8ba30cf2b3d8ab3f035c8144af9beb8d92673f6c08bc061228d56f8a44b7df098bc86e2dee3f7cd6b4793 SHA512 da872c167b0aed980bce7c49d63d8c86a523a594de5130c1d45ec953820c02f2105f874487bd5ac921bd0abe24ae08ab9ca5685dc505d05ccd072e2c8e469f54
-DIST uhc-graphic-1.0.tar.gz 3294846 BLAKE2B c8fe3bcb6cdf90352ffe47daca46fb3a559c24206ce96645610c907589c9b992f4ef4d40cf4922cea9fe838f7a6fd82271b8826dfebe645ac4762994ee492922 SHA512 c8a6bca09b1b4eae8baae2946bc4f40d768f18debdacb5038d8fa3b478fd0991469a01c465423037884cdc880c8108a32e26c822fc2c7c5c159c4da499b2d676
-DIST uhc-gungseo-1.0.tar.gz 5414280 BLAKE2B cf9cfe8d25fe5f0db1a4097e00f45d7cb37153e2deb7a6b6d02164a538e3b55342ef9544de5e48c103f343b116ed9f1b2a45a3d4ef2e89c2fd7c40e402b3a440 SHA512 2c2585c824fd42e4d62accb2ba3c79fe0adfaa33c85307aad95df8fe1abeb78a0ba482342eb8510fec9344253a3f0863cb03ac1eac3068eaf7ba6f812b2f5f77
-DIST uhc-jamo-1.0.tar.gz 4158553 BLAKE2B 3ef27b1bf474738c9463b4d3c8a71e218fa8b70adedb714f34e9a09a069898db73aeefde97c2361eaa2e31ebcedbf2756f514e75f7f8a4f7006a98288e120fcd SHA512 46cc4ca88f055c2284dbfe2dc6551dca2f9ce416e56a88cfc4cdaba137782d42b78800921156cab7bd850c5e077ad9edc518c1cb90705ba8f240236455d95734
-DIST uhc-myoungjo-1.0.tar.gz 10684150 BLAKE2B 36f22d37bc5719f5089531a5e9287588998bf01adb760f0e51aff3caa6a4eb2e93b688cdff1364afa380414c30e094d45bb872750a16ea2332d1e275c7e6cb67 SHA512 8dec95764a71bb5ab2ca5f5cb96ddfb9984356bc30946a1bc2efb37dac6208d79e8df54b132a7abf6e3c6648d9635266b4fa8a1e828b3cfb8680f0af6aaff85f
-DIST uhc-pen-1.0.tar.gz 2678371 BLAKE2B 54b3624528528e505b046975e9c39ee1423793ab2e17877977f7408fbc57af83a624566f052c4396c0dab081d3b90ddaabec3355153ccc24bda19a641657fed3 SHA512 40f9bd7b787903a9ccac3b12a3132c65163a9128df4abdba5dbf76b8e2025b4f181d8a495234825633da9e431814cbf3e36ccab879005a620628f6a8e463d07b
-DIST uhc-pilgi-1.0.tar.gz 2305894 BLAKE2B 283dff946ef7731c76c5445b241082c7f8f12891aeea45154183483032d62f420d75e55cc83d32c1029e0e356b3007dd1d139e6240a42ff257c196ad07d13268 SHA512 8bca726947df87c33d38ae9b98c3dcca7c1a3c418fe208f60e451fc2168f8d74b0866c8f20a93dcc5b40c23961f4faa7d67480736efadb9dbce733b8f17ac4c9
-DIST uhc-pilgia-1.0.tar.gz 1465330 BLAKE2B df851a9ce98ee2078be3b0abd2f373fed8e1c5903851e6257eb9e4eb00cf7a0d07bfe2945e690a829befbcc30e753e81e416848e952642f63dae805fa72a9811 SHA512 18eebfe3103c06c838a687157a90cfd1f85b808899c39a821c84cba3af1cf24e8f09f4e3897b2ebc9a898db3f70d0aecf40a8c40621223b95b0977c50aff0b91
-DIST uhc-shinmun-1.0.tar.gz 4794977 BLAKE2B 84e1e3a872acf6897d34261a676fb810ef587108d4ec5b3d1d18545b123478bf2e13b746a676ea806d302d2778af556366f8949e92764f99877e5e910b57a8d6 SHA512 68d25b4dcf0a8284a2b5044a0cec41d3d4f16f54e9e91eacd024b448f34b54681f706eadd9fe879e9187e25f4372ba166a4b26bc3abd40ca02fe7875797d52c6
-DIST uhc-taza-1.0.tar.gz 1338672 BLAKE2B 8c91e9d1c0490c4e63760baa933f6639aa20fd441868d259f21839816e3abbaf6d7e664a0c76d6afb7bca06c86aa2c78e43a6de74273c158d32a2c4368a0e9f3 SHA512 87ae8ff615e76b1a570f14a4d8f29ae3e15a7dccb75c7b80c1e5bb64374c2b749090f9f6a706cfd74c36d39584549cd36bdbd2ede13c50a9c9d5c3b8a44346b8
-DIST uhc-vada-1.0.tar.gz 1225522 BLAKE2B f15ffe19bc9ae2ec83116ab700b12716bea53a8cdc5bb62e5362eff4e17d9feaa2c1decdbf0bc7e2ad1228cd96d95347e415ec91222db44d5d0687143b661b17 SHA512 663ea0a1d3f968dc30387cd7962962969af6c2ade41c6de585f24b116e79ce897539ddb412735bd19a7c1083a69bd975ba198b442ca25ea30d6811ebbb8421ad
-DIST uhc-yetgul-1.0.tar.gz 5198946 BLAKE2B a9795852f0a075b78896f76fe01301104b16b21fd8b44d5545f99c6bbaf038f64a25bd5805ca65b09d627162651814856fb997d933740e19e638e161f597df7d SHA512 e620bfc42eb30d3b3a60964a68071d6ea68a2a6a8f1c9e1d07a3a9c75dcfabb6b26beb5d65ba76c16aaee5f1cd42c87991033d581e49acc67bae923aefaf6ddd
diff --git a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
deleted file mode 100644
index 3e398dd7efbd..000000000000
--- a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs latex-package
-
-MY_P="HLaTeX-${PV}"
-DESCRIPTION="HLaTeX is a LaTeX package to use Hangul with LaTeX"
-HOMEPAGE="http://project.ktug.or.kr/hlatex/"
-UHCFONTS="uhc-myoungjo-1.0.tar.gz
-	uhc-gothic-1.0.tar.gz
-	uhc-taza-1.0.tar.gz
-	uhc-graphic-1.0.tar.gz
-	uhc-gungseo-1.0.tar.gz
-	uhc-shinmun-1.0.tar.gz
-	uhc-pilgi-1.0.tar.gz
-	uhc-pen-1.0.tar.gz
-	uhc-bom-1.0.tar.gz
-	uhc-yetgul-1.0.tar.gz
-	uhc-jamo-1.0.tar.gz
-	uhc-vada-1.0.tar.gz
-	uhc-pilgia-1.0.tar.gz
-	uhc-dinaru-1.0.tar.gz"
-
-SRC_URI="ftp://ftp.ktug.or.kr/pub/ktug/hlatex/${MY_P}.tar.gz
-	ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz
-	${UHCFONTS//uhc-/ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-S="${WORKDIR}/HLaTeX"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	unpack uhc-fonts-1.0.tar.gz
-	cd "${S}"/contrib || die
-	cat >Makefile <<-EOF
-CC=$(tc-getCC)
-all: hmakeindex hbibtex
-hmakeindex: hmakeindex.c
-hbibtex: hbibtex.c
-EOF
-}
-
-src_compile() {
-	cd "${S}"/contrib || die
-	emake
-}
-
-src_install() {
-	cd "${S}"/latex || die
-		insinto ${TEXMF}/tex/latex/hlatex
-		doins *
-
-	cd "${S}"/lambda || die
-		insinto ${TEXMF}/tex/lambda/hlatex
-		doins u8hangul.tex uhc-test.tex uhc*.fd
-
-		insinto ${TEXMF}/omega/otp/hlatex
-		doins hlatex.otp
-
-		insinto ${TEXMF}/omega/ocp/hlatex
-		doins hlatex.ocp
-
-	cd "${S}"/contrib || die
-		insinto ${TEXMF}/tex/latex/hlatex
-		doins hbname-k.tex khyper.sty showhkeys.sty showhtags.sty
-		doins hangulfn.sty hfn-k.tex
-
-		insinto ${TEXMF}/tex/lambda/hlatex
-		doins hbname-u.tex hfn-u.tex
-
-		insinto ${TEXMF}/bibtex/bst/hlatex
-		doins halpha.bst
-
-		insinto ${TEXMF}/makeindex
-		doins hind.ist hglo.ist
-
-		dobin hmakeindex hbibtex
-
-	cd "${S}" || die
-		dodoc ChangeLog.ko NEWS* README.en
-
-	cd "${WORKDIR}"/uhc-fonts-1.0 || die
-		insinto ${TEXMF}/fonts/map/hlatex
-		doins uhc-base.map uhc-extra.map
-
-	cd "${ED}"/${TEXMF}/fonts || die
-	for X in ${UHCFONTS}
-	do
-		unpack ${X}
-	done
-}
-
-pkg_postinst() {
-	updmap-sys --enable Map=uhc-base.map || die
-	updmap-sys --enable Map=uhc-extra.map || die
-	texhash || die
-}
-
-pkg_postrm() {
-	if [ ! -e "${EPREFIX}"${TEXMF}/fonts/map/hlatex/uhc-base.map ] ; then
-		updmap-sys --disable Map=uhc-base.map || die
-	fi
-
-	if [ ! -e "${EPREFIX}"${TEXMF}/fonts/map/hlatex/uhc-extra.map ] ; then
-		updmap-sys --disable Map=uhc-extra.map || die
-	fi
-
-	texhash || die
-}
diff --git a/dev-tex/hlatex/metadata.xml b/dev-tex/hlatex/metadata.xml
deleted file mode 100644
index f875b7d0ebe4..000000000000
--- a/dev-tex/hlatex/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/slatex/Manifest b/dev-tex/slatex/Manifest
deleted file mode 100644
index da5cf04cb08e..000000000000
--- a/dev-tex/slatex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST slatex-20090928_p20180415.tar.bz2 48075 BLAKE2B b79b11a790411cd02a1e5bcb8c2db023696d4387e0b68af79f0f06cdfbc7e0bd59b0274e6fd5a13665de86274a20998dfa64f45f72c3468773c668a5bf0e2ecf SHA512 13d86f30409918d46d83f4c052d19ab48521f2435c3c142e673aac81e42c04bd2b0f597d46002bc7cc3109215b1954b23329266ad346d123845b6d9a8f45efc4
diff --git a/dev-tex/slatex/metadata.xml b/dev-tex/slatex/metadata.xml
deleted file mode 100644
index 909e90edc462..000000000000
--- a/dev-tex/slatex/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-SLaTeX  is a Scheme program that allows you to write programs or program fragments ``as is'' in your TeX or LaTeX source. It is particularly geared to the programming languages Scheme and other Lisps, eg, Common Lisp. The formatting of the code includes assigning appropriate fonts and colors to the various tokens in the code (keywords, variables, constants, data), at the same time retaining the proper indentation when going to the non-monospace (non-typewriter) fonts provided by TeX. SLaTeX comes with two databases that recognize the identifier conventions of Scheme and Common Lisp respectively. These can be modified by the user with easy TeX commands. In addition, the user can tell SLaTeX to typeset certain identifiers as specially suited TeX expressions (ie, beyond just fonting them). All this is done without interfering with the identifier conventions of the language of the programming code. In sum, no change need be made to your (presumably running) program code in order to get a typeset version with a desired look: You can get a spectrum of styles ranging from no fonting through basic default fonting to various ``mathematical''-looking output for pedagogic or other reasons.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-tex/slatex/slatex-20090928_p20180415.ebuild b/dev-tex/slatex/slatex-20090928_p20180415.ebuild
deleted file mode 100644
index afcfca95701d..000000000000
--- a/dev-tex/slatex/slatex-20090928_p20180415.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# for updating the texmf database, id est latex-package_rehash
-inherit latex-package
-
-DESCRIPTION="A Scheme program allowing you to write Scheme in your (La)TeX source"
-HOMEPAGE="http://www.ccs.neu.edu/home/dorai/slatex/slatxdoc.html"
-SRC_URI="http://www.ccs.neu.edu/home/dorai/slatex/${PN}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-scheme/guile"
-DEPEND="${RDEPEND}
-	dev-scheme/scmxlate"
-
-S="${WORKDIR}/${PN}"
-
-TARGET_DIR="/usr/share/${PN}"
-
-src_prepare() {
-	default
-	sed "s:\"/home/dorai/.www/slatex/slatex.scm\":\"${TARGET_DIR}/slatex.scm\":" \
-		-i scmxlate-slatex-src.scm || die "sed failed"
-}
-
-src_compile() {
-	local command="(load \"/usr/share/scmxlate/scmxlate.scm\")"
-	guile -c "${command}" <<< "guile" || die
-}
-
-src_install() {
-	insinto "${TARGET_DIR}"
-	doins slatex.scm
-	insinto "${TEXMF}/tex/latex/${PN}"
-	doins slatex.sty
-	dobin slatex
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0488fa6ec2d8..6764028cf539 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index 0077d0818306..eb7a7add915a 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index cb38de99a7a9..d174cb07bab3 100644
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ b/dev-util/meson/meson-0.54.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 17191a3a8c8f..6b00adf510f9 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/strace/strace-5.8.ebuild b/dev-util/strace/strace-5.8.ebuild
index 2484fd485531..ab5cf395d002 100644
--- a/dev-util/strace/strace-5.8.ebuild
+++ b/dev-util/strace/strace-5.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 647e252433ed..3952e15656c5 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 47b0db349561..048d0c9b016c 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -176,6 +176,9 @@ kernel-build_src_install() {
 	local image_path=$(kernel-install_get_image_path)
 	cp -p "build/${image_path}" "${ED}/usr/src/linux-${ver}/${image_path}" || die
 
+	# building modules fails with 'vmlinux has no symtab?' if stripped
+	use ppc64 && dostrip -x "/usr/src/linux-${ver}/${image_path}"
+
 	# strip empty directories
 	find "${D}" -type d -empty -exec rmdir {} + || die
 
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 558e4979168d..f834670d4574 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -59,7 +59,9 @@ RESTRICT+="
 	!test? ( test )
 	test? ( userpriv )
 	arm? ( test )
-	arm64? ( test )"
+	arm64? ( test )
+	ppc64? ( test )
+"
 
 # install-DEPEND actually
 # note: we need installkernel with initramfs support!
@@ -109,6 +111,11 @@ kernel-install_get_image_path() {
 		arm)
 			echo arch/arm/boot/zImage
 			;;
+		ppc64)
+			# ./ is required because of ${image_path%/*}
+			# substitutions in the code
+			echo ./vmlinux
+			;;
 		*)
 			die "${FUNCNAME}: unsupported ARCH=${ARCH}"
 			;;
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 78c469848022..8fe3e49bb02c 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
index 0aeebc31a62b..ecd76288ebbc 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a07fab7cb63b..612fe22244f3 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 66b4d991a68e..46a34d7a4ab2 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,2 +1 @@
-DIST balsa-2.5.6.tar.bz2 4468877 BLAKE2B 1e7f678c69121fe3472bbba8dc3d2a62680e1969934580a8a85725e84676531f1efb8432380c2d537ca584001c5cecd5c76cd033a1c1e68a292fc765bbc15f8d SHA512 a9c8094ac48b9b1a0971fe45a4658b728f93ad170ad7884c9554420a4696a7b6f5b3661bde8ab070f6a5c14a80f67551745e1d40905881429ae1d8e5874e9a68
 DIST balsa-2.6.1.tar.bz2 4535550 BLAKE2B eee4530fe9bdd0f9453178fb7a9e64584193221754dd8fc75703ec5f98214999a9d323357b415ead2fc218461adb4d0d082389f236c6f864b54a90790c889130 SHA512 242c93e698390647b93f7e163b547b326675a0600ff5c50c2db3f3e08cd045e32cec4bb69f8a44ef3443d4cf03cb194ac7971d2a0e55f7c84b273a2b627e2433
diff --git a/mail-client/balsa/balsa-2.5.6-r1.ebuild b/mail-client/balsa/balsa-2.5.6-r1.ebuild
deleted file mode 100644
index b02520128ed9..000000000000
--- a/mail-client/balsa/balsa-2.5.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Email client for GNOME"
-HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
-SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-
-IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface"
-
-# TODO: internal spell checking via enchant-2 instead of gtkspell/gspell?
-RDEPEND="
-	>=app-text/gspell-1.2:0=
-	>=dev-libs/glib-2.40.0:2
-	net-libs/gnutls:=
-	>=x11-libs/gtk+-3.10.0:3
-	dev-libs/gmime:2.6
-	net-mail/mailbase
-	media-libs/libcanberra:=[gtk3]
-	x11-themes/hicolor-icon-theme
-	x11-themes/adwaita-icon-theme
-	crypt? ( >=app-crypt/gpgme-1.5.0:= )
-	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	sqlite? ( >=dev-db/sqlite-2.8:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	rubrica? ( dev-libs/libxml2:2 )
-	webkit? (
-		net-libs/webkit-gtk:4
-		app-text/html2text
-	)
-	xface? ( >=media-libs/compface-1.5.1:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-update-icon-cache
-	app-text/yelp-tools
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-libs/libxml2:2
-"
-
-PATCHES=( "$FILESDIR"/${P}-fix-older-webkit{1,2}.patch )
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-canberra \
-		--with-spell-checker=gspell \
-		$(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
-		$(use_with gnome) \
-		$(use_with gnome gtksourceview) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with kerberos gss) \
-		$(use_with ldap) \
-		$(use_with libnotify) \
-		$(use_with rubrica) \
-		$(use_with sqlite) \
-		$(use_with xface compface) \
-		$(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
-}
diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
deleted file mode 100644
index 227e2ac04b4f..000000000000
--- a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From ea37ea940dfbcc4e6bcf8327194857a7b306a278 Mon Sep 17 00:00:00 2001
-From: Peter Bloomfield
-Date: Sat, 7 Jul 2018 14:44:26 -0400
-Subject: [PATCH] Use g_debug() instead of conditional compilation
-
-* libbalsa/html.c (lbh_navigation_policy_decision),
-  (lbh_new_window_policy_decision), (lbh_response_policy_decision),
-  (lbh_resource_notify_response_cb), (lbh_web_process_crashed_cb),
-  (lbh_cid_cb), (libbalsa_html_new): Use g_debug() instead of
-  conditionally compiled printing.
----
- libbalsa/html.c | 52 ++++++++++++++++++++++++-------------------------
- 2 files changed, 25 insertions(+), 27 deletions(-)
-
-diff --git a/libbalsa/html.c b/libbalsa/html.c
-index 17f62789e..1e5e2f500 100644
---- a/libbalsa/html.c
-+++ b/libbalsa/html.c
-@@ -44,6 +44,11 @@
- #include <string.h>
- #include <glib/gi18n.h>
- 
-+#ifdef G_LOG_DOMAIN
-+#  undef G_LOG_DOMAIN
-+#endif
-+#define G_LOG_DOMAIN "html"
-+
- #ifdef HAVE_HTML_WIDGET
- 
- /*
-@@ -141,13 +146,6 @@ html2text(gchar ** text, gsize len)
-  * Experimental support for WebKit2.
-  */
- 
--#define DEBUG_WEBKIT2 FALSE
--#if DEBUG_WEBKIT2
--#define d(x) x
--#else
--#define d(x)
--#endif
--
- /* WebKitContextMenuItem uses GtkAction, which is deprecated.
-  * We don't use it, but it breaks the git-tree build, so we just mangle
-  * it: */
-@@ -280,10 +278,10 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision,
- 
-     switch (navigation_type) {
-     case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED:
--        d(g_print("%s clicked %s\n", __func__, uri));
-+        g_debug("%s clicked %s", __func__, uri);
-         (*info->clicked_cb) (uri);
-     default:
--        d(g_print("%s uri %s, type %d, ignored\n", __func__, uri, navigation_type));
-+        g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
-         webkit_policy_decision_ignore(decision);
-     }
- }
-@@ -305,13 +303,13 @@ lbh_new_window_policy_decision(WebKitPolicyDecision * decision,
-             (navigation_action)) {
-     case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED:
-         request = webkit_navigation_action_get_request(navigation_action);
--        d(g_print("%s clicked %s\n", __func__,
--                  webkit_uri_request_get_uri(request)));
-+        g_debug("%s clicked %s", __func__,
-+                webkit_uri_request_get_uri(request));
-         (*info->clicked_cb) (webkit_uri_request_get_uri(request));
-     default:
--        d(g_print("%s type %d, ignored\n", __func__,
--                  webkit_navigation_action_get_navigation_type
--                  (navigation_action)));
-+        g_debug("%s type %d, ignored", __func__,
-+                webkit_navigation_action_get_navigation_type
-+                (navigation_action));
- 
-         webkit_policy_decision_ignore(decision);
-     }
-@@ -321,10 +319,10 @@ static void
- lbh_response_policy_decision(WebKitPolicyDecision * decision,
-                              gpointer               data)
- {
--    d(g_print("%s uri %s, ignored\n", __func__,
--              webkit_uri_request_get_uri
--              (webkit_response_policy_decision_get_request
--               (WEBKIT_RESPONSE_POLICY_DECISION(decision)))));
-+    g_debug("%s uri %s, ignored", __func__,
-+            webkit_uri_request_get_uri
-+            (webkit_response_policy_decision_get_request
-+             (WEBKIT_RESPONSE_POLICY_DECISION(decision))));
-     webkit_policy_decision_ignore(decision);
- }
- 
-@@ -453,20 +451,20 @@ lbh_resource_notify_response_cb(WebKitWebResource * resource,
- 
-     response = webkit_web_resource_get_response(resource);
-     mime_type = webkit_uri_response_get_mime_type(response);
--    d(g_print("%s mime-type %s\n", __func__, mime_type));
-+    g_debug("%s mime-type %s", __func__, mime_type);
-     if (g_ascii_strncasecmp(mime_type, "image/", 6) != 0)
-         return;
- 
-     if (info->info_bar) {
--        d(g_print("%s %s destroy info_bar\n", __func__,
--                  webkit_web_resource_get_uri(resource)));
-+        g_debug("%s %s destroy info_bar", __func__,
-+                webkit_web_resource_get_uri(resource));
-         /* web_view is loading an image from its cache, so we do not
-          * need to ask the user for permission to download */
-         gtk_widget_destroy(info->info_bar);
-         info->info_bar = NULL;
-     } else {
--        d(g_print("%s %s null info_bar\n", __func__,
--                  webkit_web_resource_get_uri(resource)));
-+        g_debug("%s %s null info_bar", __func__,
-+                webkit_web_resource_get_uri(resource));
-     }
- }
- 
-@@ -493,7 +491,7 @@ static gboolean
- lbh_web_process_crashed_cb(WebKitWebView * web_view,
-                            gpointer        data)
- {
--    d(g_print("%s\n", __func__));
-+    g_debug("%s", __func__);
-     return FALSE;
- }
- 
-@@ -509,7 +507,7 @@ lbh_cid_cb(WebKitURISchemeRequest * request,
-     LibBalsaMessageBody *body;
- 
-     path = webkit_uri_scheme_request_get_path(request);
--    d(g_print("%s path %s\n", __func__, path));
-+    g_debug("%s path %s", __func__, path);
- 
-     if ((body =
-          libbalsa_message_get_part_by_id(info->body->message, path))) {
-@@ -616,7 +614,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
-         webkit_web_context_register_uri_scheme(context, "cid", lbh_cid_cb,
-                                                &info, NULL);
-         have_registered_cid = TRUE;
--        d(g_print("%s registered cid: scheme\n", __func__));
-+        g_debug("%s registered cid: scheme", __func__);
-     }
- 
-     settings = webkit_web_view_get_settings(web_view);
-@@ -647,7 +645,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
-     if (g_regex_match_simple(src_regex, text, G_REGEX_CASELESS, 0)) {
-         info->info_bar = lbh_info_bar(info);
-         gtk_box_pack_start(GTK_BOX(vbox), info->info_bar, FALSE, FALSE, 0);
--        d(g_print("%s shows info_bar\n", __func__));
-+        g_debug("%s shows info_bar", __func__);
-     }
- 
-     webkit_web_view_load_html(web_view, text, NULL);
--- 
-2.17.1
-
diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch
deleted file mode 100644
index d7b5eb74ba1c..000000000000
--- a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3423ca9bf48e675007b7fb1bd61b50aa97d14890 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Albrecht=20Dre=C3=9F?=
-Date: Sat, 7 Jul 2018 16:36:49 -0400
-Subject: [PATCH] html: Fix HTML rendering with webkit2gtk-4.0 < 2.20
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* README: document use of G_MESSAGES_DEBUG=…
-* libbalsa/html.c (lbh_navigation_policy_decision):
-  allow the rendering of “about:blank”.
----
- libbalsa/html.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-leio: trimmed out the G_MESSAGES_DEBUG doc changes
-diff --git a/libbalsa/html.c b/libbalsa/html.c
-index 1e5e2f500..307194e0a 100644
---- a/libbalsa/html.c
-+++ b/libbalsa/html.c
-@@ -44,13 +44,13 @@
- #include <string.h>
- #include <glib/gi18n.h>
- 
-+#ifdef HAVE_HTML_WIDGET
-+
- #ifdef G_LOG_DOMAIN
- #  undef G_LOG_DOMAIN
- #endif
- #define G_LOG_DOMAIN "html"
- 
--#ifdef HAVE_HTML_WIDGET
--
- /*
-  * Used by all HTML widgets
-  *
-@@ -281,8 +281,12 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision,
-         g_debug("%s clicked %s", __func__, uri);
-         (*info->clicked_cb) (uri);
-     default:
--        g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
--        webkit_policy_decision_ignore(decision);
-+        if (g_ascii_strcasecmp(uri, "about:blank") != 0) {
-+            g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
-+        	webkit_policy_decision_ignore(decision);
-+        } else {
-+        	g_debug("%s uri %s, type %d loaded", __func__, uri, navigation_type);
-+        }
-     }
- }
- 
--- 
-2.17.1
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 3f5668996d9a..41e5bdd66376 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="crypt">Adds support for GnuPG encryption</flag>
 		<flag name="rubrica">Adds support for rubrica addressbook</flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index f55f4210f46e..14facb20cbd0 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1 +1 @@
-DIST geary-3.36.2.tar.xz 2416928 BLAKE2B 983357ffe5e6be637d992a530d8bee3ff90257620a73df628b6e36f18dc021d97eba6f2ef59290d3ab8e7c781a39c50b67e42104d51f0ad51e65f2de00c95352 SHA512 a3cca301a3668eb2e70f8bfc147abef9088de4e822efab4ecc44830fbc394265d1fa37267a1f8fa97b6e8d1ac8a8adb76e5dd9e509490ac567e05bd243e8ea20
+DIST geary-3.36.3.1.tar.xz 2426684 BLAKE2B 0e52b11d515c072c610f60070f3634f98a8f89f8580ee9e59a6eca8144680c616c0984d31ad6f3a0044c08fe6a1f2b45065059561c20c9c796403d2eb088f567 SHA512 c1c659cbadbdcb4cedefb0db7c5548af55cd07c30bc4acafb96e69faa6b730a2c5ba06abceedc409fddd9768249600ebc7643b9cfe2175e6d4d2d7926a55dbb6
diff --git a/mail-client/geary/geary-3.36.2.ebuild b/mail-client/geary/geary-3.36.3.1.ebuild
similarity index 94%
rename from mail-client/geary/geary-3.36.2.ebuild
rename to mail-client/geary/geary-3.36.3.1.ebuild
index ceb796d44e84..071e4c68efe2 100644
--- a/mail-client/geary/geary-3.36.2.ebuild
+++ b/mail-client/geary/geary-3.36.3.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 VALA_MIN_API_VERSION="0.44"
+VALA_MAX_API_VERSION="0.48" # fails tests with 0.50 in v3.36.3.1 - https://gitlab.gnome.org/GNOME/geary/-/issues/958
 
 inherit gnome.org gnome2-utils meson vala virtualx xdg
 
diff --git a/mail-client/roundcube/roundcube-1.4.8.ebuild b/mail-client/roundcube/roundcube-1.4.8.ebuild
index 6d3b3ede4e45..f39bfa3d9793 100644
--- a/mail-client/roundcube/roundcube-1.4.8.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-co
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
 
 IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 24bc04b2f098..7f6fb9615e10 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 91b7cdd85634..bc2d122ef7c6 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1 +1,2 @@
 DIST gst-rtsp-server-1.14.5.tar.xz 672180 BLAKE2B 3e67f703c190e46580cf7c08a9437d51e9c1e009dd27cf359ecd5aa301ddda6cd70c0d5567e72c6e5f9443318e899a9b55e6883c71c9fc021f77286afd89bbc9 SHA512 dbfb63fb219808d2a32d710bef33d2b3b9906300d4c527c72534a4cb6db0f5ce4f4fadcedf7f6a3a5f46005f4408717d9aafa1a510c4aed18f5d07d6b3646492
+DIST gst-rtsp-server-1.16.2.tar.xz 693368 BLAKE2B 612b59bc3a08167a81790c8d5164efebb8756ce3d3c9c278a0363bd640929b14d2fb1c26454a513dbaa9e093a702e7553950b6210ef57a6e9188a059c81650d3 SHA512 e18d87ae309594ffd7917b1804e595b83d5002518608f0ee03b9e68ab9bdf771ec2f691e50408618a6d1a39495c123e8288b3179e6cdaef65a38ef404544e0eb
diff --git a/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch b/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch
new file mode 100644
index 000000000000..87b2e54973b4
--- /dev/null
+++ b/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch
@@ -0,0 +1,39 @@
+From ccc8d0c4388056acc801fd855e065eb2b0ca6578 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Mon, 23 Mar 2020 16:06:43 +0200
+Subject: [PATCH 3/3] rtsp-auth: Fix NULL pointer dereference when handling an
+ invalid basic Authorization header
+
+When using the basic authentication scheme, we wouldn't validate that
+the authorization field of the credentials is not NULL and pass it on
+to g_hash_table_lookup(). g_str_hash() however is not NULL-safe and will
+dereference the NULL pointer and crash.
+A specially crafted (read: invalid) RTSP header can cause this to
+happen.
+
+As a solution, check for the authorization to be not NULL before
+continuing processing it and if it is simply fail authentication.
+
+This fixes CVE-2020-6095 and TALOS-2020-1018.
+
+Discovered by Peter Wang of Cisco ASIG.
+---
+ gst/rtsp-server/rtsp-auth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c
+index f14286f..c15fa18 100644
+--- a/gst/rtsp-server/rtsp-auth.c
++++ b/gst/rtsp-server/rtsp-auth.c
+@@ -871,7 +871,7 @@ default_authenticate (GstRTSPAuth * auth, GstRTSPContext * ctx)
+ 
+       GST_DEBUG_OBJECT (auth, "check Basic auth");
+       g_mutex_lock (&priv->lock);
+-      if ((token =
++      if ((*credential)->authorization && (token =
+               g_hash_table_lookup (priv->basic,
+                   (*credential)->authorization))) {
+         GST_DEBUG_OBJECT (auth, "setting token %p", token);
+-- 
+2.20.1
+
diff --git a/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch b/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch
new file mode 100644
index 000000000000..679c5c5207cf
--- /dev/null
+++ b/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch
@@ -0,0 +1,59 @@
+From df227481504574ecc6028400d17870913a16a047 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jordan@centricular.com>
+Date: Thu, 23 Jan 2020 16:41:26 +0200
+Subject: [PATCH 2/3] rtsp-latency-bin: replace G_TYPE_INSTANCE_GET_PRIVATE as
+ it's been deprecated
+
+from glib
+```
+Deprecated: 2.58: Use %G_ADD_PRIVATE and the generated
+  `your_type_get_instance_private()` function instead
+```
+---
+ gst/rtsp-server/rtsp-latency-bin.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/gst/rtsp-server/rtsp-latency-bin.c b/gst/rtsp-server/rtsp-latency-bin.c
+index cf7cdf1..c297ab6 100644
+--- a/gst/rtsp-server/rtsp-latency-bin.c
++++ b/gst/rtsp-server/rtsp-latency-bin.c
+@@ -23,9 +23,6 @@
+ #include <gst/gst.h>
+ #include "rtsp-latency-bin.h"
+ 
+-#define GST_RTSP_LATENCY_BIN_GET_PRIVATE(obj)  \
+-     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_RTSP_LATENCY_BIN_TYPE, GstRTSPLatencyBinPrivate))
+-
+ struct _GstRTSPLatencyBinPrivate
+ {
+   GstPad *sinkpad;
+@@ -106,7 +103,7 @@ gst_rtsp_latency_bin_get_property (GObject * object, guint propid,
+ {
+   GstRTSPLatencyBin *latency_bin = GST_RTSP_LATENCY_BIN (object);
+   GstRTSPLatencyBinPrivate *priv =
+-      GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin);
++      gst_rtsp_latency_bin_get_instance_private (latency_bin);
+ 
+   switch (propid) {
+     case PROP_ELEMENT:
+@@ -140,7 +137,7 @@ gst_rtsp_latency_bin_add_element (GstRTSPLatencyBin * latency_bin,
+     GstElement * element)
+ {
+   GstRTSPLatencyBinPrivate *priv =
+-      GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin);
++      gst_rtsp_latency_bin_get_instance_private (latency_bin);
+   GstPad *pad;
+   GstPadTemplate *templ;
+ 
+@@ -250,7 +247,7 @@ static gboolean
+ gst_rtsp_latency_bin_recalculate_latency (GstRTSPLatencyBin * latency_bin)
+ {
+   GstRTSPLatencyBinPrivate *priv =
+-      GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin);
++      gst_rtsp_latency_bin_get_instance_private (latency_bin);
+   GstEvent *latency;
+   GstQuery *query;
+   GstClockTime min_latency;
+-- 
+2.20.1
+
diff --git a/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch b/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch
new file mode 100644
index 000000000000..2707c3ebdc05
--- /dev/null
+++ b/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch
@@ -0,0 +1,25 @@
+From 9dfdcb71e84e53e25388a6e0b485a70c45ea0dec Mon Sep 17 00:00:00 2001
+From: Nicola Murino <nicola.murino@gmail.com>
+Date: Thu, 12 Dec 2019 17:56:18 +0100
+Subject: [PATCH 1/3] rtsp-auth: fix default token leak
+
+---
+ gst/rtsp-server/rtsp-auth.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c
+index f676b80..f14286f 100644
+--- a/gst/rtsp-server/rtsp-auth.c
++++ b/gst/rtsp-server/rtsp-auth.c
+@@ -214,6 +214,8 @@ gst_rtsp_auth_finalize (GObject * obj)
+   g_hash_table_unref (priv->basic);
+   g_hash_table_unref (priv->digest);
+   g_hash_table_unref (priv->nonces);
++  if (priv->default_token)
++    gst_rtsp_token_unref (priv->default_token);
+   g_mutex_clear (&priv->lock);
+   g_free (priv->realm);
+ 
+-- 
+2.20.1
+
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild
new file mode 100644
index 000000000000..b353ef4e8f72
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-leak-fix.patch
+	"${FILESDIR}"/${PV}-glib-deprecation-fix.patch
+	"${FILESDIR}"/${PV}-CVE-2020-6095.patch
+)
+
+multilib_src_configure() {
+	# debug: only adds -g to CFLAGS
+	# docbook: nothing behind that switch
+	# libcgroup is automagic and only used in examples
+	gstreamer_multilib_src_configure \
+		--disable-debug \
+		--disable-valgrind \
+		--disable-examples \
+		--disable-docbook \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		--disable-tests \
+		LIBCGROUP_LIBS= \
+		LIBCGROUP_FLAGS=
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi ; then
+		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	# Handle broken upstream modifications to defaults of gtk-doc
+	emake install -C docs/libs DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
index aff5b31e231a..481057b2b593 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs utils"
 # Tests need DejaGnu but are non-existent (just an empty framework)
 RESTRICT="test"
diff --git a/media-libs/openal/openal-1.20.1.ebuild b/media-libs/openal/openal-1.20.1.ebuild
index 08bda9c75751..60bbdc3bd66d 100644
--- a/media-libs/openal/openal-1.20.1.ebuild
+++ b/media-libs/openal/openal-1.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 33c2f1e59427..f55cf4878482 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 3a52761933b2..c5438ee56721 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1 +1,2 @@
 DIST tucnak-4.21.tar.gz 3545924 BLAKE2B dabc9647e4fde5c8c3b3e9b2ee5f072ce6e85138c6a45f635c05dcf47763a39e191a6ac3d97e71b79d3913915126261f565f8e273cd257731e04bc5ab7956aab SHA512 73fe2e92a0db3a8e152cfc25bbaefdeec6fd7f11223d02eae6c1ac5526c02404e89ecd4f2f715e7fda1d72fd872fc240694ce674d57a95c03417cf59dbd6532c
+DIST tucnak-4.22.tar.gz 3547159 BLAKE2B 4a08bc0f7cfa5bbef6d367e7d5780707b6500bf35938ba38bab779ab68e379dd48f6f08146c042e10f2fe4eb7c6d807fef4a8c64ab4ddd8d4fff25f9a0765436 SHA512 d4ec3707137e7a79ede5722806f30f6442988b6cf79e15578978344d6f3dc978a4ef7bfff215458a65d7436e6344e7288c911e499ad3c03b9edb754cd390e2fc
diff --git a/media-radio/tucnak/tucnak-4.22.ebuild b/media-radio/tucnak/tucnak-4.22.ebuild
new file mode 100644
index 000000000000..b4c1192a2e40
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.22.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 38e1f7eb7f8c..f1c68d3f6e87 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 8945b895acfc..743c6c7aaec6 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,3 +1,2 @@
 DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e
-DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
deleted file mode 100644
index 3e33153f3ddf..000000000000
--- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils ltprune python-single-r1
-
-DESCRIPTION="a package for multitrack audio processing"
-HOMEPAGE="https://ecasound.seul.org/ecasound/"
-SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
-python ruby sndfile static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lv2 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib:= )
-	audiofile? ( media-libs/audiofile:= )
-	jack? ( virtual/jack:= )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lv2? ( >=media-libs/lilv-0.5.0:= )
-	media-libs/ladspa-sdk
-	mikmod? ( media-libs/libmikmod:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	oil? ( dev-libs/liboil:= )
-	osc? ( media-libs/liblo:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby )
-	sndfile? ( media-libs/libsndfile:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.1-ldflags.patch
-	"${FILESDIR}"/${PN}-2.9.1-tinfo.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-#	if use python ; then
-#		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
-#			pyecasound/Makefile.am || die "sed failed"
-#	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local pyconf=()
-
-	if use python ; then
-		pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" )
-	fi
-
-	econf \
-		--disable-arts \
-		--enable-shared \
-		--enable-sys-readline \
-		--with-largefile \
-		$(use_enable alsa) \
-		$(use_enable audiofile) \
-		$(use_enable debug) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate) \
-		$(use_enable lv2 liblilv) \
-		$(use_enable ncurses) \
-		$(use_enable oil liboil) \
-		$(use_enable osc liblo) \
-		$(use_enable oss) \
-		$(use_enable python pyecasound) \
-		$(use_enable ruby rubyecasound) \
-		$(use_enable sndfile) \
-		$(use_enable static-libs static) \
-		"${pyconf[@]}"
-}
-
-src_install() {
-	default
-	use python && python_optimize
-
-	if use doc ; then
-		dodoc Documentation/*.html
-		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
deleted file mode 100644
index 162e0224e6e4..000000000000
--- a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/kvutils/Makefile.am
-+++ b/kvutils/Makefile.am
-@@ -56,13 +56,12 @@
- 			kvu_value_queue.h
- 
- libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
--libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
-+libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@
- 
- libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
- libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
- 
- libkvutils_tester_SOURCES = libkvutils_tester.cpp
--libkvutils_tester_LDFLAGS = -static
- libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
- 
- noinst_HEADERS = $(kvutil_headers)
---- a/libecasound/Makefile.am
-+++ b/libecasound/Makefile.am
-@@ -364,7 +364,7 @@
- 
- libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
- libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
--libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
-+libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags)
- libecasound_la_LIBADD = $(eca_libadd)
- libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
- libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
---- a/libecasound/plugins/Makefile.am
-+++ b/libecasound/plugins/Makefile.am
-@@ -105,7 +105,7 @@
- libecasound_plugins_la_SOURCES          = audioio_dummy.cpp $(plugin_cond_sources)
- EXTRA_libecasound_plugins_la_SOURCES    = $(plugin_all_sources)
- libecasound_plugins_la_LIBADD		= $(ECA_S_EXTRA_LIBS)
--libecasound_plugins_la_LDFLAGS 		= -static
-+libecasound_plugins_la_LDFLAGS 		=
- 
- libecasound_plugins_debug_la_SOURCES	= $(libecasound_plugins_la_SOURCES)
- EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
---- a/libecasoundc/Makefile.am
-+++ b/libecasoundc/Makefile.am
-@@ -14,9 +14,9 @@
- # !!!
- # remember to update eca-version.cpp
- if ECA_AM_DEBUG_MODE
--eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
-+eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
- else
--eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
-+eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
- endif
- 
- INCLUDES = -I$(srcdir)
---- a/pyecasound/Makefile.am
-+++ b/pyecasound/Makefile.am
-@@ -28,7 +28,7 @@
- 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
- endif
- if ECA_AM_PYECASOUND_CEXT
--pyecasound_install_list2 = 	pyecasound.so
-+pyecasound_install_list2 = 	.libs/pyecasound.so
- pyecasound_uninstall_list2 =   	$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so
- endif
- 
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
index 070c9470c18f..dcdf1d5edbb5 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -93,9 +93,6 @@ src_prepare() {
 src_configure() {
 	local myoptimize=0
 
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
 	# Try to get cpu type based on CFLAGS.
 	# Bug #591968
 	for i in $(get-flag mcpu) $(get-flag march) ; do
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index cac6bd5d4fe2..a06937768340 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -87,9 +87,6 @@ src_prepare() {
 src_configure() {
 	local myoptimize=0
 
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
 	# Try to get cpu type based on CFLAGS.
 	# Bug #591968
 	for i in $(get-flag mcpu) $(get-flag march) ; do
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index f6771ab442cf..e76bdaa6317b 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,2 +1 @@
-DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375
 DIST mp3gain-1_6_2-src.zip 71246 BLAKE2B 5172c2103bb2267bf819f36180e9cd7a9d57df6f7ddc29900e9063f97c4513972053bb0c3f1f69f7ddd12ec0cf4251e93e1b6920389a8246bfdd5650176a90d2 SHA512 ec9de6c755120480ccb72b34a0042aea7546ef923090ab04e420d5b189523b4504e29952a3d695d3c42c74348f5c3c9123ff090bcc671e43375711e085d67480
diff --git a/media-sound/mp3gain/files/mp3gain-1.6.1-CVE-2017-12911.patch b/media-sound/mp3gain/files/mp3gain-1.6.1-CVE-2017-12911.patch
deleted file mode 100644
index 0b5a32280963..000000000000
--- a/media-sound/mp3gain/files/mp3gain-1.6.1-CVE-2017-12911.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/apetag.c
-+++ b/apetag.c
-@@ -49,6 +49,12 @@
- 
- static int Lyrics3GetNumber6 ( const unsigned char* string )
- {
-+	if (string[0] < '0' || string[0] > '9') return 0;
-+	if (string[1] < '0' || string[1] > '9') return 0;
-+	if (string[2] < '0' || string[2] > '9') return 0;
-+	if (string[3] < '0' || string[3] > '9') return 0;
-+	if (string[4] < '0' || string[4] > '9') return 0;
-+	if (string[5] < '0' || string[5] > '9') return 0;
- 	return ( string[0] - '0') * 100000 +
- 		   ( string[1] - '0') * 10000 +
- 		   ( string[2] - '0') * 1000 +
-@@ -86,12 +92,14 @@
- 		free(*id3tagbuff);
- 	*id3tagbuff = (unsigned char *)malloc(128);
-     memcpy(*id3tagbuff,tmpid3,128);
-+	if ( *tag_offset < (128 + (long)(sizeof(T))) ) return 0;
-     if ( fseek (fp, *tag_offset - 128 - sizeof (T), SEEK_SET) ) return 0;
-     if ( fread (&T, 1, sizeof (T), fp) != sizeof (T) ) return 0;
-     // check for lyrics3 v2.00 tag
-     if ( memcmp (T.ID, "LYRICS200", sizeof (T.ID)) ) return 0;
- 	len = Lyrics3GetNumber6 (T.Length);
--	if ( fseek (fp, *tag_offset - 128 - (int)sizeof (T) - len, SEEK_SET) ) return 0;
-+	if (*tag_offset < (128 + (long)(sizeof(T)) + len)) return 0;
-+	if ( fseek (fp, *tag_offset - 128 - (long)sizeof (T) - len, SEEK_SET) ) return 0;
-     if ( fread  (tmp, 1, 11, fp) != 11 ) return 0;
-     if ( memcmp (tmp, "LYRICSBEGIN", 11) ) return 0;
-     
-@@ -167,6 +175,7 @@
-     Ver = Read_LE_Uint32 (T.Version);
-     if ( (Ver != 1000) && (Ver != 2000) ) return 0;
-     if ( (TagLen = Read_LE_Uint32 (T.Length)) < sizeof (T) ) return 0;
-+	if (*tag_offset < TagLen) return 0;
-     if ( fseek (fp, *tag_offset - TagLen, SEEK_SET) ) return 0;
-     buff = (char *)malloc (TagLen);
-     if ( fread (buff, 1, TagLen - sizeof (T), fp) != (TagLen - sizeof (T)) ) {
-@@ -285,6 +294,7 @@
- 	(*apeTag)->originalTagSize = TagLen;
- 
-     if ( Read_LE_Uint32 (T.Flags) & (1<<31) ) {  // Tag contains header
-+		if (*tag_offset < (long)(sizeof(T))) return 0;
-         *tag_offset -= sizeof (T);
- 
- 		fseek (fp, *tag_offset, SEEK_SET);
-@@ -355,14 +365,14 @@
-  */
- int ReadMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct FileTagsStruct *fileTags) {
-     FILE *fi;
--    long tag_offset, offs_bk;
-+    long tag_offset, offs_bk, file_size;
- 
-     fi = fopen(filename, "rb");
-     if (fi == NULL)
- 		return 0;
- 	
- 	fseek(fi, 0, SEEK_END);
--    tag_offset = ftell(fi);
-+    tag_offset = file_size = ftell(fi);
- 	
- 	fileTags->lyrics3TagSize = 0;
- 
-@@ -373,7 +383,11 @@
- 		ReadMP3ID3v1Tag ( fi, &(fileTags->id31tag), &tag_offset );
- 	} while ( offs_bk != tag_offset );
- 
--	fileTags->tagOffset = tag_offset;
-+	if (tag_offset >= 0 && tag_offset <= file_size) {
-+		fileTags->tagOffset = tag_offset;
-+	} else { //Corrupt tag information, simply default to end-of-file
-+		fileTags->tagOffset = file_size;
-+	}
- 
-     fclose(fi);
- 
\ No newline at end of file
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
deleted file mode 100644
index 11c40690473f..000000000000
--- a/media-sound/mp3gain/mp3gain-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-MY_P="${P//./_}"
-
-DESCRIPTION="A program to analyze and adjust MP3 files to same volume"
-HOMEPAGE="http://mp3gain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	app-arch/unzip
-	media-sound/mpg123
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-CVE-2017-12911.patch )
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin mp3gain
-}
diff --git a/media-sound/patchage/patchage-1.0.2.ebuild b/media-sound/patchage/patchage-1.0.2.ebuild
index b25929f0516f..b5955f1048d3 100644
--- a/media-sound/patchage/patchage-1.0.2.ebuild
+++ b/media-sound/patchage/patchage-1.0.2.ebuild
@@ -31,9 +31,9 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README.md )
 
-#PATCHES=(
-#	"${FILESDIR}/${P}-string.patch"
-#)
+PATCHES=(
+	"${FILESDIR}/${P}-string.patch"
+)
 
 src_configure() {
 	waf-utils_src_configure \
diff --git a/media-sound/sox/sox-14.4.2_p20200803.ebuild b/media-sound/sox/sox-14.4.2_p20200803.ebuild
index 1d9f0c22f731..b7a36d3f5f35 100644
--- a/media-sound/sox/sox-14.4.2_p20200803.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20200803.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 BDEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 78f2cf897202..3d7d8e686bb2 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vlc/vlc-3.0.11.1.ebuild b/media-video/vlc/vlc-3.0.11.1.ebuild
index c88bc2c4ce25..b8d9427fbadf 100644
--- a/media-video/vlc/vlc-3.0.11.1.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 -sparc ~x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5788a0740891..5509853fa12c 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 5287bae6ce3b..04c8a8a555b7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Aug 2020 07:08:31 +0000
+Sat, 29 Aug 2020 14:38:27 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5287bae6ce3b..04c8a8a555b7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Aug 2020 07:08:31 +0000
+Sat, 29 Aug 2020 14:38:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 029a00509cd9..333d168af25f 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 5138c5eb8ce7..9bcd601cbc7b 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/fingerprint-0 b/metadata/md5-cache/acct-group/fingerprint-0
new file mode 100644
index 000000000000..5aa99242ad3e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fingerprint-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: fingerprint
+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_=939cca9ed9982dca7857097e6d5ac112
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 63ecf5655821..7819b2550d52 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/kubectx-0.9.1 b/metadata/md5-cache/app-admin/kubectx-0.9.1
new file mode 100644
index 000000000000..33cd10df1149
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kubectx-0.9.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Fast way to switch between clusters and namespaces in kubectl
+EAPI=7
+HOMEPAGE=https://github.com/ahmetb/kubectx
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/ahmetb/kubectx/archive/v0.9.1.tar.gz -> kubectx-0.9.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//facette.io/natsort/@v/v0.0.0-20181210072756-2cd4dd1e2dcb.zip -> facette.io%2Fnatsort%2F@v%2Fv0.0.0-20181210072756-2cd4dd1e2dcb.zip mirror://goproxy//facette.io/natsort/@v/v0.0.0-20181210072756-2cd4dd1e2dcb.mod -> facette.io%2Fnatsort%2F@v%2Fv0.0.0-20181210072756-2cd4dd1e2dcb.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.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.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//k8s.io/api/@v/v0.17.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.0.zip mirror://goproxy//k8s.io/api/@v/v0.17.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6b285332a64f804dab8230a84e896c35
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.2 b/metadata/md5-cache/app-admin/sudo-1.9.2
index 9e824d8db6e7..228c7e73d604 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.2
+++ b/metadata/md5-cache/app-admin/sudo-1.9.2
@@ -5,11 +5,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=7
 HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e9a4c4b4a1159601462f70ecefe4cf7
+_md5_=0a1c0024a9140a6e57aa0a3bd18292ac
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index b410a8db2553..ddddc5513482 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5 b/metadata/md5-cache/app-arch/xz-utils-5.2.5
index 2b42b5d676cc..d8338d15653f 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.5
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.5
@@ -5,11 +5,11 @@ DESCRIPTION=utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
 IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=6b8d2b8d1e29a00f7a6785077669f1d7
+_md5_=a48f719cbfee0be7e067cebda925d03b
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 8113c41df1b0..c2d09323a473 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3 b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
new file mode 100644
index 000000000000..85d902a5bf1e
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile prepare setup unpack
+DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig test? ( dev-util/valgrind )
+DESCRIPTION=A tool to dump and debug bootable CD-like images
+EAPI=6
+HOMEPAGE=https://github.com/rhboot/dumpet
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 dev-libs/popt
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rhboot/dumpet/archive/8f47670dd582c96ad1b6dd3c9b9da0acebded5d8.tar.gz -> dumpet-2.1_p20140601.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=54b29e1fb671d439a48d1d65ceaaddc2
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b3ac199961a3..c222f8302556 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/gnupg-2.2.20-r1 b/metadata/md5-cache/app-crypt/gnupg-2.2.20-r1
index 8ec8c4bbb882..70943f00ba2b 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.20-r1
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.20-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 )
+DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 )
 DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=7
 HOMEPAGE=https://gnupg.org/
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.20.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d007676b45c6ad14139a8c412c780079
+_md5_=9c87b6c57002b2a124d6be0534d7a47d
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.21 b/metadata/md5-cache/app-crypt/gnupg-2.2.21
index a592dbbdd39a..eb1322ce2923 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.21
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.21
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 )
+DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 )
 DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=7
 HOMEPAGE=https://gnupg.org/
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=!app-crypt/dirmngr >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.21.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ba1bb2f5547fdcc58220f5448601e760
+_md5_=ece8134aa3cfd3cea0b967374f9de6de
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.22 b/metadata/md5-cache/app-crypt/gnupg-2.2.22
new file mode 100644
index 000000000000..bf7ac9a9ca8e
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.22
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 )
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=7
+HOMEPAGE=https://gnupg.org/
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.22.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f5e9441e72c6c9ae885ba6587ceaabb9
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.14.0 b/metadata/md5-cache/app-crypt/gpgme-1.14.0
index 260348fe509a..dd84e1e77dc1 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.14.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.29:= 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(-)] ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.14.0.tar.bz2
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b8de024f33ec17ded4c772ebcdd016d
+_md5_=6ed126e89c04a4a13e488b1b56b93246
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 478551331b41..7ec1db19b4a9 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.1 b/metadata/md5-cache/app-doc/gnucash-docs-4.1
index 5f17e18bb0af..1053ef24868f 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-4.1
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.1
@@ -4,9 +4,9 @@ DESCRIPTION=Documentation package for GnuCash
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
 IUSE=l10n_de l10n_it l10n_ja l10n_pt l10n_ru
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 FDL-1.1
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.1.tar.gz -> gnucash-docs-4.1.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_=86115d6eef536db1097070be8ee966f0
+_md5_=d01614bf6ce79049093d27e9f031a508
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 67c9c5cd6efa..4840cf786553 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r12 b/metadata/md5-cache/app-editors/emacs-18.59-r13
similarity index 61%
rename from metadata/md5-cache/app-editors/emacs-18.59-r12
rename to metadata/md5-cache/app-editors/emacs-18.59-r13
index 4bb928fb9415..4c81134cbb07 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r12
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r13
@@ -1,14 +1,14 @@
 BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto x11-misc/xbitmaps )
+DEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) gui? ( x11-base/xorg-proto x11-misc/xbitmaps )
 DESCRIPTION=The extensible self-documenting text editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=abi_x86_x32 X
+IUSE=abi_x86_x32 gui
 KEYWORDS=amd64 x86
 LICENSE=GPL-1+ GPL-2+ BSD HPND
-RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) X? ( x11-libs/libX11 ) app-eselect/eselect-emacs
+RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) app-eselect/eselect-emacs
 SLOT=18
-SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-12.tar.xz
+SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-13.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39970282f52e2fcd41c8191edb582967
+_md5_=d9eea38e13344570a43cebd6ad76a3d7
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r18 b/metadata/md5-cache/app-editors/emacs-23.4-r18
deleted file mode 100644
index 93c472813033..000000000000
--- a/metadata/md5-cache/app-editors/emacs-23.4-r18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-SLOT=23
-SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e584f4523ffcb7168a1059f983626730
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r19 b/metadata/md5-cache/app-editors/emacs-23.4-r19
new file mode 100644
index 000000000000..dc7252522713
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r19
@@ -0,0 +1,14 @@
+BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=23
+SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5cc712ca84b6058c03e9d9ba6c74221b
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r7 b/metadata/md5-cache/app-editors/emacs-24.5-r7
deleted file mode 100644
index 941ce9ab2c90..000000000000
--- a/metadata/md5-cache/app-editors/emacs-24.5-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-SLOT=24
-SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6e16f8be31527fea8ec9409e26c050f
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r8 b/metadata/md5-cache/app-editors/emacs-24.5-r8
new file mode 100644
index 000000000000..cf664656893d
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r8
@@ -0,0 +1,14 @@
+BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=24
+SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=39f993b6ea000f96d49f1e6c3bfcc50e
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6
deleted file mode 100644
index 7248d49ea581..000000000000
--- a/metadata/md5-cache/app-editors/emacs-25.3-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-25.3 app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-SLOT=25
-SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a52e7d7a84b61f682e9c099249f39284
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r7 b/metadata/md5-cache/app-editors/emacs-25.3-r7
new file mode 100644
index 000000000000..8ff1ab31f717
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r7
@@ -0,0 +1,14 @@
+BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-25.3 app-eselect/eselect-emacs
+SLOT=25
+SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=46a745631c1d93544ea7b6b2c974ec1e
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r1 b/metadata/md5-cache/app-editors/emacs-26.3-r1
deleted file mode 100644
index d9b0be6583c9..000000000000
--- a/metadata/md5-cache/app-editors/emacs-26.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-26.3 app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-SLOT=26
-SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d34272c4f30bde7fa12e5e7e1dd46771
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r2 b/metadata/md5-cache/app-editors/emacs-26.3-r2
new file mode 100644
index 000000000000..4900a0b58df3
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-26.3 app-eselect/eselect-emacs
+SLOT=26
+SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=535396a5bb004a15db8804412d113262
diff --git a/metadata/md5-cache/app-editors/emacs-27.1 b/metadata/md5-cache/app-editors/emacs-27.1
deleted file mode 100644
index 3e0e650da539..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<=app-editors/emacs-27.1.9999-r0:27-vcs !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-RESTRICT=test
-SLOT=27
-SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=18dee42b8883437066698e05ff89b410
diff --git a/metadata/md5-cache/app-editors/emacs-27.1-r1 b/metadata/md5-cache/app-editors/emacs-27.1-r1
new file mode 100644
index 000000000000..35e4d9aab125
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<=app-editors/emacs-27.1.9999-r0:27-vcs !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=27
+SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b8ce24d278c79314e6aa415bc3fe8696
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
index 9a9ea417896b..650ccb926c37 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
@@ -1,15 +1,14 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27-vcs
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cead70e3cde806c030069e9bcbc18ea3
+_md5_=b1bdbb6f11b75c2877696cfd425eea0e
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 9a2769f783b5..4c3759157138 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -1,15 +1,14 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb7dea4ce361e37ad097c198ddaa4e0a
+_md5_=46fae07b06cc6986f279261472a50001
diff --git a/metadata/md5-cache/app-editors/emact-2.58.0 b/metadata/md5-cache/app-editors/emact-2.58.0
index 89c52abffedf..238e5d4e7642 100644
--- a/metadata/md5-cache/app-editors/emact-2.58.0
+++ b/metadata/md5-cache/app-editors/emact-2.58.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) virtual/pkgconfig X? ( x11-base/xorg-proto )
+DEPEND=sys-libs/ncurses:0= gui? ( x11-libs/libX11 ) virtual/pkgconfig gui? ( x11-base/xorg-proto )
 DESCRIPTION=EmACT, a fork of Conroy's MicroEmacs
 EAPI=6
 HOMEPAGE=http://www.eligis.com/emacs/
-IUSE=X
+IUSE=gui
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ BSD
-RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 )
+RDEPEND=sys-libs/ncurses:0= gui? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/emact/emact-2.58.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee0ac7349d58e68211c01870ac96235d
+_md5_=89058ab4ee15806cbc6ce8333082246f
diff --git a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3 b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
index 82e87af7b3e9..a48e862076bf 100644
--- a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
+++ b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne ) virtual/pkgconfig X? ( x11-base/xorg-proto x11-libs/libXt )
+DEPEND=sys-libs/ncurses:0= gui? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne ) virtual/pkgconfig gui? ( x11-base/xorg-proto x11-libs/libXt )
 DESCRIPTION=Jasspa Microemacs
 EAPI=6
 HOMEPAGE=http://www.jasspa.com/
-IUSE=nanoemacs X xpm
+IUSE=gui nanoemacs xpm
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
+RDEPEND=sys-libs/ncurses:0= gui? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
 SLOT=0
 SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=59bf47db99593f9ef264e0e7c9655cc5
+_md5_=5c013a2fa972ff6bf68df7b4eedad287
diff --git a/metadata/md5-cache/app-editors/jed-0.99.19-r1 b/metadata/md5-cache/app-editors/jed-0.99.19-r1
index d9e2108edecb..8a9bc79ade4c 100644
--- a/metadata/md5-cache/app-editors/jed-0.99.19-r1
+++ b/metadata/md5-cache/app-editors/jed-0.99.19-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) ) X? ( x11-libs/libXt x11-base/xorg-proto )
+DEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) gui? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) ) gui? ( x11-libs/libXt x11-base/xorg-proto )
 DESCRIPTION=Console S-Lang-based editor
 EAPI=7
 HOMEPAGE=http://www.jedsoft.org/jed/
-IUSE=X gpm xft
+IUSE=gpm gui xft
 KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2+
-RDEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) )
+RDEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) gui? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) )
 SLOT=0
 SRC_URI=ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2
-_md5_=35b1f9859f7638ae0af0792aadb4a475
+_md5_=1946a9b85978a0d560e547c6bc996388
diff --git a/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225 b/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
index 0d3802e44333..1ca7dd585716 100644
--- a/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
+++ b/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= ) >=app-text/texi2html-5 X? ( x11-base/xorg-proto )
+DEPEND=gui? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= ) >=app-text/texi2html-5 gui? ( x11-base/xorg-proto )
 DESCRIPTION=QEmacs is a very small but powerful UNIX editor
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/qemacs/
-IUSE=X png unicode xv
+IUSE=gui png unicode xv
 KEYWORDS=amd64 arm ~ppc x86
 LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= )
+RDEPEND=gui? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/qemacs-0.4.1_pre20170225.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c0f0d12cb8dd3d8d1d31f1c7bf4f99a
+_md5_=dae556e3fe3abc466e3abc1b7df2c512
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 5730f1f2b446..955d167230ed 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.2 b/metadata/md5-cache/app-emacs/ddskk-16.2
index 39d74459a5e7..7faf4802e4d3 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.2
+++ b/metadata/md5-cache/app-emacs/ddskk-16.2
@@ -7,7 +7,8 @@ IUSE=ruby
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) >=app-editors/emacs-24:*
+RESTRICT=test
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f
-_md5_=feb326004737f8b110489798a4ab2094
+_md5_=19d7cd4e6f64e86b219b6d048ead2d15
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.3 b/metadata/md5-cache/app-emacs/ddskk-16.3
index f8b5d3c29713..374358005a42 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.3
+++ b/metadata/md5-cache/app-emacs/ddskk-16.3
@@ -7,7 +7,8 @@ IUSE=ruby
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) >=app-editors/emacs-24:*
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-16.3_Kutomatsunai.tar.gz -> ddskk-16.3.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=c2593f7add91220e25b857ec2d8c99a2
+_md5_=2cf515e4d0bce249f4e218d02ad3711f
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index e3f12de8aab7..e2c8798d92e3 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -7,7 +7,8 @@ IUSE=ruby
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) >=app-editors/emacs-24.3:*
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7a7aeccfbd45123272910518f130e104
+_md5_=68e6f9bad37891f7b53d2a4666614a2c
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3 b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
index cfa2b958ae27..78a198ba2a34 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.51.tar.xz
 _eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=2524426b5e8a0442fd6ee9c72f831028
+_md5_=9219fc6513003a3a04edc4a7bfddda6c
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4
new file mode 100644
index 000000000000..4adb33a57cdd
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=games? ( acct-group/gamestat )
+DESCRIPTION=Common files needed by all GNU Emacs versions
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+IUSE=games gui
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+
+PDEPEND=>=app-editors/emacs-23.1:*
+RDEPEND=games? ( acct-group/gamestat )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=908bc6515ca3b9141e88bdf3c5fc49ef
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 43aac04838b4..c978da391862 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/firecracker-0.21.1-r1 b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
index cdd426df3ec4..679d8a9d1dd5 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firecracker-microvm/firecracker/archive/v0.21.1.tar.gz -> firecracker-0.21.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.8/download -> aho-corasick-0.7.8.crate https://crates.io/api/v1/crates/backtrace/0.3.44/download -> backtrace-0.3.44.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cpuid/0.1.0/download -> cpuid-0.1.0.crate https://crates.io/api/v1/crates/device_tree/1.1.0/download -> device_tree-1.1.0.crate https://crates.io/api/v1/crates/epoll/4.1.0/download -> epoll-4.1.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kvm-bindings/0.2.0/download -> kvm-bindings-0.2.0.crate https://crates.io/api/v1/crates/kvm-ioctls/0.5.0/download -> kvm-ioctls-0.5.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/logger/0.1.0/download -> logger-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.3.2/download -> memchr-2.3.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/regex/1.3.4/download -> regex-1.3.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.14/download -> regex-syntax-0.6.14.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/timerfd/1.1.1/download -> timerfd-1.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vm-memory/0.1.0/download -> vm-memory-0.1.0.crate https://crates.io/api/v1/crates/vmm-sys-util/0.4.0/download -> vmm-sys-util-0.4.0.crate
 _eclasses_=cargo	59ecae2c29d723be70671fd182038195	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8624147121cad555fdaae5fab06ea235
+_md5_=17f137938ff686618c08e813b17e1551
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index dd23dc049645..eae8cd977751 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/foremost-1.5.7-r3 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
index 7b48c9120075..52bfbc3a18e1 100644
--- a/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
+++ b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
-DESCRIPTION=A console program to recover files based on their headers and footers
-EAPI=6
+DESCRIPTION=Console program to recover files based on their headers and footers
+EAPI=7
 HOMEPAGE=http://foremost.sourceforge.net/
 KEYWORDS=amd64 ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b69cfc13b4fcee45ba89d03dcbeef815
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b977d04d187b535b970b92a0af634174
diff --git a/metadata/md5-cache/app-forensics/honggfuzz-2.3.1 b/metadata/md5-cache/app-forensics/honggfuzz-2.3.1
index 7cad95c64b39..5664013dea10 100644
--- a/metadata/md5-cache/app-forensics/honggfuzz-2.3.1
+++ b/metadata/md5-cache/app-forensics/honggfuzz-2.3.1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install prepare pretend
-DEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils
+DEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils clang? ( sys-libs/blocksruntime )
 DESCRIPTION=A general purpose fuzzer with feedback support
 EAPI=7
 HOMEPAGE=https://google.github.io/honggfuzz/
+IUSE=clang
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils
+RDEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils clang? ( sys-libs/blocksruntime )
 SLOT=0
 SRC_URI=https://github.com/google/honggfuzz/archive/2.3.1.tar.gz -> honggfuzz-2.3.1.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1844cead416dd2ccd90bdb3b0d78a69
+_md5_=58cd02714ae6ce027a489fec4ae1aabb
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 6838a186d9a0..9b3c8d911176 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.12.0 b/metadata/md5-cache/app-i18n/ibus-table-1.12.0
new file mode 100644
index 000000000000..be32e5161300
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) virtual/libiconv nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tables engines for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.12.0/ibus-table-1.12.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e72b984a5f14372a30152f5a19eba28a
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.6
similarity index 98%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.6
index 04e267d6eb52..2236196570fd 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.6
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-l
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.9.4/ibus-typing-booster-2.9.4.tar.gz
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.9.6/ibus-typing-booster-2.9.6.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b324c564bd840dc2c47b73b1768e052
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e5a71c84c871..db17faea18f9 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/ktoblzcheck-1.49-r2 b/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2
index 01c5a8bdeda2..36dc5e509557 100644
--- a/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2
+++ b/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2
@@ -3,9 +3,9 @@ DEPEND=app-text/recode:0= sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/w
 DESCRIPTION=Library to check account numbers and bank codes of German banks
 EAPI=7
 HOMEPAGE=http://ktoblzcheck.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/recode:0= sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx )
 SLOT=0
 SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.49.tar.gz
-_md5_=a4fadfe7141b29b6079bbf7b259b7a8b
+_md5_=a1fcf6b9d27188ab6b25db9969aded2a
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721 b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
new file mode 100644
index 000000000000..ab9327dc0666
--- /dev/null
+++ b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= ) doc? ( app-doc/doxygen[dot] app-text/xmlto ) freetype? ( media-libs/freetype:2= ) nfs? ( net-fs/nfs-utils ) png? ( media-libs/libpng:0= ) samba? ( net-fs/samba )
+DESCRIPTION=Displays real-time system information from your Linux/*BSD box on a LCD
+EAPI=7
+HOMEPAGE=http://www.lcdproc.org/
+IUSE=debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= )
+REQUIRED_USE=ethlcd? ( lcd_devices_hd44780 ) freetype? ( lcd_devices_glcd ) png? ( lcd_devices_glcd ) || ( lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd )
+SLOT=0
+SRC_URI=https://github.com/lcdproc/lcdproc/archive/9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1.tar.gz -> lcdproc-0.5.9_p20200721.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f4d9655454d07637bac7d87f991502e
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.6 b/metadata/md5-cache/app-misc/pax-utils-1.2.6
index 211b22199c63..eb9bda015218 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.6
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.6
@@ -1,6 +1,6 @@
-BDEPEND=caps? ( virtual/pkgconfig ) kernel_linux? ( >=sys-kernel/linux-headers-4.11 ) seccomp? ( virtual/pkgconfig )
+BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install setup test
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp )
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
 DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.6.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5b2539e6b21f56628910b78737838b18
+_md5_=7aab6a02eae7c4d58aa618180ac20cf1
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 7bf911da6eaa..d3216a1a5f44 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/gnucash-4.1 b/metadata/md5-cache/app-office/gnucash-4.1
index 8b31c53ca2f7..5b868e9c0523 100644
--- a/metadata/md5-cache/app-office/gnucash-4.1
+++ b/metadata/md5-cache/app-office/gnucash-4.1
@@ -5,7 +5,7 @@ DESCRIPTION=A personal finance manager
 EAPI=7
 HOMEPAGE=http://www.gnucash.org/
 IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 smartcard sqlite test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=doc? ( ~app-doc/gnucash-docs-4.1 gnome-extra/yelp )
 RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.1/gnucash-4.1.tar.bz2
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1a0009ba402a74c542c2681772270ee
+_md5_=db6cf780abda05eaf4ec3e772372dcf1
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.22 b/metadata/md5-cache/app-office/texstudio-2.12.22
deleted file mode 100644
index 24987e184200..000000000000
--- a/metadata/md5-cache/app-office/texstudio-2.12.22
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] )
-DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
-EAPI=7
-HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
-IUSE=video
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
-SLOT=0
-SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.22.tar.gz -> texstudio-2.12.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4303a7462468ebe366561e06b75b410d
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.16 b/metadata/md5-cache/app-office/texstudio-3.0.0
similarity index 89%
rename from metadata/md5-cache/app-office/texstudio-2.12.16
rename to metadata/md5-cache/app-office/texstudio-3.0.0
index 1909632af3fb..b637aa875f18 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.16
+++ b/metadata/md5-cache/app-office/texstudio-3.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
 EAPI=7
 HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
 IUSE=video
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
-SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.16.tar.gz -> texstudio-2.12.16.tar.gz
+SRC_URI=https://github.com/texstudio-org/texstudio/archive/3.0.0alpha6.tar.gz -> texstudio-3.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4303a7462468ebe366561e06b75b410d
+_md5_=f6c23e4fcdd18075583794a24457b906
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 0f93ccefecbc..74940dc28cb9 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/gemato-15.1 b/metadata/md5-cache/app-portage/gemato-15.1
index df794c6a5062..cd6be85bc258 100644
--- a/metadata/md5-cache/app-portage/gemato-15.1
+++ b/metadata/md5-cache/app-portage/gemato-15.1
@@ -4,7 +4,7 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-15.1.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bc78a4e9bcf62792baed0c357769ff10
+_md5_=3f1edc20ba6953fd9da06acedb396c2d
diff --git a/metadata/md5-cache/app-portage/portpeek-3.1.4 b/metadata/md5-cache/app-portage/portpeek-3.1.4
new file mode 100644
index 000000000000..255564536070
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portpeek-3.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=7
+HOMEPAGE=https://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-portage/gentoolkit-0.4.8 || ( >=sys-apps/portage-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://www.mpagano.com/downloads/portpeek-3.1.4.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=621c88d5fb6cb631fe0c8d1ecaabf0a8
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 938dda2e4489..2b4ad9297ead 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/pinfo-0.6.13 b/metadata/md5-cache/app-text/pinfo-0.6.13
index 9dfa361f0e85..e9e7ceab436f 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.13
+++ b/metadata/md5-cache/app-text/pinfo-0.6.13
@@ -5,10 +5,10 @@ DESCRIPTION=Hypertext info and man viewer based on (n)curses
 EAPI=7
 HOMEPAGE=https://github.com/baszoetekouw/pinfo
 IUSE=nls readline
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/baszoetekouw/pinfo/archive/v0.6.13.tar.gz -> pinfo-0.6.13.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e56e747717ab59bc4e4eb3edcfdc588
+_md5_=ef6be4259943af761182113eed213124
diff --git a/metadata/md5-cache/app-text/poppler-0.90.1 b/metadata/md5-cache/app-text/poppler-0.90.1
index f59c5a2f78ce..e9cf0e008564 100644
--- a/metadata/md5-cache/app-text/poppler-0.90.1
+++ b/metadata/md5-cache/app-text/poppler-0.90.1
@@ -5,11 +5,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=7
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/101
 SRC_URI=https://poppler.freedesktop.org/poppler-0.90.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5211c8b09f3fc69d7a4af5a4735a4e2b
+_md5_=47ce0e96d48bce3050e4fe0c7e2675fa
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r2 b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
index c05c2467b663..975a15271d3e 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r2
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04682caffc3443f037dc7ca3b25bac3a
+_md5_=d6526c3cf8987db90becadaf74399a07
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index a96a73dc18de..a1271e903d73 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/openscenegraph-3.6.4 b/metadata/md5-cache/dev-games/openscenegraph-3.6.4
index d50892d48a38..c1176587a7e9 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.4
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.4
@@ -5,11 +5,11 @@ DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=7
 HOMEPAGE=http://www.openscenegraph.org/
 IUSE=asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ppc ~ppc64 ~x86
 LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )
 SLOT=0/158
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.4.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d446ea1a4e229c8c207d56a1e0da44ba
+_md5_=b1ccb75bc0f5a15207b8bccfdec423c1
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 985b8b593535..3030e7d9f6de 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0 b/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
new file mode 100644
index 000000000000..0ede1a8c3596
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Sharing/memoization of class members
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/dictionary-sharing
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.0
+SRC_URI=https://hackage.haskell.org/package/dictionary-sharing-0.1.0.0/dictionary-sharing-0.1.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2b03501558fc08b9d4fbd1983681ec0
diff --git a/metadata/md5-cache/dev-haskell/encoding-0.8.5 b/metadata/md5-cache/dev-haskell/encoding-0.8.5
new file mode 100644
index 000000000000..02ff757ffcc8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/encoding-0.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/regex-compat-0.71:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.0 >=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26 test? ( dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for various character encodings
+EAPI=7
+HOMEPAGE=http://code.haskell.org/encoding/
+IUSE=+systemencoding doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/regex-compat-0.71:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.5
+SRC_URI=https://hackage.haskell.org/package/encoding-0.8.5/encoding-0.8.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=904a208f5063f240ad9ee844accf5368
diff --git a/metadata/md5-cache/dev-haskell/git-0.3.0 b/metadata/md5-cache/dev-haskell/git-0.3.0
new file mode 100644
index 000000000000..7ba5c9c0d9c9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/git-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cryptonite-0.22:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] >=dev-haskell/memory-0.13:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/bytedump-1.0 dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Git operations in haskell
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-git
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cryptonite-0.22:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] >=dev-haskell/memory-0.13:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.0
+SRC_URI=https://hackage.haskell.org/package/git-0.3.0/git-0.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b6166fb6f22f76c16c53760678a58ca2
diff --git a/metadata/md5-cache/dev-haskell/hit-0.6.3 b/metadata/md5-cache/dev-haskell/hit-0.6.3
deleted file mode 100644
index 5ce2752a1156..000000000000
--- a/metadata/md5-cache/dev-haskell/hit-0.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/cryptohash:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/patience:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( >=dev-haskell/hashable-1.2:=[profile?] dev-haskell/hashtables:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/bytedump-1.0 dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Git operations in haskell
-EAPI=6
-HOMEPAGE=https://github.com/vincenthz/hit
-IUSE=debug executable doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/cryptohash:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/patience:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( >=dev-haskell/hashable-1.2:=[profile?] dev-haskell/hashtables:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/0.6.3
-SRC_URI=https://hackage.haskell.org/package/hit-0.6.3/hit-0.6.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09a14daba59ec2319bd6b95ce862e8b7
diff --git a/metadata/md5-cache/dev-haskell/hit-0.7.0 b/metadata/md5-cache/dev-haskell/hit-0.7.0
new file mode 100644
index 000000000000..1e57f3dceea2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hit-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/git-0.3.0:= >=dev-haskell/hashable-1.2:= dev-haskell/hashtables:= dev-haskell/hourglass:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Git operations in haskell
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hit
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/git-0.3.0:= >=dev-haskell/hashable-1.2:= dev-haskell/hashtables:= dev-haskell/hourglass:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/hit-0.7.0/hit-0.7.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b31ad478e1870580233f40b1acaf26be
diff --git a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
index c6fb623d21b2..f02608e2b6a7 100644
--- a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/unixODBC-2.2 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.1:= >=dev-db/unixODBC-2.2 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Haskell Interface to ODBC
-EAPI=4
+EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql-odbc
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/unixODBC-2.2
+RDEPEND=>=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.1:= >=dev-db/unixODBC-2.2
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-odbc-1.8.2/hsql-odbc-1.8.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=269a86b77dc96a7adb5d15dd3ec0894b
+_md5_=09a301af05c8e5cc4f3fca0f95b53f21
diff --git a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
index 2b97b8726578..3a7114732365 100644
--- a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=SQLite3 driver for HSQL
-EAPI=5
+EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql-sqlite3
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-
 SLOT=0/1.8.2
 SRC_URI=https://hackage.haskell.org/package/hsql-sqlite3-1.8.2/hsql-sqlite3-1.8.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f617cd9d41cea49ba2d3f66377374334
+_md5_=82f12bcad5dce4956fefaa649cab4371
diff --git a/metadata/md5-cache/dev-haskell/logict-0.6.0.2 b/metadata/md5-cache/dev-haskell/logict-0.6.0.2
deleted file mode 100644
index de9b4102e3c9..000000000000
--- a/metadata/md5-cache/dev-haskell/logict-0.6.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A backtracking logic-programming monad
-EAPI=5
-HOMEPAGE=https://github.com/Bodigrim/logict
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/0.6.0.2
-SRC_URI=https://hackage.haskell.org/package/logict-0.6.0.2/logict-0.6.0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d785bdd7c6bdc151324a7c128856cb52
diff --git a/metadata/md5-cache/dev-haskell/logict-0.7.0.2 b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
similarity index 72%
rename from metadata/md5-cache/dev-haskell/logict-0.7.0.2
rename to metadata/md5-cache/dev-haskell/logict-0.7.0.3
index 798e9dadd76c..6d48a466e5e6 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.7.0.2
+++ b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A backtracking logic-programming monad
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/logict#readme
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
-SLOT=0/0.7.0.2
-SRC_URI=https://hackage.haskell.org/package/logict-0.7.0.2/logict-0.7.0.2.tar.gz
+SLOT=0/0.7.0.3
+SRC_URI=https://hackage.haskell.org/package/logict-0.7.0.3/logict-0.7.0.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c574891577c793f962657bd9eabb9bf7
+_md5_=9d5ae9b1f66988f3de487a4910755cb1
diff --git a/metadata/md5-cache/dev-haskell/logict-state-0.1.0.2 b/metadata/md5-cache/dev-haskell/logict-state-0.1.0.2
deleted file mode 100644
index 5bff794360a5..000000000000
--- a/metadata/md5-cache/dev-haskell/logict-state-0.1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.4.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Library for logic programming based on haskell package logict
-EAPI=6
-HOMEPAGE=https://github.com/atzedijkstra/logict-state
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.4.2:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/0.1.0.2
-SRC_URI=https://hackage.haskell.org/package/logict-state-0.1.0.2/logict-state-0.1.0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0daa407074691158a3e5cd252fcf1ca
diff --git a/metadata/md5-cache/dev-haskell/size-based-0.1.2.0 b/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
new file mode 100644
index 000000000000..e31a26a12f0d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Sized functors, for size-based enumerations
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/size-based
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.2.0
+SRC_URI=https://hackage.haskell.org/package/size-based-0.1.2.0/size-based-0.1.2.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bccc707eea4d8ab0324f3a6fc1ce9d46
diff --git a/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0 b/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
new file mode 100644
index 000000000000..9d7e8c1ba2e8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/semigroups-0.19:=[profile?] <dev-haskell/size-based-0.2:=[profile?] <dev-haskell/testing-type-modifiers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Functional Enumeration of Algebraic Types
+EAPI=7
+HOMEPAGE=https://github.com/JonasDuregard/testing-feat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/semigroups-0.19:=[profile?] <dev-haskell/size-based-0.2:=[profile?] <dev-haskell/testing-type-modifiers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.0
+SRC_URI=https://hackage.haskell.org/package/testing-feat-1.1.0.0/testing-feat-1.1.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=47ab6a98372dc2d76a1c62a948d3e865
diff --git a/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1 b/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
new file mode 100644
index 000000000000..2f19d92ad9d5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Data type modifiers for property based testing
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/testing-type-modifiers
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.1
+SRC_URI=https://hackage.haskell.org/package/testing-type-modifiers-0.1.0.1/testing-type-modifiers-0.1.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7ae3196918f0c6557e96c51803f89f11
diff --git a/metadata/md5-cache/dev-haskell/text-show-3.4 b/metadata/md5-cache/dev-haskell/text-show-3.4
deleted file mode 100644
index 0dc6ec2260f1..000000000000
--- a/metadata/md5-cache/dev-haskell/text-show-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1 >=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1 >=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 >=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Efficient conversion of values into Text
-EAPI=6
-HOMEPAGE=https://github.com/RyanGlScott/text-show
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/3.4
-SRC_URI=https://hackage.haskell.org/package/text-show-3.4/text-show-3.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=646781d5c76455a5c244eca5222120b3
diff --git a/metadata/md5-cache/dev-haskell/text-show-3.8.5 b/metadata/md5-cache/dev-haskell/text-show-3.8.5
new file mode 100644
index 000000000000..399b109688b0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-show-3.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9 >=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15 >=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient conversion of values into Text
+EAPI=7
+HOMEPAGE=https://github.com/RyanGlScott/text-show
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/3.8.5
+SRC_URI=https://hackage.haskell.org/package/text-show-3.8.5/text-show-3.8.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=57074aeb6b48a5a188b7f40dbffaca77
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8a6cd382bd64..e7f9f5ccf149 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/mujs-1.0.7 b/metadata/md5-cache/dev-lang/mujs-1.0.7
index 2b3f2290ff43..36458a6cbd67 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.7
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=An embeddable Javascript interpreter in C.
 EAPI=7
 HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=sys-libs/readline:0=
 SLOT=0/1.0.7
 SRC_URI=https://mujs.com/downloads/mujs-1.0.7.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c9aaa92052ab138291dff57e03d4f52
+_md5_=c9a086d184359f5f11873d233c21b8da
diff --git a/metadata/md5-cache/dev-lang/nasm-2.15.05 b/metadata/md5-cache/dev-lang/nasm-2.15.05
new file mode 100644
index 000000000000..55079a8be3ee
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nasm-2.15.05
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec )
+DEFINED_PHASES=compile install
+DESCRIPTION=groovy little assembler
+EAPI=7
+HOMEPAGE=https://www.nasm.us/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c2b64249124beb49fecde37fe7fd7622
diff --git a/metadata/md5-cache/dev-lang/rust-1.45.2 b/metadata/md5-cache/dev-lang/rust-1.45.2
index 58e9c1eabb24..2a608f188273 100644
--- a/metadata/md5-cache/dev-lang/rust-1.45.2
+++ b/metadata/md5-cache/dev-lang/rust-1.45.2
@@ -5,7 +5,7 @@ DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 IUSE=clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc64 ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=dev-libs/libgit2-0.99:= net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:10[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?] ) <sys-devel/llvm-11:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=stable/1.45
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz -> rustc-1.45.2-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.44.1-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.44.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.44.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.44.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.44.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.44.1-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.44.1-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=89493100473c4e065047e6dfde201639
+_md5_=72a6e424527d59c25686c691a42396e1
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.45.2 b/metadata/md5-cache/dev-lang/rust-bin-1.45.2
index 2fe2cf3676b2..943d16eda275 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.45.2
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.45.2
@@ -3,11 +3,11 @@ DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 IUSE=clippy cpu_flags_x86_sse2 doc rls rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc64 ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.45.2-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.45.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.45.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.45.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.45.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.45.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.45.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.45.2-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.45.2-i686-unknown-linux-gnu.tar.xz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=714cb4d915761499d426b9bbcd880c3a
+_md5_=169b5869b214e2f2f5f36d8fa77e1374
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a08a4af9974a..2be7cba5c85b 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/libaio-0.3.112 b/metadata/md5-cache/dev-libs/libaio-0.3.112
index d14a3fc7509d..7c97b615a22b 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.112
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.112
@@ -3,10 +3,10 @@ DESCRIPTION=Asynchronous input/output library that uses the kernels native inter
 EAPI=7
 HOMEPAGE=https://pagure.io/libaio
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=6d21dac488108efa5d893323503e1caf
+_md5_=673b3c29b0ea81016a159e0cec3a4657
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.24.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.24.1
new file mode 100644
index 000000000000..687822f10901
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install pretend
+DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=7
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.24.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=22bce672b1888b88ab3df09332903860
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
index 2871b7f2e385..435cbd2225aa 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
@@ -4,9 +4,9 @@ DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c4b43e13ed078a3e2a2320667b16038
+_md5_=54714b8d1e4bcdcf0979c58db2a872eb
diff --git a/metadata/md5-cache/dev-libs/libofx-0.9.15 b/metadata/md5-cache/dev-libs/libofx-0.9.15
index 745bd5e3a59d..b74b1215a707 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.9.15
+++ b/metadata/md5-cache/dev-libs/libofx-0.9.15
@@ -5,11 +5,11 @@ DESCRIPTION=Library to support the Open Financial eXchange XML format
 EAPI=7
 HOMEPAGE=https://github.com/libofx/libofx
 IUSE=static-libs test
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libofx/libofx/archive/0.9.15.tar.gz -> libofx-0.9.15.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca58c25fd0807c04dfa8d2fef4f78b12
+_md5_=6c2f9762e8589a9f8c89396dafa73155
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.44 b/metadata/md5-cache/dev-libs/libpcre-8.44
index 84793bf490ea..af324b15b3a0 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.44
+++ b/metadata/md5-cache/dev-libs/libpcre-8.44
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode 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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.44.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.44.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=03fd3786ade17139df4df65b59ce8392
+_md5_=f2567bd4eb9dec9ca14845811a9856aa
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
index e30867f6b231..86d5d94db492 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
@@ -5,7 +5,7 @@ DESCRIPTION=Optimized C library for EC operations on curve secp256k1
 EAPI=7
 HOMEPAGE=https://github.com/bitcoin-core/secp256k1
 IUSE=+asm ecdh endomorphism experimental gmp java +recovery test test-openssl
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=gmp? ( dev-libs/gmp:0= )
 REQUIRED_USE=asm? ( || ( amd64 arm ) arm? ( experimental ) ) ecdh? ( experimental ) java? ( ecdh ) test-openssl? ( test )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/b19c000063be11018b4d1a6b0a85871ab9d0bdcf.tar.gz -> libsecp256k1-v0.1_pre20190401.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd2e53f40a2faf3835983a015792eb7b
+_md5_=5753da5460381cb80f8771f5470483e3
diff --git a/metadata/md5-cache/dev-libs/libzia-4.22 b/metadata/md5-cache/dev-libs/libzia-4.22
new file mode 100644
index 000000000000..7811f3dcb138
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.22
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 ) virtual/pkgconfig
+DESCRIPTION=platform abstraction code for tucnak package
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.22.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f5ed2e89405e4f635c6e4f07ffb3298
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3 b/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3
index 521e7ce28628..d96e7e1c9536 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3
+++ b/metadata/md5-cache/dev-libs/tntnet-2.2.1-r3
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig app-arch/zip >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 DESCRIPTION=Modular, multithreaded web application server extensible with C++
 EAPI=7
 HOMEPAGE=http://www.tntnet.org/
-IUSE=gnutls libressl server ssl examples static-libs
+IUSE=gnutls libressl server ssl examples
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-2.2.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e41fcbbf16b03211878babf4af74f98d
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d9232a59b4b0df92659b2bb132d46b3e
diff --git a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0 b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
new file mode 100644
index 000000000000..32e23641036a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Alien-Build-1.200.0 dev-perl/Archive-Extract >=virtual/perl-Archive-Tar-1.400.0 >=dev-perl/Capture-Tiny-0.170.0 >=dev-perl/File-chdir-0.100.500 >=virtual/perl-HTTP-Tiny-0.44.0 >=dev-perl/Module-Build-0.400.400 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Shell-Config-Generate dev-perl/Shell-Guess dev-perl/Sort-Versions >=virtual/perl-Text-ParseWords-3.260.0 dev-perl/URI virtual/perl-parent dev-perl/HTML-Parser virtual/perl-JSON-PP test? ( >=dev-perl/Test2-Suite-0.0.60 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=A Module::Build subclass for building Alien:: modules and their libraries
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Alien-Base-ModuleBuild
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Alien-Build-1.200.0 dev-perl/Archive-Extract >=virtual/perl-Archive-Tar-1.400.0 >=dev-perl/Capture-Tiny-0.170.0 >=dev-perl/File-chdir-0.100.500 >=virtual/perl-HTTP-Tiny-0.44.0 >=dev-perl/Module-Build-0.400.400 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Shell-Config-Generate dev-perl/Shell-Guess dev-perl/Sort-Versions >=virtual/perl-Text-ParseWords-3.260.0 dev-perl/URI virtual/perl-parent dev-perl/HTML-Parser virtual/perl-JSON-PP dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=51b67970f036dcc787cad1b060ffd258
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.270.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.270.0
new file mode 100644
index 000000000000..4fab0acf9e2c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.270.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir virtual/perl-File-Spec >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 virtual/perl-Storable >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( virtual/perl-CPAN-Meta-Requirements >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Temp dev-perl/IPC-System-Simple dev-perl/Path-Tiny dev-perl/Test-File-ShareDir >=virtual/perl-Test-Simple-1.302.15 dev-perl/Test2-Plugin-NoWarnings dev-perl/Test2-Suite ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Localization support for DateTime
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/DateTime-Locale
+IUSE=test examples
+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 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ ) unicode
+RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir virtual/perl-File-Spec >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 virtual/perl-Storable >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.27.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=6edde461adc9e616a18ec92b742a65cf
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.280.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.280.0
new file mode 100644
index 000000000000..561fec16d3c5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.280.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir virtual/perl-File-Spec >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 virtual/perl-Storable >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( virtual/perl-CPAN-Meta-Requirements >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Temp dev-perl/IPC-System-Simple dev-perl/Path-Tiny dev-perl/Test-File-ShareDir >=virtual/perl-Test-Simple-1.302.15 dev-perl/Test2-Plugin-NoWarnings dev-perl/Test2-Suite ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Localization support for DateTime
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/DateTime-Locale
+IUSE=test examples
+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 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ ) unicode
+RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir virtual/perl-File-Spec >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 virtual/perl-Storable >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.28.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=5c66b7fcc37b257af932a7ab542df737
diff --git a/metadata/md5-cache/dev-perl/File-Flat-1.70.0 b/metadata/md5-cache/dev-perl/File-Flat-1.70.0
new file mode 100644
index 000000000000..a4c249717912
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-Flat-1.70.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/File-Copy-Recursive-0.350.0 >=dev-perl/File-Remove-0.380.0 >=virtual/perl-File-Spec-0.850.0 >=virtual/perl-File-Temp-0.170.0 virtual/perl-IO >=dev-perl/prefork-0.20.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 >=dev-perl/Test-ClassAPI-1.40.0 >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Implements a flat filesystem
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-Flat
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/File-Copy-Recursive-0.350.0 >=dev-perl/File-Remove-0.380.0 >=virtual/perl-File-Spec-0.850.0 >=virtual/perl-File-Temp-0.170.0 virtual/perl-IO >=dev-perl/prefork-0.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-Flat-1.07.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=b8fd9559adffa3717242e430f820c606
diff --git a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0-r1 b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0-r1
new file mode 100644
index 000000000000..fd10d4e623bc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/AnyEvent dev-perl/Data-Structure-Util >=dev-perl/IO-Event-0.812.0 dev-perl/Event virtual/perl-Time-HiRes dev-perl/Module-Build test? ( dev-perl/File-Slurp dev-perl/Test-SharedFork ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=flock() wrapper. Auto-create locks
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-Flock
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/AnyEvent dev-perl/Data-Structure-Util >=dev-perl/IO-Event-0.812.0 dev-perl/Event virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/File-Flock-2014.01.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=30a058211bf32d47a2d4695354b49a83
diff --git a/metadata/md5-cache/dev-perl/File-HomeDir-1.4.0 b/metadata/md5-cache/dev-perl/File-HomeDir-1.4.0
new file mode 100644
index 000000000000..9e529f8420f3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-HomeDir-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3.120.0 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Get home directory for self or other user
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-HomeDir
+IUSE=+xdg test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3.120.0 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=a121ed7912bd68bfae732fe31e415ad7
diff --git a/metadata/md5-cache/dev-perl/File-LibMagic-1.220.0-r1 b/metadata/md5-cache/dev-perl/File-LibMagic-1.220.0-r1
new file mode 100644
index 000000000000..9dd8c2e91261
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-LibMagic-1.220.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/file virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-Scalar-List-Utils dev-perl/Config-AutoConf virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl wrapper for libmagic
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-LibMagic
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-apps/file virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.22.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=bc6b8088c0b0731e9e3010c1f5640de8
diff --git a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r2 b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r2
new file mode 100644
index 000000000000..6b761f0702f2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse directory listings
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-Listing
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=5bb1d16375ac7c05b1c7197d9671e93b
diff --git a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r2 b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r2
new file mode 100644
index 000000000000..da2eb4d06854
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=The Perl Image-Info Module
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-MMagic
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=File-MMagic
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=e4a1aaa606ffc7201cde1c77d5a16300
diff --git a/metadata/md5-cache/dev-perl/File-Map-0.670.0 b/metadata/md5-cache/dev-perl/File-Map-0.670.0
new file mode 100644
index 000000000000..ca9b9d886672
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-Map-0.670.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/PerlIO-Layers >=dev-perl/Sub-Exporter-Progressive-0.1.5 virtual/perl-XSLoader >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-IO virtual/perl-Scalar-List-Utils dev-perl/Test-Fatal virtual/perl-Test-Simple >=dev-perl/Test-Warnings-0.5.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=Memory mapping made simple and safe
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-Map
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/PerlIO-Layers >=dev-perl/Sub-Exporter-Progressive-0.1.5 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.67.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=935d377d41509c5e4cfae2ab3541f345
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.290.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.290.0
new file mode 100644
index 000000000000..88325c9f5bc5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-MimeInfo-0.290.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/File-BaseDir-0.30.0 >=dev-perl/File-DesktopEntry-0.40.0 x11-misc/shared-mime-info >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Determine file type
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/File-MimeInfo
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/File-BaseDir-0.30.0 >=dev-perl/File-DesktopEntry-0.40.0 x11-misc/shared-mime-info dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f7a371f42c7f682b3c69ed4311356fee
diff --git a/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0 b/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
index 7c66993e12f6..a019f0dfaf4e 100644
--- a/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
+++ b/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
@@ -4,11 +4,11 @@ DESCRIPTION=Get stock and mutual fund quotes from various exchanges
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Finance-Quote
 IUSE=test examples
-KEYWORDS=~alpha amd64 ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/CGI virtual/perl-Carp dev-perl/DateTime virtual/perl-Encode virtual/perl-Exporter dev-perl/HTML-Parser dev-perl/HTML-TableExtract dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/HTTP-Message dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Mozilla-CA virtual/perl-Time-Piece dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.47.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4b0b4cc07f40a46f84e91838687276cb
+_md5_=afff3e91cfbcd4cc677c613ae33b5270
diff --git a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1 b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
index fb9ffc518fd9..30d3cd4decde 100644
--- a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/HTML-Tree-3.01 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Extension for manipulating a table composed of HTML::Element style components
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/HTML-Element-Extended
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tree-3.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fcc371dc40a9d054064e837fb9309902
+_md5_=b841fcdc07d5c139962d9c32173c49c5
diff --git a/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0 b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
index 2be6ff6d239b..893647a2eec6 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser virtual/per
 DESCRIPTION=The Perl Table-Extract Module
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTML-TableExtract
-KEYWORDS=~alpha amd64 ppc ppc64 x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ppc ppc64 x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f6a1d5c34261287f8046bc5876626819
+_md5_=bab0d87590729ac7f2bb9e170a3f7a85
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 3abf6ec8e840..aca322cf94e2 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0-r1 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0-r1
new file mode 100644
index 000000000000..8b3d08cdfd70
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader >=dev-perl/Module-Build-0.360.100 test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.820.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl
+DESCRIPTION=Querying your filehandle's capabilities
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/PerlIO-Layers
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=c67ff9e6eef6d23b86b10995d3c45a2c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4e50616a189c..bc381b27d183 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/cairocffi-0.9.0-r1 b/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
index 74eb8100b66b..5e3c7b609a12 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/cairocffi
 IUSE=test doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) >=dev-python/xcffib-0.3.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.9.0.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=5c6527487dd05fcd0930599452cb8d12
+_md5_=87bcd33500cfafb0dbac03c6f4f607c2
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r1 b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
index 66bd7d42fde6..8460c6d42f92 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Friendlier RFC 6265-compliant cookie parser/renderer
 EAPI=7
 HOMEPAGE=https://gitlab.com/sashahart/cookies
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c66c3e8cf1ac5241f24b73563e0b49f5
+_md5_=4a60fbd485fa6423bef5b689e1b6780f
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21 b/metadata/md5-cache/dev-python/cython-0.29.21
index 9a3507fd5e19..42a909ab4b82 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21
+++ b/metadata/md5-cache/dev-python/cython-0.29.21
@@ -4,7 +4,7 @@ DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
 IUSE=emacs test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bbb710eacb586ec5cb8a067a31bd2c31
+_md5_=ba6dc002e3612f70102473fac7fa3612
diff --git a/metadata/md5-cache/dev-python/dask-2.25.0 b/metadata/md5-cache/dev-python/dask-2.25.0
new file mode 100644
index 000000000000..606a5ad89d96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toolz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/numexpr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3fs-0.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/cloudpickle-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(-)] >=dev-python/fsspec-0.6.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/numpy-1.13.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/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/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/toolz-0.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-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=Task scheduling and blocked algorithms for parallel processing
+EAPI=7
+HOMEPAGE=https://dask.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-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(-)] >=dev-python/fsspec-0.6.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/numpy-1.13.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/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/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/toolz-0.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dask/dask-2.25.0.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=19e17a42ddf37221fa8a5e32ebb1f555
diff --git a/metadata/md5-cache/dev-python/distro-1.5.0 b/metadata/md5-cache/dev-python/distro-1.5.0
index a3c08ca43dde..f8921c479123 100644
--- a/metadata/md5-cache/dev-python/distro-1.5.0
+++ b/metadata/md5-cache/dev-python/distro-1.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Reliable machine-readable Linux distribution information for Python
 EAPI=7
 HOMEPAGE=https://distro.readthedocs.io/en/latest/
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.5.0.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=268be3ef8ac7ca1b7b1f1d293dd1cbaa
+_md5_=9a77f4f5f8cf7e430ec12a5e4c19214e
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.16.0 b/metadata/md5-cache/dev-python/ecdsa-0.16.0
new file mode 100644
index 000000000000..2e708567bcff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ecdsa-0.16.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_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[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/idna[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) test? ( python_targets_python2_7? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-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/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ECDSA cryptographic signature library in pure Python
+EAPI=7
+HOMEPAGE=https://github.com/warner/python-ecdsa
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.16.0.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b449e583ca1bc4bf06b728539ee761cd
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.29.4 b/metadata/md5-cache/dev-python/hypothesis-5.29.4
new file mode 100644
index 000000000000..5e59d4410135
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.29.4
@@ -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(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) dev-python/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/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ia64 ~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(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_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.29.4.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6a823210c2934f5badfba75497784ed
diff --git a/metadata/md5-cache/dev-python/ipython-7.18.0 b/metadata/md5-cache/dev-python/ipython-7.18.0
new file mode 100644
index 000000000000..f28d25a49262
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-7.18.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/backcall[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[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/jedi-0.16[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/pexpect-4.3[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/pickleshare[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/prompt_toolkit-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[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/pygments[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/traitlets[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(-)] matplotlib? ( dev-python/matplotlib[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/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[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/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.14[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/requests[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/testpath[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(-)] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[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/sphinx-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(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=7
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_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/ipywidgets[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/widgetsnbextension[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(-)] ) qt5? ( dev-python/qtconsole[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(-)] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipyparallel-6.2.3[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(-)] )
+RDEPEND=dev-python/backcall[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[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/jedi-0.16[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/pexpect-4.3[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/pickleshare[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/prompt_toolkit-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[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/pygments[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/traitlets[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(-)] matplotlib? ( dev-python/matplotlib[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(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-7.18.0.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=2f01203454759bd216175281a6689395
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.5.0 b/metadata/md5-cache/dev-python/more-itertools-8.5.0
new file mode 100644
index 000000000000..3c928f775483
--- /dev/null
+++ b/metadata/md5-cache/dev-python/more-itertools-8.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=More routines for operating on iterables, beyond itertools
+EAPI=7
+HOMEPAGE=https://pypi.org/project/more-itertools/
+IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.5.0.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cd2ce1e2a73841c86bf8cb22584cadbc
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r1 b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
index 82c7f9a68c8b..efb695fae965 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to DBus notifications.
 EAPI=6
 HOMEPAGE=https://bitbucket.org/takluyver/pynotify2
 IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2102ba9eded89ae9d571ecea56ab9972
+_md5_=eb71949e9c4bc136330b071e3e799670
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.2 b/metadata/md5-cache/dev-python/numexpr-2.7.2
new file mode 100644
index 000000000000..e610d0fcc8cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
+EAPI=7
+HOMEPAGE=https://github.com/pydata/numexpr
+IUSE=mkl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] mkl? ( sci-libs/mkl ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.2.tar.gz -> numexpr-2.7.2.gh.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a5903ac9dfb624d1a55851c71ae5199a
diff --git a/metadata/md5-cache/dev-python/pillow-7.2.0 b/metadata/md5-cache/dev-python/pillow-7.2.0
index 86678ffa2c06..65871e4d84e6 100644
--- a/metadata/md5-cache/dev-python/pillow-7.2.0
+++ b/metadata/md5-cache/dev-python/pillow-7.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-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=HPND
 RDEPEND=dev-python/olefile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=test? ( jpeg tiff ) || ( 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/python-pillow/Pillow/archive/7.2.0.tar.gz -> pillow-7.2.0.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=294f86f8be0b5e7d5790b619416b6a8f
+_md5_=368590fd9860371dd82db9c35b8016b9
diff --git a/metadata/md5-cache/dev-python/pygobject-3.36.1 b/metadata/md5-cache/dev-python/pygobject-3.36.1
index 508230389706..ec4b32cface5 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.36.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.36.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for GObject Introspection
 EAPI=7
 HOMEPAGE=https://pygobject.readthedocs.io/
 IUSE=+cairo examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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(-)] x11-libs/cairo[glib] )
 REQUIRED_USE=|| ( 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=3
 SRC_URI=mirror://gnome/sources/pygobject/3.36/pygobject-3.36.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a79bb1f2928ce4e482c3a17efc65d02a
+_md5_=335ded1988dbedfc9c35763b11b0c76f
diff --git a/metadata/md5-cache/dev-python/pytest-django-3.10.0 b/metadata/md5-cache/dev-python/pytest-django-3.10.0
new file mode 100644
index 000000000000..ff4d39c7673f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-django-3.10.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_scm-1.11.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=A Django plugin for py.test
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-django/archive/v3.10.0.tar.gz -> pytest-django-3.10.0.gh.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7050388c494986a1e2ca3d0810520aa2
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.42 b/metadata/md5-cache/dev-python/reportlab-3.5.42
index eaf1ae740dd7..b1ffa4d949d1 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.42
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.42
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=7
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/ https://bitbucket.org/rptlab/reportlab/
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/libart_lgpl:= sys-libs/zlib:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.42.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9bbe9933dc787777ec4a5e7783667839
+_md5_=40f8c09bfd8a4f836cadefae963c307d
diff --git a/metadata/md5-cache/dev-python/responses-0.11.0 b/metadata/md5-cache/dev-python/responses-0.11.0
index 1d75aa8ea02a..7477b22fd00f 100644
--- a/metadata/md5-cache/dev-python/responses-0.11.0
+++ b/metadata/md5-cache/dev-python/responses-0.11.0
@@ -4,7 +4,7 @@ DESCRIPTION=Utility for mocking out the Python Requests library
 EAPI=7
 HOMEPAGE=https://github.com/getsentry/responses
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.11.0.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4d7b8a7183d2c781e6aba1fc0f0140b
+_md5_=b07d2b92bc58b39a260b5ca264023506
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.0 b/metadata/md5-cache/dev-python/statsmodels-0.12.0
new file mode 100644
index 000000000000..f3ef54e04a9d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.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/numpy-1.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/ipykernel[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/jupyter_client[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/matplotlib[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/nbconvert[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/numpydoc[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/ipykernel[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/jupyter_client[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/matplotlib[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/nbconvert[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/numpydoc[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/ipykernel[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/jupyter_client[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/matplotlib[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/nbconvert[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/numpydoc[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/ipykernel[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/jupyter_client[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/matplotlib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/nbconvert[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/numpydoc[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/numpy-1.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.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/patsy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Statistical computations and models for use with SciPy
+EAPI=7
+HOMEPAGE=https://www.statsmodels.org/stable/index.html
+IUSE=examples doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.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/patsy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.0.tar.gz
+_eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c0260318a3b3226cee51afea4031008a
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 7f581da2fc31..dc30768fb6bd 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.14.2-r1 b/metadata/md5-cache/dev-qt/qtgui-5.14.2-r1
index a41a9178686a..2b3701045396 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.14.2-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.14.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.14.2 )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.14.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.14.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.14.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.14.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.14.2
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=356e40b332f42ec3c72ef1ff0cf83396
+_md5_=8564d4c308f9fac9d5bd0c1976a00abf
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ee8874c1dc9e..f5bdd4b85802 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/concurrent-ruby-1.1.7 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
new file mode 100644
index 000000000000..29d70f0876a9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=Modern concurrency tools including agents, futures, promises, thread pools, more
+EAPI=7
+HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_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=1
+SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.7.tar.gz -> concurrent-ruby-1.1.7.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1f115725a6849e3ddf94ac249c103b76
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index cde75bdbcd95..0340dafa75d2 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/aastex-5.2 b/metadata/md5-cache/dev-tex/aastex-5.2
deleted file mode 100644
index 11f1106f0a28..000000000000
--- a/metadata/md5-cache/dev-tex/aastex-5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX package for American Astronomical Society journals. (AASTeX)
-EAPI=7
-HOMEPAGE=https://journals.aas.org/authors/aastex.html
-KEYWORDS=~alpha amd64 hppa ~mips ppc sparc x86
-LICENSE=LPPL-1.3
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=https://www.journals.uchicago.edu/AAS/AASTeX/aastex52.tar.gz
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=b1e5284dadce1929bc1c804f9064052d
diff --git a/metadata/md5-cache/dev-tex/herm-pic-1.0.2 b/metadata/md5-cache/dev-tex/herm-pic-1.0.2
deleted file mode 100644
index 169441794a82..000000000000
--- a/metadata/md5-cache/dev-tex/herm-pic-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX class for creating ERM and HER diagramms
-EAPI=7
-HOMEPAGE=http://www.svenies-welt.de/?page_id=26
-KEYWORDS=~amd64 ~x86
-LICENSE=LPPL-1.3
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=http://my.dex.de/~sven/downloads/hermpic_1.0.2.tar.gz
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=81a6f625fed7bcc5c24cfadeff8ed8b9
diff --git a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1 b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
deleted file mode 100644
index 929a3cec9ef0..000000000000
--- a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=HLaTeX is a LaTeX package to use Hangul with LaTeX
-EAPI=7
-HOMEPAGE=http://project.ktug.or.kr/hlatex/
-KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=ftp://ftp.ktug.or.kr/pub/ktug/hlatex/HLaTeX-1.0.1.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-myoungjo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gothic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-taza-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-graphic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gungseo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-shinmun-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgi-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pen-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-bom-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-yetgul-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-jamo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-vada-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgia-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-dinaru-1.0.tar.gz
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=854010d111e9744d9fc314cf0ea0cdef
diff --git a/metadata/md5-cache/dev-tex/slatex-20090928_p20180415 b/metadata/md5-cache/dev-tex/slatex-20090928_p20180415
deleted file mode 100644
index 56c8f54e744a..000000000000
--- a/metadata/md5-cache/dev-tex/slatex-20090928_p20180415
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-scheme/guile dev-scheme/scmxlate virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=A Scheme program allowing you to write Scheme in your (La)TeX source
-EAPI=7
-HOMEPAGE=http://www.ccs.neu.edu/home/dorai/slatex/slatxdoc.html
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-scheme/guile virtual/latex-base
-SLOT=0
-SRC_URI=http://www.ccs.neu.edu/home/dorai/slatex/slatex.tar.bz2 -> slatex-20090928_p20180415.tar.bz2
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=b9fd4d9f794acb0deb7eca115e48c6e6
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index dfe0eef75a04..d7035b98a92f 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/gengetopt-2.23 b/metadata/md5-cache/dev-util/gengetopt-2.23
index 4717e93fd417..1c92577056a3 100644
--- a/metadata/md5-cache/dev-util/gengetopt-2.23
+++ b/metadata/md5-cache/dev-util/gengetopt-2.23
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A tool to write command line option parsing code for C programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gengetopt/
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gengetopt/gengetopt-2.23.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e87c9cca3d8e5c0aac9df42485633399
+_md5_=f62a503b3be849ea90a327b6b79f6aac
diff --git a/metadata/md5-cache/dev-util/meson-0.54.3 b/metadata/md5-cache/dev-util/meson-0.54.3
index 63859178d715..1b6d2ff60dd9 100644
--- a/metadata/md5-cache/dev-util/meson-0.54.3
+++ b/metadata/md5-cache/dev-util/meson-0.54.3
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.54.3.tar.gz
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=183e0fd14d73405638de78f653a53e75
+_md5_=9fd6ab972ff6f7d76c8b7387129f7400
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.0 b/metadata/md5-cache/dev-util/ninja-1.10.0
index bb7b542a564b..13017789104a 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.0
+++ b/metadata/md5-cache/dev-util/ninja-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz -> ninja-1.10.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	cae18e9c43c86703b074d0b15dcdb9e2	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=33289b63d92b5f99d2096e40f7688c9e
+_md5_=5d651da7eee401393481195a6ccd0fb3
diff --git a/metadata/md5-cache/dev-util/strace-5.8 b/metadata/md5-cache/dev-util/strace-5.8
index 24b11b4595f0..db492ea24654 100644
--- a/metadata/md5-cache/dev-util/strace-5.8
+++ b/metadata/md5-cache/dev-util/strace-5.8
@@ -5,11 +5,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=7
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v5.8/strace-5.8.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6d4f553ad931e9d4c10ebd9de67d2145
+_md5_=da63826d18404a9d625277482130bed7
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 2575eed4380f..eadb21419174 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.34.5-r1 b/metadata/md5-cache/gnome-base/gnome-shell-3.34.5-r1
index 434fb1c23678..20aaee9ad5d5 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.34.5-r1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.34.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.57.3 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.34.0:0/5[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.32:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.34/gnome-shell-3.34.5.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f018550254c70f43ed9a88fe621d475d
+_md5_=278121dff06767d3699430baa9965bf0
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 72f2795893bc..65499055bcff 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/balsa-2.5.6-r1 b/metadata/md5-cache/mail-client/balsa-2.5.6-r1
deleted file mode 100644
index 38b241561719..000000000000
--- a/metadata/md5-cache/mail-client/balsa-2.5.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/gspell-1.2:0= >=dev-libs/glib-2.40.0:2 net-libs/gnutls:= >=x11-libs/gtk+-3.10.0:3 dev-libs/gmime:2.6 net-mail/mailbase media-libs/libcanberra:=[gtk3] x11-themes/hicolor-icon-theme x11-themes/adwaita-icon-theme crypt? ( >=app-crypt/gpgme-1.5.0:= ) gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 ) gnome-keyring? ( app-crypt/libsecret ) sqlite? ( >=dev-db/sqlite-2.8:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) rubrica? ( dev-libs/libxml2:2 ) webkit? ( net-libs/webkit-gtk:4 app-text/html2text ) xface? ( >=media-libs/compface-1.5.1:= ) dev-util/gtk-update-icon-cache app-text/yelp-tools dev-util/intltool virtual/pkgconfig sys-devel/gettext dev-libs/libxml2:2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Email client for GNOME
-EAPI=6
-HOMEPAGE=http://pawsa.fedorapeople.org/balsa/
-IUSE=crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/gspell-1.2:0= >=dev-libs/glib-2.40.0:2 net-libs/gnutls:= >=x11-libs/gtk+-3.10.0:3 dev-libs/gmime:2.6 net-mail/mailbase media-libs/libcanberra:=[gtk3] x11-themes/hicolor-icon-theme x11-themes/adwaita-icon-theme crypt? ( >=app-crypt/gpgme-1.5.0:= ) gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 ) gnome-keyring? ( app-crypt/libsecret ) sqlite? ( >=dev-db/sqlite-2.8:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) rubrica? ( dev-libs/libxml2:2 ) webkit? ( net-libs/webkit-gtk:4 app-text/html2text ) xface? ( >=media-libs/compface-1.5.1:= )
-SLOT=0
-SRC_URI=http://pawsa.fedorapeople.org/balsa/balsa-2.5.6.tar.bz2
-_eclasses_=desktop	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_=391d0a234888e4f6cde9c912645bde2f
diff --git a/metadata/md5-cache/mail-client/geary-3.36.2 b/metadata/md5-cache/mail-client/geary-3.36.3.1
similarity index 78%
rename from metadata/md5-cache/mail-client/geary-3.36.2
rename to metadata/md5-cache/mail-client/geary-3.36.3.1
index b28a4d0ae335..a4d0ee7b17a9 100644
--- a/metadata/md5-cache/mail-client/geary-3.36.2
+++ b/metadata/md5-cache/mail-client/geary-3.36.3.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-libs/appstream-glib-0.7.10 dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) x11-libs/gtk+:3[introspection] net-libs/webkit-gtk:4[introspection] dev-libs/gmime:3.0[vala] app-crypt/gcr:0[introspection,vala] dev-libs/libgee:0.8[introspection] app-text/gspell[vala] gui-libs/libhandy:0.0[vala] app-crypt/libsecret[introspection,vala] net-libs/libsoup:2.4[introspection,vala] app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=>=dev-libs/appstream-glib-0.7.10 dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) x11-libs/gtk+:3[introspection] net-libs/webkit-gtk:4[introspection] dev-libs/gmime:3.0[vala] app-crypt/gcr:0[introspection,vala] dev-libs/libgee:0.8[introspection] app-text/gspell[vala] gui-libs/libhandy:0.0[vala] app-crypt/libsecret[introspection,vala] net-libs/libsoup:2.4[introspection,vala] app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.60.4:2 >=x11-libs/gtk+-3.24.7:3 >=net-libs/webkit-gtk-2.26.4-r1:4= >=dev-libs/gmime-3.2.4:3.0 >=dev-db/sqlite-3.24:3 app-text/enchant:2 >=dev-libs/folks-0.11:0 >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts >=app-text/gspell-1.7:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=gui-libs/libhandy-0.0.10:0.0= >=dev-libs/libpeas-1.24.0 >=app-crypt/libsecret-0.11 >=net-libs/libsoup-2.48:2.4 >=sys-libs/libunwind-1.1:0 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.60.4:2 >=x11-libs/gtk+-3.24.7:3 >=net-libs/webkit-gtk-2.26.4-r1:4= >=dev-libs/gmime-3.2.4:3.0 >=dev-db/sqlite-3.24:3 app-text/enchant:2 >=dev-libs/folks-0.11:0 >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts >=app-text/gspell-1.7:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=gui-libs/libhandy-0.0.10:0.0= >=dev-libs/libpeas-1.24.0 >=app-crypt/libsecret-0.11 >=net-libs/libsoup-2.48:2.4 >=sys-libs/libunwind-1.1:0 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) gnome-base/gsettings-desktop-schemas
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://gnome/sources/geary/3.36/geary-3.36.2.tar.xz
+SRC_URI=mirror://gnome/sources/geary/3.36/geary-3.36.3.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=053857e0064560621b4e7ce6dc4eabd8
+_md5_=abaa9989ed83bb973dd209589a51ed1b
diff --git a/metadata/md5-cache/mail-client/roundcube-1.4.8 b/metadata/md5-cache/mail-client/roundcube-1.4.8
index 0ad9e5692b7f..c49a0aa44001 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.4.8
+++ b/metadata/md5-cache/mail-client/roundcube-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=A browser-based multilingual IMAP client with an application-like us
 EAPI=6
 HOMEPAGE=https://roundcube.net
 IUSE=change-password enigma ldap mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
 RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.4.8
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.4.8/roundcubemail-1.4.8-complete.tar.gz
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=30d8e4e246ef7cb6fb1a7f21a74f34ff
+_md5_=a960e868504d3d5ae097ede216280e56
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f626f2a67051..9b42993af54d 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/gst-rtsp-server-1.16.2 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.16.2
new file mode 100644
index 000000000000..00d8297f82af
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A GStreamer based RTSP server
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html
+IUSE=examples +introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.16.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.16.2.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	8a466dd446e1c7460b9c23bb98dc5053	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd8ec162672886d2898faf0f30704a68
diff --git a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2 b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
index 18d74f2c1f26..5f1122863583 100644
--- a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
+++ b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard
 EAPI=7
 HOMEPAGE=https://code.google.com/p/mp4v2/
 IUSE=static-libs utils
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MPL-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mp4v2.googlecode.com/files/mp4v2-2.0.0.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7fea7ef3faeade9a46e7808ea52ba02a
+_md5_=871fae7d87580d4aae4b48dcc19c8986
diff --git a/metadata/md5-cache/media-libs/openal-1.20.1 b/metadata/md5-cache/media-libs/openal-1.20.1
index f2005768a768..7643b8dd6030 100644
--- a/metadata/md5-cache/media-libs/openal-1.20.1
+++ b/metadata/md5-cache/media-libs/openal-1.20.1
@@ -5,10 +5,10 @@ DESCRIPTION=A software implementation of the OpenAL 3D audio API
 EAPI=7
 HOMEPAGE=https://www.openal-soft.org/
 IUSE=alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.20.1.tar.bz2
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9590edc271b962b9318010ad0cf4a1f6
+_md5_=6bdc90a60665b662dcc2c7ff442f4258
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 8646d97e3bf1..ab857c1e37e8 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/tucnak-4.22 b/metadata/md5-cache/media-radio/tucnak-4.22
new file mode 100644
index 000000000000..44f618afe1c8
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.22
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.22.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bf409551c237e267e7979f2c1fa90867
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9df8c9beaa74..95a499aaa02d 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/ecasound-2.9.1-r1 b/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
deleted file mode 100644
index e5a030b2f700..000000000000
--- a/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-libs/audiofile:= ) jack? ( virtual/jack:= ) libsamplerate? ( media-libs/libsamplerate:= ) lv2? ( >=media-libs/lilv-0.5.0:= ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0= ) ncurses? ( sys-libs/ncurses:0= ) oil? ( dev-libs/liboil:= ) osc? ( media-libs/liblo:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile:= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a package for multitrack audio processing
-EAPI=6
-HOMEPAGE=https://ecasound.seul.org/ecasound/
-IUSE=alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss python ruby sndfile static-libs test +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-libs/audiofile:= ) jack? ( virtual/jack:= ) libsamplerate? ( media-libs/libsamplerate:= ) lv2? ( >=media-libs/lilv-0.5.0:= ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0= ) ncurses? ( sys-libs/ncurses:0= ) oil? ( dev-libs/liboil:= ) osc? ( media-libs/liblo:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile:= )
-REQUIRED_USE=test? ( lv2 ) python? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=https://ecasound.seul.org/download/ecasound-2.9.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e661c151238ca0a8e97c4532416d725b
diff --git a/metadata/md5-cache/media-sound/mixxx-2.2.4 b/metadata/md5-cache/media-sound/mixxx-2.2.4
index f72988fe0191..1fe6720d661a 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.2.4
+++ b/metadata/md5-cache/media-sound/mixxx-2.2.4
@@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.2.4.tar.gz -> mixxx-2.2.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9e06b7529367bbcdeed9981f13b83ef
+_md5_=93967073e5000b19305f81d11f188d2a
diff --git a/metadata/md5-cache/media-sound/mixxx-9999 b/metadata/md5-cache/media-sound/mixxx-9999
index bd506f5ba2bd..17393fed0a64 100644
--- a/metadata/md5-cache/media-sound/mixxx-9999
+++ b/metadata/md5-cache/media-sound/mixxx-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9bb48ae16f30990361a11de95a2b06b
+_md5_=7d799525f41aad4bdde95f4100318090
diff --git a/metadata/md5-cache/media-sound/mp3gain-1.6.1 b/metadata/md5-cache/media-sound/mp3gain-1.6.1
deleted file mode 100644
index 0d82cda8d066..000000000000
--- a/metadata/md5-cache/media-sound/mp3gain-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip media-sound/mpg123
-DESCRIPTION=A program to analyze and adjust MP3 files to same volume
-EAPI=6
-HOMEPAGE=http://mp3gain.sourceforge.net/
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/unzip media-sound/mpg123
-SLOT=0
-SRC_URI=mirror://sourceforge/mp3gain/mp3gain-1_6_1-src.zip
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a931bc24dc9d8f61e235223618cf0b55
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.2 b/metadata/md5-cache/media-sound/patchage-1.0.2
index c3c5e444360b..e47593bb98d4 100644
--- a/metadata/md5-cache/media-sound/patchage-1.0.2
+++ b/metadata/md5-cache/media-sound/patchage-1.0.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.11.12:2.4 >=dev-cpp/libglademm
 SLOT=0
 SRC_URI=http://download.drobilla.net/patchage-1.0.2.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d417590242fd7243d7955fe9b758fc1b
+_md5_=dda9dff828076d4c25a89eaddaa8dcaf
diff --git a/metadata/md5-cache/media-sound/sox-14.4.2_p20200803 b/metadata/md5-cache/media-sound/sox-14.4.2_p20200803
index e33ccb039590..ff26d8d223db 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.2_p20200803
+++ b/metadata/md5-cache/media-sound/sox-14.4.2_p20200803
@@ -5,10 +5,10 @@ DESCRIPTION=The swiss army knife of sound processing programs
 EAPI=7
 HOMEPAGE=http://sox.sourceforge.net
 IUSE=alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libltdl:0= >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libogg media-libs/libvorbis ) opus? ( media-libs/opus media-libs/opusfile ) png? ( media-libs/libpng:0= sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/media-sound/sox/sox-code-50857c46c03a85c72826e819f5e815aad4a4633d.zip -> sox-14.4.2_p20200803.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a805ab0b6adda963746fa47520154cd2
+_md5_=c8f64c8730fa0160bc0ca6a97d7fdf6d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0028092affda..b5d4cb74594f 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vlc-3.0.11.1 b/metadata/md5-cache/media-video/vlc-3.0.11.1
index 38168a7ee95d..6bb5502e3650 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.11.1
+++ b/metadata/md5-cache/media-video/vlc-3.0.11.1
@@ -5,7 +5,7 @@ DESCRIPTION=Media player and framework with support for most multimedia files an
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 -sparc ~x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.11.1/vlc-3.0.11.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=896e12d0b3aa656213b5d5f5c9dc8a5e
+_md5_=f88d61e5a021b420d6eb07a7adc75a61
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index f73a4cf3e249..669d641846b3 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/argus-3.0.8.3 b/metadata/md5-cache/net-analyzer/argus-3.0.8.3
new file mode 100644
index 000000000000..cf4f44fa1a21
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=net-libs/libnsl:= net-libs/libpcap net-libs/libtirpc sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6
+DESCRIPTION=network Audit Record Generation and Utilization System
+EAPI=7
+HOMEPAGE=https://openargus.org/
+IUSE=debug sasl tcpd
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=net-libs/libnsl:= net-libs/libpcap net-libs/libtirpc sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+SLOT=0
+SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=6ffb71045eb5f2cd4a4383ed8d50313c
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
new file mode 100644
index 000000000000..0f83f0351199
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig
+DESCRIPTION=Clients for net-analyzer/argus
+EAPI=7
+HOMEPAGE=https://openargus.org/
+IUSE=debug ft geoip mysql sasl tcpd
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
+SLOT=0
+SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=420ac97e4e09023951bb7443a2447f0d
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.0.0 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.0.0-r1
similarity index 93%
rename from metadata/md5-cache/net-analyzer/nessus-agent-bin-8.0.0
rename to metadata/md5-cache/net-analyzer/nessus-agent-bin-8.0.0-r1
index ed5d6a8e866c..9e0d216be265 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.0.0
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.0.0-r1
@@ -9,4 +9,4 @@ RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=NessusAgent-8.0.0-es8.x86_64.rpm
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cd3d5728725c537ef12bf3f83180a6e7
+_md5_=d2307b43161a6016d384bd3e4e843442
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.11.1 b/metadata/md5-cache/net-analyzer/nessus-bin-8.11.1-r1
similarity index 93%
rename from metadata/md5-cache/net-analyzer/nessus-bin-8.11.1
rename to metadata/md5-cache/net-analyzer/nessus-bin-8.11.1-r1
index 3b1e68408c9f..dbac0500669f 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.11.1
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.11.1-r1
@@ -9,4 +9,4 @@ RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=Nessus-8.11.1-es8.x86_64.rpm
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3063a33d5e2a88cd48e2fc776f38ef86
+_md5_=c63bb226ee69de8bd462a4ebedbf401e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.24 b/metadata/md5-cache/net-analyzer/zabbix-4.0.24
new file mode 100644
index 000000000000..0efc7217af10
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.24
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.24.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=98c207cbd32ce9f3f5dd52cba394e4d1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.3 b/metadata/md5-cache/net-analyzer/zabbix-5.0.3
new file mode 100644
index 000000000000..2859ab835545
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=91e57c23041003da6c0573ba37e60b0f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index d27e463c52ab..0d65a8ee9a2f 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/bind-9.14.12 b/metadata/md5-cache/net-dns/bind-9.14.12
deleted file mode 100644
index 6e2a58b46d4e..000000000000
--- a/metadata/md5-cache/net-dns/bind-9.14.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
-DESCRIPTION=Berkeley Internet Name Domain - Name Server
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
-REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.14.12/bind-9.14.12.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ee4e5f045534da2c1ab8759847ef4564
diff --git a/metadata/md5-cache/net-dns/bind-9.16.4 b/metadata/md5-cache/net-dns/bind-9.16.4
deleted file mode 100644
index 624a8215391f..000000000000
--- a/metadata/md5-cache/net-dns/bind-9.16.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-libs/libuv:=
-DESCRIPTION=Berkeley Internet Name Domain - Name Server
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
-REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.4/bind-9.16.4.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=3b8fd01dd59c26af3c555c1ccb574144
diff --git a/metadata/md5-cache/net-dns/bind-9.16.5 b/metadata/md5-cache/net-dns/bind-9.16.5
deleted file mode 100644
index 1226ad0bffa1..000000000000
--- a/metadata/md5-cache/net-dns/bind-9.16.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-libs/libuv:=
-DESCRIPTION=Berkeley Internet Name Domain - Name Server
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/ply[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
-REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.5/bind-9.16.5.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=cbbaf2339e227d0bee530e3e2c136245
diff --git a/metadata/md5-cache/net-dns/bind-9.16.6 b/metadata/md5-cache/net-dns/bind-9.16.6
index d06a6f2ee315..85816048b1de 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.6
+++ b/metadata/md5-cache/net-dns/bind-9.16.6
@@ -4,12 +4,12 @@ DEPEND=acct-group/named acct-user/named !libressl? ( dev-libs/openssl:=[-bindist
 DESCRIPTION=Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+IUSE=-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=acct-group/named acct-user/named !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
 REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.6/bind-9.16.6.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=958b9c01035d45ed285095646dc00eb9
+_md5_=99949cab8d896f799d197335c6ab9dda
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.12 b/metadata/md5-cache/net-dns/bind-tools-9.14.12
deleted file mode 100644
index ed8684c1e4b8..000000000000
--- a/metadata/md5-cache/net-dns/bind-tools-9.14.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.14.12/bind-9.14.12.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=850fbeebc0c281329af4f38a41fdf3b5
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.4 b/metadata/md5-cache/net-dns/bind-tools-9.16.4
deleted file mode 100644
index b5681da7e54a..000000000000
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.4/bind-9.16.4.tar.xz https://dev.gentoo.org/~chutzpah/dist/misc/bind-tools-9.16.4-manpages.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac8ba3ab5f3c93bbcb28f01aa5b2d6cf
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.5 b/metadata/md5-cache/net-dns/bind-tools-9.16.5
deleted file mode 100644
index e05aae534829..000000000000
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.5/bind-9.16.5.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cd058af0a6ae08ed822c12fcb4d35ba0
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.6 b/metadata/md5-cache/net-dns/bind-tools-9.16.6
index 399deed8f324..e14622155a42 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.6
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.6
@@ -5,11 +5,11 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
 IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.6/bind-9.16.6.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=12f5fb2f4136672c9840ddc0f643b8f7
+_md5_=2cd55a2502408b966398fa0a378ad2a3
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index c532c65cbc59..8d158cf1b470 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.50.0 b/metadata/md5-cache/net-ftp/filezilla-3.50.0
new file mode 100644
index 000000000000..12c2e1889c99
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.50.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.24.1:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.0 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=6
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.24.1:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.50.0_src.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b5db217f6bbc5e722d02b9b6baa902a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3cfd129cc81d..c39b90a1dcd3 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-bin-2.2.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.2.0
new file mode 100644
index 000000000000..b1ec04a58faa
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.2.0.tar.gz -> tdesktop-2.2.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.2.0.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.2.2.0.tar.xz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c391a05df099c2e52c0a319f0d21a3bb
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.0
new file mode 100644
index 000000000000..6df92ffbbb27
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.3.0.tar.gz -> tdesktop-2.3.0.tar.gz https://updates.tdesktop.com/tlinux/tsetup.2.3.0.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4135fbc707d55b6309283565ecd6752
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 4760a714213d..da436c8ea43e 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/znc-palaver-1.2.1 b/metadata/md5-cache/net-irc/znc-palaver-1.2.1
new file mode 100644
index 000000000000..2d3dc0de83b4
--- /dev/null
+++ b/metadata/md5-cache/net-irc/znc-palaver-1.2.1
@@ -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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-irc/znc:=[ssl] python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] dev-python/pytest-asyncio[python_targets_python3_6(-)] dev-python/semantic_version[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] dev-python/pytest-asyncio[python_targets_python3_7(-)] dev-python/semantic_version[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-asyncio[python_targets_python3_8(-)] dev-python/semantic_version[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-asyncio[python_targets_python3_9(-)] dev-python/semantic_version[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=A ZNC module which provides push notifications to Palaver
+EAPI=7
+HOMEPAGE=https://github.com/cocodelabs/znc-palaver
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-irc/znc:=[ssl]
+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/cocodelabs/znc-palaver/archive/1.2.1.tar.gz -> znc-palaver-1.2.1.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f00d9aecddfe4ab9223cbfb44c998598
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 8d4ea9e945ae..cfe41229c863 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/aqbanking-6.0.1 b/metadata/md5-cache/net-libs/aqbanking-6.0.1
index cdd88df2aa5f..3018f0d17326 100644
--- a/metadata/md5-cache/net-libs/aqbanking-6.0.1
+++ b/metadata/md5-cache/net-libs/aqbanking-6.0.1
@@ -5,9 +5,9 @@ DESCRIPTION=Generic Online Banking Interface
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug doc ebics examples ofx
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.1.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt,gnutls] ) ofx? ( >=dev-libs/libofx-0.9.5 )
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/238/aqbanking-6.0.1.tar.gz
-_md5_=f6d1fb350db5f0f3a117d717d8552658
+_md5_=062a8d922cd367a0821e7655b16a2b37
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.64.3 b/metadata/md5-cache/net-libs/glib-networking-2.64.3
index 5c565450040b..80660a3ec36b 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.64.3
+++ b/metadata/md5-cache/net-libs/glib-networking-2.64.3
@@ -5,11 +5,11 @@ DESCRIPTION=Network-related giomodules for glib
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 IUSE=+gnome +libproxy +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.64.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.6.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.64/glib-networking-2.64.3.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e992d2371c4d0b948277c24bd7469122
+_md5_=ef6e397d079aae3d6babf009b36a9a7c
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
new file mode 100644
index 000000000000..231e8a0de10a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/boost:=[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-devel/libtool
+DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
+EAPI=7
+HOMEPAGE=https://libtorrent.org https://github.com/arvidn/libtorrent
+IUSE=debug +dht doc examples libressl python +ssl static-libs test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/boost:=[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1.2.9.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b3e0418d7c87fc60877b55ee1eab8401
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.41.0 b/metadata/md5-cache/net-libs/nghttp2-1.41.0
index 535495b133d3..a5587f207f72 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.41.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.41.0
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.41.0/nghttp2-1.41.0.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd6f60017442f8822d9c8469b875427b
+_md5_=4b9d8fe953892148156de8197fab8bc3
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index af974f33f3a6..65e0c98a0e46 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/pop2imap-1.18 b/metadata/md5-cache/net-mail/pop2imap-1.18
deleted file mode 100644
index 156fec68f3eb..000000000000
--- a/metadata/md5-cache/net-mail/pop2imap-1.18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Synchronize mailboxes between a pop and an imap servers
-EAPI=4
-HOMEPAGE=http://www.linux-france.org/prj/pop2imap/
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Mail-POP3Client dev-perl/Mail-IMAPClient dev-perl/Email-Simple dev-perl/Date-Manip dev-perl/IO-Socket-SSL
-SLOT=0
-SRC_URI=http://www.linux-france.org/prj/pop2imap/dist/pop2imap-1.18.tgz
-_md5_=e56997f680ae2b7744e97248749e6b7f
diff --git a/metadata/md5-cache/net-mail/pop2imap-1.21 b/metadata/md5-cache/net-mail/pop2imap-1.21
index 928ee387808d..780b99644aab 100644
--- a/metadata/md5-cache/net-mail/pop2imap-1.21
+++ b/metadata/md5-cache/net-mail/pop2imap-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Synchronize mailboxes between a pop and an imap servers
 EAPI=5
 HOMEPAGE=http://www.linux-france.org/prj/pop2imap/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=public-domain
 RDEPEND=dev-lang/perl dev-perl/Mail-POP3Client dev-perl/Mail-IMAPClient dev-perl/Email-Simple dev-perl/Date-Manip dev-perl/IO-Socket-SSL
 SLOT=0
 SRC_URI=http://www.linux-france.org/prj/pop2imap/dist/pop2imap-1.21.tgz
-_md5_=cefe60d9f1098c8d4433c86fb7a5effd
+_md5_=1f696ee28a432d3a0c415c489b28370a
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index cfa0e7d0b363..110a6a3be5ee 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/grdesktop-0.23-r2 b/metadata/md5-cache/net-misc/grdesktop-0.23-r2
index ac9df0409190..34c3a23687e5 100644
--- a/metadata/md5-cache/net-misc/grdesktop-0.23-r2
+++ b/metadata/md5-cache/net-misc/grdesktop-0.23-r2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/gtk+-3.21.4:3 net-misc/rdesktop app-text/rarian virtual/pkgcon
 DESCRIPTION=Gtk3 frontend for rdesktop
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/grdesktop/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.21.4:3 net-misc/rdesktop
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/grdesktop/grdesktop-0.23.tar.gz https://dev.gentoo.org/~leio/distfiles/grdesktop-0.23-patchset.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=222bda860ad70a06a426c690a8b243c5
+_md5_=0e4d3759af22002397e64dc775a6c703
diff --git a/metadata/md5-cache/net-misc/pcapfix-0.7 b/metadata/md5-cache/net-misc/pcapfix-0.7
deleted file mode 100644
index 206d6f21730f..000000000000
--- a/metadata/md5-cache/net-misc/pcapfix-0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Repair and fix broken pcap files
-EAPI=4
-HOMEPAGE=http://f00l.de/pcapfix/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://f00l.de/pcapfix/pcapfix-0.7.tar.gz
-_md5_=9f2d1dfb5b66e7ca27c4e9b4ee5b569e
diff --git a/metadata/md5-cache/net-misc/pimpd-0.8-r1 b/metadata/md5-cache/net-misc/pimpd-0.8-r1
new file mode 100644
index 000000000000..156e48e00591
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pimpd-0.8-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=RFC1413-compliant identd server supporting masqueraded connections
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://cats.meow.at/~peter/pimpd_0.8.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1818f44e2acd0b89681c8734c68319ba
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 4912fe58f6ff..a4533b6fd22d 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/adtool-1.3.3 b/metadata/md5-cache/net-nds/adtool-1.3.3
deleted file mode 100644
index a850791be6d1..000000000000
--- a/metadata/md5-cache/net-nds/adtool-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utility for Active Directory administration
-EAPI=4
-HOMEPAGE=http://gp2x.org/adtool/
-IUSE=ssl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-nds/openldap ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://gp2x.org/adtool/adtool-1.3.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f366127bc0eaa429473f6a9ae6c6cbc
diff --git a/metadata/md5-cache/net-nds/adtool-1.3.3-r1 b/metadata/md5-cache/net-nds/adtool-1.3.3-r1
new file mode 100644
index 000000000000..6b7dde491c49
--- /dev/null
+++ b/metadata/md5-cache/net-nds/adtool-1.3.3-r1
@@ -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=compile configure install prepare test
+DEPEND=net-nds/openldap
+DESCRIPTION=Utility for Active Directory administration
+EAPI=7
+HOMEPAGE=http://gp2x.org/adtool/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-nds/openldap
+SLOT=0
+SRC_URI=http://gp2x.org/adtool/adtool-1.3.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5d6a06d9f8372c144c7b03cb1d4d29fb
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 457d07e71f6a..13fc253d0747 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/bitcoin-cli-0.20.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
index 4f5d71d948e9..bca543e57797 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
@@ -5,10 +5,10 @@ DESCRIPTION=Command-line JSON-RPC client specifically for interfacing with bitco
 EAPI=7
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=knots
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1db9e48f8e3ca62278ae3fea625e25af
+_md5_=9becbd643f12fd2bc52dc32fe5249ea7
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1
index a17c65f22dfb..707fccafd4e9 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.20.1
@@ -5,11 +5,11 @@ DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
 EAPI=7
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm dbus kde knots +qrcode +system-leveldb test upnp +wallet zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ebc8252b4ab5efd03578c83ca72d018
+_md5_=2356baa8a717b86b352e6702d07ae98d
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.20.1 b/metadata/md5-cache/net-p2p/bitcoind-0.20.1
index 05f596c7d102..ee76aef7c56b 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.20.1
@@ -5,11 +5,11 @@ DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
 EAPI=7
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm examples knots +system-leveldb test upnp +wallet zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=acct-group/bitcoin acct-user/bitcoin >=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=31676416de8e5f81cb1d498d88b98bcd
+_md5_=66a5321f1edaf81e13b760d9edcdc8cd
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.7.1 b/metadata/md5-cache/net-p2p/syncthing-1.7.1
index dbc785c51098..1c14ebcb9ff4 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.7.1
+++ b/metadata/md5-cache/net-p2p/syncthing-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=7
 HOMEPAGE=https://syncthing.net
 IUSE=selinux tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense
 RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( acct-group/stdiscosrv acct-group/strelaysrv acct-user/stdiscosrv acct-user/strelaysrv ) selinux? ( sec-policy/selinux-syncthing )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.7.1.tar.gz -> syncthing-1.7.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/alangpierce/go-forceexport/@v/v0.0.0-20160317203124-8f1d6941cd75.zip -> github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.zip mirror://goproxy//github.com/alangpierce/go-forceexport/@v/v0.0.0-20160317203124-8f1d6941cd75.mod -> github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.zip -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.zip mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.mod -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.zip -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.zip mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.zip -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.mod -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ccding/go-stun/@v/v0.0.0-20180726100737-be486d185f3d.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.0.0-20180726100737-be486d185f3d.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20190905060710-a5e0173ced67.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20190905060710-a5e0173ced67.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.0.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.0.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.zip -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.zip mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.mod -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.zip -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.mod -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/greatroar/blobloom/@v/v0.2.1.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.2.1.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.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/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.15.6.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.6.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.15.6.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.6.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.15.7.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.7.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.15.7.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.7.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.16.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.16.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.16.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.9.1.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.9.1.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.3.0.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.3.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/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/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20190714054239-47ef3260b6bf.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190714054239-47ef3260b6bf.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20190714054239-47ef3260b6bf.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190714054239-47ef3260b6bf.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20190709140112-69c7a957d3e2.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20190709140112-69c7a957d3e2.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20190923125748-758128399b1d.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20190923125748-758128399b1d.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thejerf/suture/@v/v3.0.2+incompatible.zip -> github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/thejerf/suture/@v/v3.0.2+incompatible.mod -> github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.zip -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.zip mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.mod -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180926160741-c2ed4eda69e7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a56e1093c6d4566d01e609ef32bb3732
+_md5_=50d4e31a38f5999cc0e53ad461c58d02
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index f71b640ca71e..c57b58bd1fc0 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/hplip-3.20.6-r1 b/metadata/md5-cache/net-print/hplip-3.20.6-r1
index 1d78fc5f9520..5e167b596f79 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.6-r1
+++ b/metadata/md5-cache/net-print/hplip-3.20.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
 EAPI=7
 HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
 IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.5-patches-1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=24f6eabad0b0f80edff5063e4cbed351
+_md5_=5c7c74c4c1eedbcb2d7839f23ebe3449
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 7d3137738fe5..7796efde82fc 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.28-r1 b/metadata/md5-cache/net-proxy/privoxy-3.0.28-r1
index b38d2b79de14..7e48768e33b6 100644
--- a/metadata/md5-cache/net-proxy/privoxy-3.0.28-r1
+++ b/metadata/md5-cache/net-proxy/privoxy-3.0.28-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A web proxy with advanced filtering capabilities for enhancing priva
 EAPI=7
 HOMEPAGE=https://www.privoxy.org https://sourceforge.net/projects/ijbswa/
 IUSE=+acl client-tags compression editor extended-host-patterns external-filters +fast-redirects +force fuzz graceful-termination +image-blocking ipv6 lfs png-images selinux +stats +threads toggle tools whitelists +zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/privoxy acct-user/privoxy dev-libs/libpcre zlib? ( sys-libs/zlib ) extended-host-patterns? ( dev-lang/perl ) selinux? ( sec-policy/selinux-privoxy ) tools? ( net-misc/curl dev-lang/perl )
 REQUIRED_USE=client-tags? ( threads ) compression? ( zlib ) fuzz? ( zlib ) toggle? ( editor )
 SLOT=0
 SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.28-stable-src.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=842af031b7aa47476bcc016bac043dc2
+_md5_=ee912e61ad542d3b6d365534f0c8277f
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 31bb375feb8c..4c79bfce536a 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/chemtool-1.6.13 b/metadata/md5-cache/sci-chemistry/chemtool-1.6.13
deleted file mode 100644
index 9d26eda23d06..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemtool-1.6.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A GTK program for drawing organic molecules
-EAPI=4
-HOMEPAGE=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
-IUSE=emf gnome nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
-SLOT=0
-SRC_URI=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.13.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0419d3fd05ddf3d1ba49544e92c6f6e4
diff --git a/metadata/md5-cache/sci-chemistry/chemtool-1.6.14 b/metadata/md5-cache/sci-chemistry/chemtool-1.6.14
index 0227d5f70840..c8122ea21daf 100644
--- a/metadata/md5-cache/sci-chemistry/chemtool-1.6.14
+++ b/metadata/md5-cache/sci-chemistry/chemtool-1.6.14
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
 DESCRIPTION=A GTK program for drawing organic molecules
-EAPI=5
+EAPI=7
 HOMEPAGE=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 IUSE=emf gnome nls
 KEYWORDS=~amd64 ~ppc ~x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
 SLOT=0
 SRC_URI=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.14.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9b083053d5fe0e1f7cf3a6f14238366
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ec2a33e3b596e37ff37f7d67c3756378
diff --git a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2 b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
index 6d0df304b456..57e4b79e315b 100644
--- a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
+++ b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
@@ -1,14 +1,15 @@
+BDEPEND=dev-util/byacc virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4:1 virtual/pkgconfig dev-util/byacc test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 virtual/fortran
+DEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4:1 virtual/fortran
 DESCRIPTION=Suite for ab initio quantum chemistry computing various molecular properties
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.psicode.org/
-IUSE=static-libs test
+IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4:1 virtual/fortran
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/psicode/psi-3.4.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a0832285e9337249119f48636e81f04
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ecd9eddd7cba15554c7599004f94761a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c98aa11d83a7..e6d96604e541 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/man-db-2.9.3 b/metadata/md5-cache/sys-apps/man-db-2.9.3
index 1bb24b960231..f14bd67ca655 100644
--- a/metadata/md5-cache/sys-apps/man-db-2.9.3
+++ b/metadata/md5-cache/sys-apps/man-db-2.9.3
@@ -12,4 +12,4 @@ RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-li
 SLOT=0
 SRC_URI=mirror://nongnu/man-db/man-db-2.9.3.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92d85367f2e6bc55bf34c2937f9bd0fa
+_md5_=d23799f73744d6275c940e0de26a7673
diff --git a/metadata/md5-cache/sys-apps/man-db-9999 b/metadata/md5-cache/sys-apps/man-db-9999
index fa81aad2aff2..88998bfb309c 100644
--- a/metadata/md5-cache/sys-apps/man-db-9999
+++ b/metadata/md5-cache/sys-apps/man-db-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90841d55ce5e657c95f094c69ebcc493
+_md5_=17e4710041ff36978a617377744a45cc
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.4-r1 b/metadata/md5-cache/sys-apps/portage-3.0.4-r1
index 5f803cfeffad..6da355e0ce1e 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.4-r1
+++ b/metadata/md5-cache/sys-apps/portage-3.0.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.4-r1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.4.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.4.tar.bz2
 _eclasses_=distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c59688c086d157e2ef8f02dcede2ccf0
+_md5_=219f95525e0bc82e713f454ccf36d530
diff --git a/metadata/md5-cache/sys-apps/systemd-245.7-r1 b/metadata/md5-cache/sys-apps/systemd-245.7-r1
index 6a06f9df591e..70e4b68594e6 100644
--- a/metadata/md5-cache/sys-apps/systemd-245.7-r1
+++ b/metadata/md5-cache/sys-apps/systemd-245.7-r1
@@ -5,7 +5,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.7/systemd-stable-245.7.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=a63870a1f3db35ab45c2ce61d5f46cea
+_md5_=9473f773fa1b326c466a0056f9d39c7f
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 592bc1376b21..9208d612a87b 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/pambase-20200806 b/metadata/md5-cache/sys-auth/pambase-20200806
deleted file mode 100644
index 8d9d20a190a8..000000000000
--- a/metadata/md5-cache/sys-auth/pambase-20200806
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/jinja[python_targets_python3_7(-),python_single_target_python3_7(+)] ) )
-DEFINED_PHASES=configure install setup test
-DESCRIPTION=PAM base configuration files
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/pambase
-IUSE=caps debug elogind minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc securetty selinux +sha512 systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( sys-auth/passwdqc ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) systemd? ( sys-apps/systemd[pam] )
-REQUIRED_USE=?? ( elogind systemd )
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20200806.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad5f5ccd5f2fac0cef51690775bc7196
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index f3470d15de8b..a5f7b6d1a3a0 100644
--- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=virtual/libusb:0 pam? ( sys-libs/pam ) sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=virtual/libusb:0 pam? ( sys-libs/pam )
 DESCRIPTION=Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads
-EAPI=4
+EAPI=7
 HOMEPAGE=http://thinkfinger.sourceforge.net/
-IUSE=debug pam static-libs kernel_linux
+IUSE=debug pam kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 pam? ( sys-libs/pam )
+RDEPEND=virtual/libusb:0 pam? ( sys-libs/pam ) acct-group/fingerprint
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c64a96fa372c6a4c061c096c7fa9faad
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9a3f1828094612c732385f8dc113e533
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 4c220cd84f58..d6ad6ce5f1d9 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/netboot-0.10.2-r1 b/metadata/md5-cache/sys-boot/netboot-0.10.2-r2
similarity index 93%
rename from metadata/md5-cache/sys-boot/netboot-0.10.2-r1
rename to metadata/md5-cache/sys-boot/netboot-0.10.2-r2
index 6bb31170d9b6..75185d386ab1 100644
--- a/metadata/md5-cache/sys-boot/netboot-0.10.2-r1
+++ b/metadata/md5-cache/sys-boot/netboot-0.10.2-r2
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) lzo? ( dev-libs/lzo:2= ) odbc? ( dev-db/unixOD
 SLOT=0
 SRC_URI=mirror://sourceforge/netboot/netboot-0.10.2.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=669bdb530750eb04fcbf2f83a9b50979
+_md5_=4d7fb988d92ca3d4422e03cade0eb816
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index df0eb8c14e29..9b579fa84b40 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.10 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.10
deleted file mode 100644
index ab54a178cc21..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=0d9d8fe62ab619b70c71f1c60f51f16a
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.11 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.11
deleted file mode 100644
index 984d0e2bcd7d..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=0d9d8fe62ab619b70c71f1c60f51f16a
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.12
deleted file mode 100644
index 3b04e5d5f071..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=0d9d8fe62ab619b70c71f1c60f51f16a
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.7
deleted file mode 100644
index 80da858729d5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=f22bdd0d5bb755ae1dcde3b07e136256
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.8
deleted file mode 100644
index 38f5754ae332..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=f22bdd0d5bb755ae1dcde3b07e136256
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.10 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.10
deleted file mode 100644
index 55c0ecfaa853..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=842ba08a787d230ae1c8ab6bebe16801
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.11 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.11
deleted file mode 100644
index 63b85c9a79a2..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=842ba08a787d230ae1c8ab6bebe16801
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.12
deleted file mode 100644
index a9974b7d054d..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=842ba08a787d230ae1c8ab6bebe16801
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.7
deleted file mode 100644
index e7e8d7cdca84..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=a709b73b13513e22056bd56a3f61222d
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.8
deleted file mode 100644
index c86ad13be1d1..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=a709b73b13513e22056bd56a3f61222d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.10 b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.10
deleted file mode 100644
index a6594a373b91..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=9d3a31a87c3298942baa847dd329061d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.11 b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.11
deleted file mode 100644
index 24a0e7c55f68..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=9d3a31a87c3298942baa847dd329061d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.12
deleted file mode 100644
index 38de3a78efa5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=9d3a31a87c3298942baa847dd329061d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.16.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.16.7
deleted file mode 100644
index 9e207f653b60..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.16.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=3ecf07b2e1560278b1a9fa3be4a4af42
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.16.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.16.8
deleted file mode 100644
index 7d90af1b7424..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.16.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=3ecf07b2e1560278b1a9fa3be4a4af42
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.10 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.10
deleted file mode 100644
index 351ac2a605a7..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=fba6dbfd7e1965c69f8f23ec4f2f6bcf
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.11 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.11
deleted file mode 100644
index c3ec818f4476..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=fba6dbfd7e1965c69f8f23ec4f2f6bcf
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.12
deleted file mode 100644
index f71c78530d4f..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=fba6dbfd7e1965c69f8f23ec4f2f6bcf
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.7
deleted file mode 100644
index 48a71547998f..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=b25ea8aad4d86297e20240c8c528dae1
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.8
deleted file mode 100644
index d22d02e40e11..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=b25ea8aad4d86297e20240c8c528dae1
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.15.10 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.10
deleted file mode 100644
index 8ad12e60d11f..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.15.10
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND==dev-lang/go-1.12* dev-go/go-bindata
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a71834838a6bb2722d96094d0485d9e6
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.15.11 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.11
deleted file mode 100644
index bca82323e066..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.15.11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND==dev-lang/go-1.12* dev-go/go-bindata
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a71834838a6bb2722d96094d0485d9e6
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.15.12 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.12
deleted file mode 100644
index b2ccd940c83d..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.15.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND==dev-lang/go-1.12* dev-go/go-bindata
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a71834838a6bb2722d96094d0485d9e6
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.16.7 b/metadata/md5-cache/sys-cluster/kubeadm-1.16.7
deleted file mode 100644
index c3173abce859..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.16.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.13 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b6a3bbfbdd5992f921cd7de8437cd7cc
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.16.8 b/metadata/md5-cache/sys-cluster/kubeadm-1.16.8
deleted file mode 100644
index 4abb747ef0db..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.16.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.13 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b6a3bbfbdd5992f921cd7de8437cd7cc
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.15.10 b/metadata/md5-cache/sys-cluster/kubectl-1.15.10
deleted file mode 100644
index 746474455f53..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.15.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND==dev-lang/go-1.12* dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e2a4fdb1b0067f2ff01e8d3e0d774f28
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.15.11 b/metadata/md5-cache/sys-cluster/kubectl-1.15.11
deleted file mode 100644
index 4087435d2bd8..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.15.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND==dev-lang/go-1.12* dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=591988dbcf253dec51fb7f5e6a7516b2
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.15.12 b/metadata/md5-cache/sys-cluster/kubectl-1.15.12
deleted file mode 100644
index 6e0b260bde5b..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.15.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND==dev-lang/go-1.12* dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e2a4fdb1b0067f2ff01e8d3e0d774f28
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.16.7 b/metadata/md5-cache/sys-cluster/kubectl-1.16.7
deleted file mode 100644
index 18b41b163ab8..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.16.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.13 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0f76aaf3fd43c62c00cdb23ca351c59c
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.16.8 b/metadata/md5-cache/sys-cluster/kubectl-1.16.8
deleted file mode 100644
index 63d1456c83c0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.16.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.13 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0f76aaf3fd43c62c00cdb23ca351c59c
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.10 b/metadata/md5-cache/sys-cluster/kubelet-1.15.10
deleted file mode 100644
index da30fed3ac07..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.15.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.10.tar.gz -> kubernetes-1.15.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6febf1e2da4a85d3fb69267e2c4ca013
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.11 b/metadata/md5-cache/sys-cluster/kubelet-1.15.11
deleted file mode 100644
index 9d48469bbfe5..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.15.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.11.tar.gz -> kubernetes-1.15.11.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6febf1e2da4a85d3fb69267e2c4ca013
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.12 b/metadata/md5-cache/sys-cluster/kubelet-1.15.12
deleted file mode 100644
index 1613a081b1af..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.15.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata =dev-lang/go-1.12* >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.12.tar.gz -> kubernetes-1.15.12.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6febf1e2da4a85d3fb69267e2c4ca013
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.16.7 b/metadata/md5-cache/sys-cluster/kubelet-1.16.7
deleted file mode 100644
index 6a0c15fab30c..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.16.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.7.tar.gz -> kubernetes-1.16.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f75d92f6883c911e7e9c89a252f34686
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.16.8 b/metadata/md5-cache/sys-cluster/kubelet-1.16.8
deleted file mode 100644
index e1586b6ea7f8..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.16.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.13 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.8.tar.gz -> kubernetes-1.16.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f75d92f6883c911e7e9c89a252f34686
diff --git a/metadata/md5-cache/sys-cluster/kubernetes-1.16.13 b/metadata/md5-cache/sys-cluster/kubernetes-1.16.13
deleted file mode 100644
index 9c2a6e3306db..000000000000
--- a/metadata/md5-cache/sys-cluster/kubernetes-1.16.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler )
-DESCRIPTION=production-grade container orchestration
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened +kubelet +kubeadm +kubectl +kube-apiserver +kube-controller-manager +kube-proxy +kube-scheduler
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler ) kube-proxy? ( net-firewall/conntrack-tools ) !sys-cluster/kubeadm !sys-cluster/kubectl !sys-cluster/kubelet !sys-cluster/kube-apiserver !sys-cluster/kube-controller-manager !sys-cluster/kube-proxy !sys-cluster/kube-scheduler
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.13.tar.gz -> kubernetes-1.16.13.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=259fef227b0f25cba3564f697bee839f
diff --git a/metadata/md5-cache/sys-cluster/kubernetes-1.16.14 b/metadata/md5-cache/sys-cluster/kubernetes-1.19.0
similarity index 85%
rename from metadata/md5-cache/sys-cluster/kubernetes-1.16.14
rename to metadata/md5-cache/sys-cluster/kubernetes-1.19.0
index d895b2b4f06b..48c2494a47b0 100644
--- a/metadata/md5-cache/sys-cluster/kubernetes-1.16.14
+++ b/metadata/md5-cache/sys-cluster/kubernetes-1.19.0
@@ -1,4 +1,4 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler )
 DESCRIPTION=production-grade container orchestration
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0
 RDEPEND=kube-apiserver? ( acct-group/kube-apiserver acct-user/kube-apiserver ) kube-controller-manager? ( acct-group/kube-controller-manager acct-user/kube-controller-manager ) kube-scheduler? ( acct-group/kube-scheduler acct-user/kube-scheduler ) kube-proxy? ( net-firewall/conntrack-tools ) !sys-cluster/kubeadm !sys-cluster/kubectl !sys-cluster/kubelet !sys-cluster/kube-apiserver !sys-cluster/kube-controller-manager !sys-cluster/kube-proxy !sys-cluster/kube-scheduler
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.14.tar.gz -> kubernetes-1.16.14.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.0.tar.gz -> kubernetes-1.19.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=624f60e0d99152bcccb091ec8890cdec
+_md5_=82e4214798138fc3eeb8a2a1ea067d7c
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2 b/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
index f2bb86ffb5c5..5476addb971a 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
+++ b/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) )
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) )
 DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
 EAPI=7
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
-IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7
+IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
-RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v30.0.tar.gz -> rdma-core-30.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4eba8cc434d907efb6ff08bfdfdc4962
+_md5_=376bad55231a74360b2cfc75a55bf06c
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-9999 b/metadata/md5-cache/sys-cluster/rdma-core-9999
index 95ee7932f96a..d9e53ff414d5 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-9999
+++ b/metadata/md5-cache/sys-cluster/rdma-core-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) )
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) )
 DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
 EAPI=7
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
-IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7
+IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
 PROPERTIES=live
-RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4eba8cc434d907efb6ff08bfdfdc4962
+_md5_=376bad55231a74360b2cfc75a55bf06c
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.02.4.1 b/metadata/md5-cache/sys-cluster/slurm-20.02.4.1
new file mode 100644
index 000000000000..74d3d00e1035
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/slurm-20.02.4.1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
+DESCRIPTION=A Highly Scalable Resource Manager
+EAPI=7
+HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
+IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:=
+REQUIRED_USE=torque? ( perl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-02-4-1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ad4d52f59b74f8eec0504357b29f61b6
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index ba75a0af808a..ea5c0e158236 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0 b/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0
new file mode 100644
index 000000000000..1bf80679c364
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
+EAPI=7
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
+IUSE=selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
+SLOT=0/8
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/sys-fs/f2fs-tools/f2fs-tools-1.14.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=42b2fe18786067d471729d66a656422e
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 7380dc9340cf..52593166500a 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	eb92d1a6d9057e2422cc9610f79f919c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	bae936266b68e0c374a74f2b0d0aaa44	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=1e6eff5e7746071c9547c57e213ff0d3
+_md5_=82867682676cd02cb56dd07f350fad67
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 2cb33c669109..c3860a97ad81 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/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index 566f9963d3a2..3c4c711ccd86 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=7cba610edaaca4b1ab671a5b00f17fb5
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
index 0cbbdbfc5fe1..c0b8ae207a9b 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.51-FB.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.51-FB.01/kernel-5.4.51-FB.01.tar.xz
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=0fcc30a0105ba37997b3f48bcf611ac8
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.1.1 b/metadata/md5-cache/sys-kernel/genkernel-4.1.2
similarity index 97%
rename from metadata/md5-cache/sys-kernel/genkernel-4.1.1
rename to metadata/md5-cache/sys-kernel/genkernel-4.1.2
index 8691024ffe4b..efbc31eb1e02 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.1.1
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.1.2
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.1.1.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.7.tar.xz https://www.busybox.net/downloads/busybox-1.32.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-2020.80.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20200813.1.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.6.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.39.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.8/strace-5.8.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.7.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.5.tar.gz -> zstd-1.4.5.tar.gz
+SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.1.2.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.7.tar.xz https://www.busybox.net/downloads/busybox-1.32.0.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-2020.80.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20200813.1.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.6.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.39.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.187.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.8/strace-5.8.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.7.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.5.tar.gz -> zstd-1.4.5.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb45fd6a7b5d7aa98e2dd5c66ec4dfdc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60
index de3df168d43a..933de810e7aa 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60
@@ -7,8 +7,8 @@ IUSE=debug savedconfig +initramfs test
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.4.60 !sys-kernel/vanilla-kernel-bin:5.4.60 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.4.60
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-61.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-61.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0571f3fce5e8630ebfff2f47516828b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61
index cbea7bea316a..d8462d1effae 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61
@@ -4,11 +4,11 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.4.61 !sys-kernel/vanilla-kernel-bin:5.4.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.4.61
-SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=42641b2075fb8cb46b0a2936c623c01f
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f56ce2b71c9827f057570d8788f38278
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17
index 9a126c29d48b..ca4012756302 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.7.17 !sys-kernel/vanilla-kernel-bin:5.7.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.17
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-18.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b8f40252e346dcba51c0a2352c36a151
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18
index a9f64f8d552c..f0d9d8727d80 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.7.18 !sys-kernel/vanilla-kernel-bin:5.7.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-19.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b8f40252e346dcba51c0a2352c36a151
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19
index 73c9799c4da6..0bb926e76cb1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.7.19 !sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b15d688fbbd467514c20a097abd5b4c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3
index 96167bff1d04..ed6796192426 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.8.3 !sys-kernel/vanilla-kernel-bin:5.8.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.3
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b75d013eca438386cf3f2e141ac36eb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4
index 7d980f4bd08f..041613923ed6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.8.4 !sys-kernel/vanilla-kernel-bin:5.8.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b75d013eca438386cf3f2e141ac36eb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5
index 2c072d58c113..c7f8918109a8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5
@@ -4,12 +4,12 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.8.5 !sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.5
-SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ba36a5d28aa8fdfe2fcdab645b15cbe
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ffa776aa1e34e74bbeb5c841bda4ffeb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60
index 48aa4fbdc98f..b9593d438955 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.60 !sys-kernel/vanilla-kernel:5.4.60 !sys-kernel/vanilla-kernel-bin:5.4.60 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.4.60
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60-1.xpak -> gentoo-kernel-5.4.60-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60-1.xpak -> gentoo-kernel-5.4.60-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60-1.xpak -> gentoo-kernel-5.4.60-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=8e99bc29948348c07cc11bfc3103bc55
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61
index 54ad11e2bcb9..332cca089a61 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.61 !sys-kernel/vanilla-kernel:5.4.61 !sys-kernel/vanilla-kernel-bin:5.4.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.4.61
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61-1.xpak -> gentoo-kernel-5.4.61-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61-1.xpak -> gentoo-kernel-5.4.61-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61-1.xpak -> gentoo-kernel-5.4.61-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=0ad591fac6454a22e1a4723569a709b3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17
index 2e7ede5beb9f..f8298e9539d7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.7.17 !sys-kernel/vanilla-kernel:5.7.17 !sys-kernel/vanilla-kernel-bin:5.7.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.17
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17-1.xpak -> gentoo-kernel-5.7.17-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17-1.xpak -> gentoo-kernel-5.7.17-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17-1.xpak -> gentoo-kernel-5.7.17-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18
index ed9df0370c47..2e8f78b4d0ee 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.7.18 !sys-kernel/vanilla-kernel:5.7.18 !sys-kernel/vanilla-kernel-bin:5.7.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18-1.xpak -> gentoo-kernel-5.7.18-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18-1.xpak -> gentoo-kernel-5.7.18-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18-1.xpak -> gentoo-kernel-5.7.18-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19
index 20a28cba40b2..30ac3c5d9567 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.7.19 !sys-kernel/vanilla-kernel:5.7.19 !sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1
index d496b8a09cff..09d27336cd21 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~arm64
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.7.19 !sys-kernel/vanilla-kernel:5.7.19 !sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3
index 978d6e5ccb85..d047c48072b5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.8.3 !sys-kernel/vanilla-kernel:5.8.3 !sys-kernel/vanilla-kernel-bin:5.8.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.3
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3-1.xpak -> gentoo-kernel-5.8.3-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3-1.xpak -> gentoo-kernel-5.8.3-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3-1.xpak -> gentoo-kernel-5.8.3-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4
index d421590348a1..f8bff7f2d326 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.8.4 !sys-kernel/vanilla-kernel:5.8.4 !sys-kernel/vanilla-kernel-bin:5.8.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4-1.xpak -> gentoo-kernel-5.8.4-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4-1.xpak -> gentoo-kernel-5.8.4-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4-1.xpak -> gentoo-kernel-5.8.4-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5
index 779d9e27de09..6b77ed08807f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.8.5 !sys-kernel/vanilla-kernel:5.8.5 !sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.5
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1
index d57db35c0359..ee3ca6743f5a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1
@@ -7,8 +7,8 @@ IUSE=+initramfs test
 KEYWORDS=~arm64
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.8.5 !sys-kernel/vanilla-kernel:5.8.5 !sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.5
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.x86.xpak )
-_eclasses_=kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60
index 007fefb53c68..62ac7e5994d7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60
@@ -7,8 +7,8 @@ IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.60 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.4.60
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.60.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=66910460fab07d90ae307dfc08343409
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61
index a62971e96854..30dccc5cf52d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61
@@ -7,8 +7,8 @@ IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.4.61
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.61.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=66910460fab07d90ae307dfc08343409
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17
index 0a043f3f9488..d4173c8ad339 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.17
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.17.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7178f9b8a3f286738e718855d0b5dec1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18
index df908cfee96c..8ec317e786df 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.18.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7178f9b8a3f286738e718855d0b5dec1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19
index 1cfd6c8ae536..4cf52c30ecf3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.7.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.19.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7178f9b8a3f286738e718855d0b5dec1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3
index d163ff55fac3..52664d171b7b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.3
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.3.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a9921630db6969080d8b1a6b8ca55ca6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4
index cc1c11e2bfce..3f29e5ddd802 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.4.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a9921630db6969080d8b1a6b8ca55ca6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5
index 7c83d202339a..97caab998145 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test ) arm64? ( test ) ppc64? ( test )
 SLOT=5.8.5
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.5.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
-_eclasses_=kernel-build	54980a6c47e3648a8284677fe5ccc57b	kernel-install	0316469bda27549d1ef304da5a13f240	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	846f5c675d3714d28c6a47bb60aa01b3	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f5dcb465f089871de7c82fa20b55526
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 151b43d53482..b55a3b7a6287 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/blocksruntime-0_pre20171027 b/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027
new file mode 100644
index 000000000000..7845492fbf82
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=BlocksRuntime library needed for clang's -fblocks support
+EAPI=7
+HOMEPAGE=https://github.com/mackyle/blocksruntime
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+SLOT=0
+SRC_URI=https://github.com/mackyle/blocksruntime/archive/9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81.tar.gz -> blocksruntime-0_pre20171027.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=5dd83a210d9cc77a0f4849a6d9540ff2
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2 b/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
index 4cd657585f40..3bf7c2442a35 100644
--- a/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Multi-platform helper library for other libraries
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:3 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) webkit? ( dev-qt/qtwebkit:5 ) gtk? ( !<app-office/gnucash-3.7[aqbanking] )
 REQUIRED_USE=designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/79
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/234/gwenhywfar-5.1.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b01f5f68aa512518ccf31135434ea111
+_md5_=01d024ef5c6c45d0e40a8e4cc3191760
diff --git a/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2 b/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
index c7b02bbbae89..3cd999d80023 100644
--- a/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
+++ b/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
@@ -5,9 +5,9 @@ DESCRIPTION=Library for accessing chip cards via chip card readers (terminals)
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/rdm/projects/libchipcard
 IUSE=doc examples
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.2 >=sys-libs/gwenhywfar-4.99.22_rc6:= sys-libs/zlib virtual/libintl
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/229/libchipcard-5.1.5rc2.tar.gz
-_md5_=08ae28e909c06fee3aa9c0071a1595b3
+_md5_=50efe82cf7e10bb75589b48b3ad21278
diff --git a/metadata/md5-cache/sys-libs/pam-1.4.0_p20200809 b/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
similarity index 72%
rename from metadata/md5-cache/sys-libs/pam-1.4.0_p20200809
rename to metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
index 4141b4b67330..ff4595d78250 100644
--- a/metadata/md5-cache/sys-libs/pam-1.4.0_p20200809
+++ b/metadata/md5-cache/sys-libs/pam-1.4.0_p20200829
@@ -1,6 +1,6 @@
 BDEPEND=dev-libs/libxslt sys-devel/flex sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
 EAPI=7
 HOMEPAGE=https://github.com/linux-pam/linux-pam
@@ -8,8 +8,8 @@ IUSE=audit berkdb debug nis +pie selinux +filecaps split-usr abi_x86_32 abi_x86_
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD GPL-2 )
 PDEPEND=>=sys-auth/pambase-20200616
-RDEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) filecaps? ( sys-libs/libcap )
+RDEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) filecaps? ( sys-libs/libcap )
 SLOT=0
-SRC_URI=https://github.com/linux-pam/linux-pam/archive/d5cb4409ab6b04a6ed7c00245e2c9a430f352b16.tar.gz#/pam-d5cb4409ab6b04a6ed7c00245e2c9a430f352b16.tar.gz https://dev.gentoo.org/~zlogene/distfiles/sys-libs/pam/pam-1.4.0_p20200809-doc.tar.xz
+SRC_URI=https://github.com/linux-pam/linux-pam/archive/e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz#/pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz https://dev.gentoo.org/~zlogene/distfiles/sys-libs/pam-1.4.0_p20200809-doc.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=8aa73f843a77733113fef9e3a560ee53
+_md5_=86511d80f49123d63ba4ab7d0162a125
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 75dde9cc3088..243b6c4d13b7 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/parallel-20200722 b/metadata/md5-cache/sys-process/parallel-20200722
index 1be727d97e24..e8903d23587a 100644
--- a/metadata/md5-cache/sys-process/parallel-20200722
+++ b/metadata/md5-cache/sys-process/parallel-20200722
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20200722.tar.bz2
-_md5_=3c378f580bc9ac30126c26e5080d4621
+_md5_=31e6b06b5624f407bfca36e741175197
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 594abef20cf8..b2acb4be5fab 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r4 b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r4
new file mode 100644
index 000000000000..d150d1fb1cf3
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libnet
+EAPI=7
+IUSE=+ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+PDEPEND=ssl? ( >=dev-perl/IO-Socket-SSL-2.7.0 )
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/libnet-3.110.0 ) dev-lang/perl:= !<perl-core/libnet-3.110.0 !>perl-core/libnet-3.110.0-r999
+SLOT=0
+_md5_=38803f7b0b7506268fe90a450448f921
diff --git a/metadata/md5-cache/virtual/rust-1.45.2 b/metadata/md5-cache/virtual/rust-1.45.2
index 76a666179a4e..d1e54c3f68d0 100644
--- a/metadata/md5-cache/virtual/rust-1.45.2
+++ b/metadata/md5-cache/virtual/rust-1.45.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Rust language compiler
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc64 ~x86
 RDEPEND=|| ( ~dev-lang/rust-1.45.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.45.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38c970cec209eb720b6eedb416987c86
+_md5_=9cd43898f95ffc68bc3a0e175238d895
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 6e41b6e077a3..dee649c515b1 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.12 b/metadata/md5-cache/x11-libs/libX11-1.6.12
index 30138ec07d41..9c98113f4bd6 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.6.12
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.12
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org X11 library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
 IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.12.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=158085a2805cdd25dd784601a189e338
+_md5_=c65e0cafaa42e4efb74b1b73a6d1dff2
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index da7ebcef0325..6f2bfc1b5272 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/icewm-1.7.0 b/metadata/md5-cache/x11-wm/icewm-1.7.0
index 18ac9b2ebe9f..375ee400230b 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.7.0
+++ b/metadata/md5-cache/x11-wm/icewm-1.7.0
@@ -5,7 +5,7 @@ DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.7.0/icewm-1.7.0.tar.lz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=1b596feb334c6835cba9b68e24856274
+_md5_=e433938f9961b40602d5a887366b8e90
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5287bae6ce3b..04c8a8a555b7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Aug 2020 07:08:31 +0000
+Sat, 29 Aug 2020 14:38:27 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 3d35c4d790b2..7d216b3ff0cb 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -159,7 +159,7 @@
       <name>Kent Fredric</name>
       <role>Minion</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>leio@gentoo.org</email>
       <name>Mart Raudsepp</name>
     </member>
@@ -168,7 +168,7 @@
       <name>Roy Bamford</name>
       <role>Minion</role>
     </member>
-    <member>
+    <member is-lead="1">
       <email>sam@gentoo.org</email>
       <name>Sam James</name>
       <role>Anything/everything</role>
diff --git a/metadata/timestamp b/metadata/timestamp
index c03f14ee8d23..b0d6bc029bdf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri 28 Aug 2020 07:08:31 AM UTC
+Sat 29 Aug 2020 02:38:26 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 68e13f8b6638..8c6b8f678ec1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Aug 2020 07:30:02 +0000
+Sat, 29 Aug 2020 15:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b770c57ac2db..f406f5482584 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-56bacf8af4d5511c5fec7091089263ca7c1cedc9 1598598210 2020-08-28T07:03:30+00:00
+0afb8fc17081fa7c825a6f336ee18dac6e5d46c5 1598711054 2020-08-29T14:24:14+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ffa286bcb442..be2bfc2175bd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1598598301 Fri 28 Aug 2020 07:05:01 AM UTC
+1598711701 Sat 29 Aug 2020 02:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5287bae6ce3b..04c8a8a555b7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Aug 2020 07:08:31 +0000
+Sat, 29 Aug 2020 14:38:27 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 05b558825d7e..b19cce440591 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index e7263143904e..86af1c6d491b 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1,2 +1,3 @@
 DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
+DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
 DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
new file mode 100644
index 000000000000..da05b0364a68
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="https://openargus.org/"
+SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+ARGUS_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	net-libs/libtirpc:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	sys-libs/zlib
+	ft? ( net-analyzer/flow-tools )
+	geoip? ( dev-libs/geoip )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="
+	${ARGUS_CDEPEND}
+"
+DEPEND="
+	${ARGUS_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
+	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR RANLIB
+
+	use debug && touch .debug
+	econf \
+		$(use_with ft libft) \
+		$(use_with geoip GeoIP /usr/) \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers) \
+		$(use_with mysql mysql /usr)
+}
+
+src_compile() {
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin bin/ra*
+	dodoc ChangeLog CREDITS README CHANGES
+	doman man/man{1,5}/*
+}
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 17d6ac24042c..960cce267b55 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1 +1,2 @@
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
+DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
diff --git a/net-analyzer/argus/argus-3.0.8.3.ebuild b/net-analyzer/argus/argus-3.0.8.3.ebuild
new file mode 100644
index 000000000000..8092871dded2
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="https://openargus.org/"
+SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl tcpd"
+
+RDEPEND="
+	net-libs/libnsl:=
+	net-libs/libpcap
+	net-libs/libtirpc
+	sys-libs/zlib
+	sasl? ( dev-libs/cyrus-sasl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch
+	"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
+	"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
+	"${FILESDIR}"/${PN}-3.0.8.3-ar.patch
+	"${FILESDIR}"/${PN}-3.0.8.3-as-needed.patch
+)
+S=${WORKDIR}/${P/_rc/.rc.}
+
+pkg_setup() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+src_prepare() {
+	find . -type f -execdir chmod +w {} \; #561360
+	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
+		-i argus/argus.c \
+		-i support/Config/argus.conf \
+		-i man/man8/argus.8 \
+		-i man/man5/argus.conf.5 || die
+
+	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
+		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
+		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
+			-i support/Config/argus.conf || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+
+	econf \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers)
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	doman man/man5/*.5 man/man8/*.8
+
+	dosbin bin/argus{,bug}
+
+	dodoc ChangeLog CREDITS README
+
+	insinto /etc/argus
+	doins support/Config/argus.conf
+
+	newinitd "${FILESDIR}/argus.initd" argus
+	keepdir /var/lib/argus
+}
+
+pkg_preinst() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+pkg_postinst() {
+	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
+	elog "possible that the init script will fail to work."
+}
diff --git a/net-analyzer/argus/files/argus-3.0.8.3-ar.patch b/net-analyzer/argus/files/argus-3.0.8.3-ar.patch
new file mode 100644
index 000000000000..d17a1d3ff06f
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.3-ar.patch
@@ -0,0 +1,11 @@
+--- a/common/Makefile.in
++++ b/common/Makefile.in
+@@ -87,7 +87,7 @@
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+-	rm -f $@; ar qc $@ $(COMMONOBJ)
++	rm -f $@; $(AR) qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+ scanner.c: scanner.l 
diff --git a/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch b/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch
new file mode 100644
index 000000000000..b9616d305e01
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch
@@ -0,0 +1,11 @@
+--- a/argus/Makefile.in
++++ b/argus/Makefile.in
+@@ -85,7 +85,7 @@
+ 
+ OBJ =	$(SRC:.c=.o)
+ 
+-LIB = @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(XDRLIBS) $(COMPATLIB) ../lib/argus_common.a -lm
++LIB = ../lib/argus_common.a @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(XDRLIBS) $(COMPATLIB) -lm
+ 
+ HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
+ 	ethertype.h gencode.h gnuc.h
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.0.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.0.0-r1.ebuild
similarity index 79%
rename from net-analyzer/nessus-agent-bin/nessus-agent-bin-8.0.0.ebuild
rename to net-analyzer/nessus-agent-bin/nessus-agent-bin-8.0.0-r1.ebuild
index d53ad12d43a1..bcc8308edd06 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.0.0.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.0.0-r1.ebuild
@@ -50,6 +50,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Actually update Nessus core components. According to upstream packages,
+	# harmless to invoke on fresh installations too - and it may make life easier
+	# for people who had restored Nessus state from backups, had it lying around
+	# from older installations and so on.
+	"${EROOT}"/opt/nessus_agent/sbin/nessuscli install "${EROOT}"/opt/nessus_agent/var/nessus/plugins-core.tar.gz
+
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
 		elog "obtain an appropriate linking key and run"
@@ -57,5 +63,7 @@ pkg_postinst() {
 		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
 		elog ""
 		elog "This can be done before the agent is started."
+	else
+		elog "Please restart the nessusagent service to complete the update process"
 	fi
 }
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.11.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild
similarity index 77%
rename from net-analyzer/nessus-bin/nessus-bin-8.11.1.ebuild
rename to net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild
index 444f5c56b2c8..1e569f0e0f10 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.11.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild
@@ -50,15 +50,16 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Actually update Nessus core components. According to upstream packages,
+	# harmless to invoke on fresh installations too - and it may make life easier
+	# for people who had restored Nessus state from backups, had it lying around
+	# from older installations and so on.
+	"${EROOT}"/opt/nessus/sbin/nessuscli install "${EROOT}"/opt/nessus/var/nessus/plugins-core.tar.gz
+
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "To get started launch the nessusd-bin service, then point your Web browser to"
 		elog "  https://<yourhost>:8834/"
 	else
-		elog "You may want to restart the nessusd-bin service to use"
-		elog "the new version of Nessus."
-		elog "You also need to update your plugins.  When ready, it's done like this:"
-		elog "/etc/init.d/nessusd-bin stop"
-		elog "/opt/nessus/sbin/nessuscli update --all"
-		elog "/etc/init.d/nessusd-bin start"
+		elog "Please restart the nessusd-bin service to use the new version of Nessus"
 	fi
 }
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index c14f9fe938b4..65e5959dd7c9 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,4 +1,6 @@
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
 DIST zabbix-4.0.22.tar.gz 17392386 BLAKE2B 6d293c6096fb481bef4246703dd00066305c5f980f66e9225461edc677e1930df766f2aeadb6aa1ae6225fce791228e37304a9ed1adb40dc785d18b4393b4dd4 SHA512 de6176c8f833e76da86c6a16558fa7b94fd40d87b4a2525dc91f60490ea226751bf93829f2ec2da87804ab0468c9f76e4b4e9ee7f4e620c87115a5bd9a654f53
 DIST zabbix-4.0.23.tar.gz 17398767 BLAKE2B e1a2dba3c5d0eff6e5b277beb3b0fcfc931883f4ccd9ab458dde4115f997c37ae813804d890f586c560191523b8ed5b2fde72c71910436ab33ea953373316641 SHA512 7d78bf21cc9df6a924543b4ce0ba1ea5e5de4b169fd2333cafbac7eb8a757d2db32dcbbc8783ed0c95dfdddb7dadd6109352f2544d3c92f6f410d2116bf72ca2
+DIST zabbix-4.0.24.tar.gz 17404177 BLAKE2B 3c2e9d6f69ad32c5fbee4d4f57661dffa9afafd98056f199658e05ff6c241149c5f23bb3a71a8524e3d83b33a6635b78713e8ec7a77457ae62550f9580715969 SHA512 ec4d4bbfc3ce1ea10a4e6cf96c10e4495ce2ea154dc297544ae107d4cb7451e3fc76e25d7822f40a809a87a268c54abb8a9d49869942f2009c0a7f92ff6abaf3
 DIST zabbix-5.0.2.tar.gz 18823956 BLAKE2B 170b64a15ac8dfbf16264e4973b16130f8066a7b08e579265ae17132d9b78f43bcc8840606c0413a4db199e237ba92989556cbd12f76e595f2999cfe9ff041a0 SHA512 81cf26d67e4e4df388dd6505db6f7451cf2f05aa6ac7b5d043c32eec89053cf133075bbb289cfb5b15f48a3eb94f6462427047777035ab09cc1dfeefba926dd6
+DIST zabbix-5.0.3.tar.gz 18893485 BLAKE2B fd0225b86337a80f92a32647027e2265394ba766b304e305813b9edcfd2cc979dc4b6b4072dcd043e3b043b5f64a3fb28d36dd0dde18d216d877534ca2725d85 SHA512 d08a031b334f531320f6b695af3ed7e3514c802ea28e0cec75040c518409e16ab4c591b389091aa12c07129f9b758d050c958967e3e86e725f4595f3b3a90d97
diff --git a/net-analyzer/zabbix/zabbix-4.0.24.ebuild b/net-analyzer/zabbix/zabbix-4.0.24.ebuild
new file mode 100644
index 000000000000..844a2e68741e
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.24.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.3.ebuild b/net-analyzer/zabbix/zabbix-5.0.3.ebuild
new file mode 100644
index 000000000000..e393d4a24eba
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.3.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 7869c44c9f7f..ff762a1629ae 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 9633d4004ecc..47d155d4058e 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1 @@
-DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
-DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
-DIST bind-9.16.5.tar.xz 3474044 BLAKE2B 6908ba2d86049bc684b4876d09fe799313f0f44cc1f2ed89f0143523b9fd2a863fd8791b650f7001a5be14acde9306b70dee8c0d25b3d0676aea1a4d2878958f SHA512 789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
-DIST bind-tools-9.16.4-manpages.tar.xz 54768 BLAKE2B bff3b680673a5ebd7aad151bafb5004ca18b2ecda680320aad8821468aa399f48da20746d0e49cdfc0b431d5aedefa621015430b743968c7967bf2a5e878d1e0 SHA512 1930f4c04ae8dbdf10380082c680d59320f9a3eca3a7cbca2cb4fa83f1d4b6b00cc62a43104deb45cc56fe2e1dcc5902d6176daf1545f35d35fe297676afe6ca
diff --git a/net-dns/bind-tools/bind-tools-9.14.12.ebuild b/net-dns/bind-tools/bind-tools-9.14.12.ebuild
deleted file mode 100644
index 61d9c2df8c8c..000000000000
--- a/net-dns/bind-tools/bind-tools-9.14.12.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:= )
-	)"
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--with-openssl="${EPREFIX}"/usr
-		$(use_with idn libidn2)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-		AR="$(type -P $(tc-getAR))"
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.4.ebuild b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
deleted file mode 100644
index decfea598161..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~chutzpah/dist/misc/${P}-manpages.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
-	dev-libs/libuv:=
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:= )
-	)"
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="${PYTHON_DEPS}
-	doc? ( dev-python/sphinx )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--without-maxminddb
-		--disable-geoip
-		--with-openssl="${EPREFIX}"/usr
-		$(use_with idn libidn2)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-		AR="$(type -P $(tc-getAR))"
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-	emake -C doc/man/ man $(usev doc)
-}
-
-src_install() {
-	local man_dir="${S}/doc/man"
-	local html_dir="${man_dir}/_build/html"
-
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman ${man_dir}/delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman ${man_dir}/{dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman ${man_dir}/nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc ${html_dir}/nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman ${man_dir}/dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc ${html_dir}/dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.5.ebuild b/net-dns/bind-tools/bind-tools-9.16.5.ebuild
deleted file mode 100644
index a881baa86982..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
-	dev-libs/libuv:=
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:= )
-	)"
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--without-maxminddb
-		--disable-geoip
-		--with-openssl="${EPREFIX}"/usr
-		$(use_with idn libidn2)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-		AR="$(type -P $(tc-getAR))"
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-	emake -C doc/man/ man $(usev doc)
-}
-
-src_install() {
-	local man_dir="${S}/doc/man"
-	local html_dir="${man_dir}/_build/html"
-
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman ${man_dir}/delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman ${man_dir}/{dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman ${man_dir}/nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc ${html_dir}/nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman ${man_dir}/dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc ${html_dir}/dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.6.ebuild b/net-dns/bind-tools/bind-tools-9.16.6.ebuild
index 38c21fb955ef..a907f678c9e9 100644
--- a/net-dns/bind-tools/bind-tools-9.16.6.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index f949ca434af1..fdb61a4a2583 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,5 +1,2 @@
-DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
-DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
-DIST bind-9.16.5.tar.xz 3474044 BLAKE2B 6908ba2d86049bc684b4876d09fe799313f0f44cc1f2ed89f0143523b9fd2a863fd8791b650f7001a5be14acde9306b70dee8c0d25b3d0676aea1a4d2878958f SHA512 789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.14.12.ebuild b/net-dns/bind/bind-9.14.12.ebuild
deleted file mode 100644
index 1027fa4133c0..000000000000
--- a/net-dns/bind/bind-9.14.12.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
-urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="
-	?? ( geoip geoip2 )
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	dnsrps? ( dlz )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	geoip2? ( dev-libs/libmaxminddb )
-	gssapi? ( virtual/krb5 )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	sys-process/psmisc"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/bind-9.14.8-mysql8-bool.patch
-)
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	default
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		--with-openssl="${EPREFIX}"/usr
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		# $(use_enable static-libs static)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gssapi)
-		$(use_with json libjson)
-		$(use_with ldap dlz-ldap)
-		$(use_with mysql dlz-mysql)
-		$(use_with odbc dlz-odbc)
-		$(use_with postgres dlz-postgres)
-		$(use_with lmdb)
-		$(use_with python)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	use geoip && myeconfargs+=( --with-geoip )
-	use geoip2 && myeconfargs+=( --with-geoip2 )
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	default
-
-	dodoc CHANGES README
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc -r doc/misc/
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null || die
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
-	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	revoke settime signzone verify; do
-		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
-		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-	dosym ../../var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9 || die
-		chmod 0666 ${CHROOT}/dev/urandom || die
-	else
-		mknod ${CHROOT}/dev/random c 1 8 || die
-		chmod 0666 ${CHROOT}/dev/random || die
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		if use geoip; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-		elif use geoip2; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
-		fi
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.16.4.ebuild b/net-dns/bind/bind-9.16.4.ebuild
deleted file mode 100644
index 4514f38987ad..000000000000
--- a/net-dns/bind/bind-9.16.4.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
-urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="
-	?? ( geoip geoip2 )
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	dnsrps? ( dlz )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	geoip2? ( dev-libs/libmaxminddb )
-	gssapi? ( virtual/krb5 )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)
-	dev-libs/libuv:="
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	sys-process/psmisc"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	default
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		AR="$(type -P $(tc-getAR))"
-		--prefix="${EPREFIX}"/usr
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		--with-openssl="${EPREFIX}"/usr
-		--without-cmocka
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		# $(use_enable static-libs static)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gssapi)
-		$(use_with json json-c)
-		$(use_with ldap dlz-ldap)
-		$(use_with mysql dlz-mysql)
-		$(use_with odbc dlz-odbc)
-		$(use_with postgres dlz-postgres)
-		$(use_with lmdb)
-		$(use_with python)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	use geoip && myeconfargs+=( --enable-geoip )
-	use geoip2 && myeconfargs+=( --with-maxminddb )
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	default
-
-	dodoc CHANGES README
-
-	if use doc; then
-		docinto misc
-		dodoc -r doc/misc/
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null || die
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
-	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	revoke settime signzone verify; do
-		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
-		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-	dosym ../../var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9 || die
-		chmod 0666 ${CHROOT}/dev/urandom || die
-	else
-		mknod ${CHROOT}/dev/random c 1 8 || die
-		chmod 0666 ${CHROOT}/dev/random || die
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		if use geoip; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-		elif use geoip2; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
-		fi
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.16.5.ebuild b/net-dns/bind/bind-9.16.5.ebuild
deleted file mode 100644
index 0399c16a1540..000000000000
--- a/net-dns/bind/bind-9.16.5.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
-urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="
-	?? ( geoip geoip2 )
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	dnsrps? ( dlz )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	geoip2? ( dev-libs/libmaxminddb )
-	gssapi? ( virtual/krb5 )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)
-	dev-libs/libuv:="
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	sys-process/psmisc"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	default
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		AR="$(type -P $(tc-getAR))"
-		--prefix="${EPREFIX}"/usr
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		--with-openssl="${EPREFIX}"/usr
-		--without-cmocka
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		# $(use_enable static-libs static)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gssapi)
-		$(use_with json json-c)
-		$(use_with ldap dlz-ldap)
-		$(use_with mysql dlz-mysql)
-		$(use_with odbc dlz-odbc)
-		$(use_with postgres dlz-postgres)
-		$(use_with lmdb)
-		$(use_with python)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	use geoip && myeconfargs+=( --enable-geoip )
-	use geoip2 && myeconfargs+=( --with-maxminddb )
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	default
-
-	dodoc CHANGES README
-
-	if use doc; then
-		docinto misc
-		dodoc -r doc/misc/
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null || die
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
-	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	revoke settime signzone verify; do
-		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
-		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-	dosym ../../var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9 || die
-		chmod 0666 ${CHROOT}/dev/urandom || die
-	else
-		mknod ${CHROOT}/dev/random c 1 8 || die
-		chmod 0666 ${CHROOT}/dev/random || die
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		if use geoip; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-		elif use geoip2; then
-			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
-		fi
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.16.6.ebuild b/net-dns/bind/bind-9.16.6.ebuild
index 569c6ccdbb31..2e010f7f8f29 100644
--- a/net-dns/bind/bind-9.16.6.ebuild
+++ b/net-dns/bind/bind-9.16.6.ebuild
@@ -33,9 +33,9 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+IUSE="-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap libressl lmdb mysql odbc postgres python selinux static-libs
 urandom xml +zlib"
 # sdb-ldap - patch broken
diff --git a/net-dns/bind/files/bind-9.14.8-mysql8-bool.patch b/net-dns/bind/files/bind-9.14.8-mysql8-bool.patch
deleted file mode 100644
index 8546edc1521d..000000000000
--- a/net-dns/bind/files/bind-9.14.8-mysql8-bool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/contrib/dlz/drivers/dlz_mysql_driver.c
-+++ b/contrib/dlz/drivers/dlz_mysql_driver.c
-@@ -789,8 +789,11 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
- 	char *endp;
- 	int j;
- 	unsigned int flags = 0;
-+#if MYSQL_VERSION_ID >= 80000
-+	typedef bool my_bool;  // Workaround to make library work with MySQL client 8.0 as well as earlier versions
-+#endif
- #if MYSQL_VERSION_ID >= 50000
--        my_bool auto_reconnect = 1;
-+	my_bool auto_reconnect = 1;
- #endif
- 
- 	UNUSED(driverarg);
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 5b490dc130fa..b7d2f4a1344c 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index b1064710bb9f..3de9d5b826a2 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,3 +2,4 @@ DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5
 DIST FileZilla_3.48.0_src.tar.bz2 4765599 BLAKE2B 0ab391c0862a34dd5ede7a80290afc82b4d85b2deaf42d3bacd243bddf15505f05028522f73eeada07e91d91e0af87676ad77081c843448fda53c3b2ac18a70d SHA512 c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb
 DIST FileZilla_3.48.1_src.tar.bz2 4774251 BLAKE2B a77b821640aae3deaad3350809f34dbac8ed63c336435f92393017301509b91ef5e613ea64cb934dd2385b55fe7ba711269f85b7523d43ef451ab0cf6634ab0a SHA512 58792f92bb4f6102166924abaf843c023faeca7f2979aaa47c26f2bb3f8449902b4a43c50a800d56584d39c9ddf64a6d3334558e46f56bda3b8515c7a3ff0a12
 DIST FileZilla_3.49.1_src.tar.bz2 4788452 BLAKE2B 63ee0ba462f918a357342f8e53dccb40e01a7cab52e25891e1b17bddb863d0386a51c67e09d0c875a4abf9b4e443a03c6616be3d7d39e585324e7343d19dfd14 SHA512 e6e69858aff3be6f557cc338ac4cd4391699d171742a2e815dff15e029a76cb1cc0651c15a3b4fb95644371b4e84b913e34a70846454a7fd5de6f05a7f461add
+DIST FileZilla_3.50.0_src.tar.bz2 4791977 BLAKE2B c0352eea9c4cd0a10d25b21b0a6982a762df6353a8da0703179270ef27be71bf151591011c45aae6e303437ac5ecca6a340635c392e2ed6db1a4a9d4002f4d7b SHA512 5edcb18aa7e4a0a59678d589d20996d7f6311f717e55a70c9dacafe42e3df6cba79be778bef34ff399672941dfb78a4732b83f21016b721702c763f0408b3e40
diff --git a/net-ftp/filezilla/filezilla-3.50.0.ebuild b/net-ftp/filezilla/filezilla-3.50.0.ebuild
new file mode 100644
index 000000000000..c567d79aeb8c
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.50.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.24.1:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 299bef721a7b..d41b5c877085 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 7fa6fa52aca6..c628e4e438b7 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,3 +1,8 @@
 DIST tdesktop-2.1.13.tar.gz 14448009 BLAKE2B 3e9b067aefb72e688d12ceead86453285bcd4ed3345ff601220e282291fb92eb346072695bd1dbf97ce82a81ad97d33000cf7b52edc9ea2cd0aacd566fc17f39 SHA512 1166ec37043f4042130fcb1bb5464dc4fae69f6ac27dc877cd481400fed3be6d4ccbe8998619782786065ea308e774f7efd5a89a06e2f9059d3f2effc2b850c4
+DIST tdesktop-2.2.0.tar.gz 14514420 BLAKE2B 9ece8c3a251a0f6258d8292ecf6c71047c258c2ae4470c00b727f92ff4831c7eead397f9ac54a88c36c81a9b0cff0fce204281eefc9d16b89606043276448f65 SHA512 20d83ad589318e7120816770fb60d01c206deb8308b3304bca6fc043b732e29c7ae03334e484fd589cc1d698e1c6565d802d102072aa66498cf10ce1c60337e4
+DIST tdesktop-2.3.0.tar.gz 14576875 BLAKE2B 148693c8e4e6376c968ed3667092eaecd3295f59d289a0ec720c7be9d997610263a34ba34bf5350f49f45de7c076bd3c3dedc7ba261116ed6d1a8ed7023a582f SHA512 daa588936db2f17552a320d9412d6b0eb9d84d468defbc4929cc88d1a7ad3ce715be388dd7249d308cfc124c5af3152749c35f03b1f84dc89d37be067b9b9063
 DIST tsetup.2.1.13.tar.xz 35692368 BLAKE2B b41023b8ad7178ab48c62657eefbf3962c956ecb42d0e448fb14fab147334c35f38eac98bc7038328c02f4c98d506217eddb27603127312663d056fd34635303 SHA512 028722700be37c04fb900ba7186990bdc35bcbed2320dd510f08694f39c81804a529b133134146e1c474c9aca398f870d901d6f4eb6d1bc207b21aa0eab688cd
+DIST tsetup.2.2.0.tar.xz 35848816 BLAKE2B 87b5fca2c3d68f7324b2cbff46fa94ed1dc26d101653da7654082453d8fd7858b7097b41a78ba4aa7b52f0f731ed9ec36957a0738465e365f927e79418cda5fd SHA512 8dd68c7778ef45cdc28bdfa5eb3646afe622b322c524db3a6e69cac6e4127f7a4f4df39ecd9860d4103414eb8b039a311eab3f6e97a2de44515ef0533fd8a100
+DIST tsetup.2.3.0.tar.xz 40156000 BLAKE2B 1055c1ca657eec7fd10bfcba1bdae5f84a9c753b6f3587354a6fb586dfbbeb24cff05fd053c97f7c768895626c9ddedfc379ae64960b98745c07f036811d747d SHA512 81f377abbea16dfbda38670f110436af5de22a3f5cff4a5450f5414024307d1612f75b871364155a3ffac10996a0591c58a528f60dca98862843d15a25994c71
 DIST tsetup32.2.1.13.tar.xz 38700276 BLAKE2B cf52737c1b7af3e3c07bcc78136c6cfb1169fc9727caa800c7eff0daed8680fcf9a82266311417d8ce6e88ca2d6ce6aafa805140facf2290eacd9c94504e50b0 SHA512 a5f9ff41e31ea0ab9b8873e78a94251a2c1e7fb61240b22bd613fa45d99079e3306c4147e58b64f9940fb90d587aa53e20d2ccb839fa03534d47b864736ccc8c
+DIST tsetup32.2.2.0.tar.xz 38942684 BLAKE2B ea73709134364ad4cf3ccdc25be6d7fe33ef729b486f91ff1a6271854ce1ef5189eb21312827eea37c791cd99f3f7ffbe0dbb609f25b82398b342f895c31acc7 SHA512 4a55b79a69bb90a1ac990ce3237e2c377967d96f41800a5526ca84d6c27d3dce6d0940b2ed35ba5f03df764bd55e14948dffcddda33a6529dcc72a3d3125768f
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild
new file mode 100644
index 000000000000..1da038a5f934
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild
new file mode 100644
index 000000000000..ff1a4de67c4b
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 55ba1da0e037..fbe21a977430 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
new file mode 100644
index 000000000000..b1dc595c2cc7
--- /dev/null
+++ b/net-irc/znc-palaver/Manifest
@@ -0,0 +1 @@
+DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
new file mode 100644
index 000000000000..79e06f30a5ef
--- /dev/null
+++ b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
@@ -0,0 +1,48 @@
+From 3d5a1a3c2a7cb3de82c618b1e70618195ec4a1e7 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Fri, 28 Aug 2020 23:48:23 +0200
+Subject: [PATCH] test/test_palaver.py: loop argument is deprecated
+
+DeprecationWarning: The loop argument is deprecated since Python 3.8,
+and scheduled for removal in Python 3.10.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ test/test_palaver.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/test_palaver.py b/test/test_palaver.py
+index 1b27878..d22366a 100644
+--- a/test/test_palaver.py
++++ b/test/test_palaver.py
+@@ -50,10 +50,10 @@ async def setUp(event_loop):
+     running_as_root = os.getuid() == 0
+     allow_root = ' --allow-root' if running_as_root else ''
+ 
+-    proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures --foreground --debug{allow_root}', loop=event_loop)
++    proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures --foreground --debug{allow_root}')
+     time.sleep(31 if running_as_root else 1)
+ 
+-    (reader, writer) = await asyncio.open_connection('localhost', 6698, loop=event_loop)
++    (reader, writer) = await asyncio.open_connection('localhost', 6698)
+     writer.write(b'CAP LS 302\r\n')
+ 
+     line = await reader.readline()
+@@ -184,7 +184,7 @@ async def connected(reader, writer):
+ 
+         connected.called = True
+ 
+-    server = await asyncio.start_server(connected, host='127.0.0.1', port=0, loop=event_loop)
++    server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
+     await asyncio.sleep(0.2)
+     addr = server.sockets[0].getsockname()
+     url = f'Serving on http://{addr[0]}:{addr[1]}/push'
+@@ -248,7 +248,7 @@ async def connected(reader, writer):
+ 
+         connected.called = True
+ 
+-    server = await asyncio.start_server(connected, host='127.0.0.1', port=0, loop=event_loop)
++    server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
+     await asyncio.sleep(0.2)
+     addr = server.sockets[0].getsockname()
+     url = f'Serving on http://{addr[0]}:{addr[1]}/push'
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
new file mode 100644
index 000000000000..ffbb2ad4543b
--- /dev/null
+++ b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
@@ -0,0 +1,23 @@
+From 3be5f33d76d4e34b1bc2671f7dbbc6c5fc3ccadd Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sat, 29 Aug 2020 00:06:53 +0200
+Subject: [PATCH] Makefile: use xunit2 as default for pytest
+
+PytestDeprecationWarning: The 'junit_family' default
+value will change to 'xunit2' in pytest 6.0.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d5d4866..e88277e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,4 +30,4 @@ test/fixtures/modules/palaver.so: palaver.so
+ .PHONY: test-integration
+ test-integration: test/fixtures/modules/palaver.so
+ 	@mkdir -p test-reports
+-	pytest --junitxml=test-reports/junit.xml
++	pytest -o junit_family=xunit2 --junitxml=test-reports/junit.xml
diff --git a/net-irc/znc-palaver/metadata.xml b/net-irc/znc-palaver/metadata.xml
new file mode 100644
index 000000000000..b0e19e1bdc90
--- /dev/null
+++ b/net-irc/znc-palaver/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		The Palaver ZNC module provides push notifications through ZNC
+		for the iOS Palaver APP while being disconnected from IRC.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/cocodelabs/znc-palaver/issues</bugs-to>
+		<remote-id type="github">cocodelabs/znc-palaver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
new file mode 100644
index 000000000000..45c850d4f1f7
--- /dev/null
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A ZNC module which provides push notifications to Palaver"
+HOMEPAGE="https://github.com/cocodelabs/znc-palaver"
+SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	net-irc/znc:=[ssl]"
+
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	')
+"
+
+DOCS=( "CHANGELOG.md" "README.md" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-python310.patch"
+	"${FILESDIR}/${P}-xunit2.patch"
+)
+
+src_compile() {
+	tc-export CXX
+
+	# Building znc modules by 'znc-buildmod'
+	# does not support multiple threads.
+	emake -j1
+}
+
+src_test() {
+	default
+
+	emake test-integration
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/znc
+	doins palaver.so
+
+	einstalldocs
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9536835363ea..a30092831bc9 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/aqbanking/aqbanking-6.0.1.ebuild b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
index bcdec3f90a61..f2a3e161f63d 100644
--- a/net-libs/aqbanking/aqbanking-6.0.1.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index 6db91129b7e7..1fded209addc 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 53a17d46bb22..3ca7975df12e 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,4 +1,5 @@
 DIST libtorrent-1.2.8.tar.gz 3583174 BLAKE2B ead7e28f7c29422526f8eab5611d98ba9a6d3827edf45c3819951a7ffb6f360debb818083bf0fa46e573005c3b9df3d3b4b3515c0498515449708b166e181705 SHA512 2a36412fb399f066de9768f4afd87ddbfc10fcd2a0b3a8be0a43bec6914497e71d9d4ffe4ff8ccc5544a048f799ccba6ce086ab6199f4dee66d1341f02d73f9a
+DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
 DIST libtorrent-rasterbar-1.2.7.tar.gz 4105179 BLAKE2B 126bb0b287c0573f755e918b3cf32a0a98c14b3b41f676d7842ea58deecc141b046b4bc18579cb9c20b324fb1361794ee6afedeff64d0b76f1bb6a95b82e10f7 SHA512 60dfb31b1300b3aa2219227b3a263ba73aedb54a90aa940c117027651779cb972d6e1badf9519f6ad7947233b54df608b829bab34493ceda9e4cb8913041a752
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
new file mode 100644
index 000000000000..ec2c3393a34e
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/libtorrent-libtorrent-${PV}"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	mkdir -p "${S}"/build-aux || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-boost
+		--with-libiconv
+		--enable-logging
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
index e18ea823126d..883097715ee4 100644
--- a/net-libs/nghttp2/nghttp2-1.41.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index e92c545dac0d..76e2e4155f2e 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
index 0c0b4e2564a0..22b5c2c5408c 100644
--- a/net-mail/pop2imap/Manifest
+++ b/net-mail/pop2imap/Manifest
@@ -1,2 +1 @@
-DIST pop2imap-1.18.tgz 20059 BLAKE2B 022eacdf48ca65f1f62372cbf3b63ca45906e8433d2797be3e7e49c0a72b85ef8ebf4466eef75d4643e1bdf1da32f83b1aa55744c910ca3e7dce143b49e3c836 SHA512 8b3a41cc2c7f9b51890d2ba19897f0b1576a027f0f3443fb3fcfeec9beecd797cba383ad83f0b56abb8e79625ad52b25fda20b94dc80cc11ddfe60550809a86f
 DIST pop2imap-1.21.tgz 10920 BLAKE2B 6f35fc081aa2b27854aaeec191d9d084fbe063e647fc2042ff8a0670dd4420442e1d2da747b6c5ea05481c25751f8f5f774b0afef4d9007e09a15c879585a7e2 SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e
diff --git a/net-mail/pop2imap/pop2imap-1.18.ebuild b/net-mail/pop2imap/pop2imap-1.18.ebuild
deleted file mode 100644
index 6f6a40519685..000000000000
--- a/net-mail/pop2imap/pop2imap-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Synchronize mailboxes between a pop and an imap servers"
-HOMEPAGE="http://www.linux-france.org/prj/pop2imap/"
-SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	dev-perl/Email-Simple
-	dev-perl/Date-Manip
-	dev-perl/IO-Socket-SSL"
-
-src_install() {
-	dobin pop2imap
-	dodoc ChangeLog README VERSION
-}
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
index 541e50751c7a..cef59036ef8d 100644
--- a/net-mail/pop2imap/pop2imap-1.21.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 0e0a5b23f204..294f3f503d25 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
index 640c10447e95..00429446d9e6 100644
--- a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
+++ b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index d74002f56dee..23a3cc3dde91 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,2 +1 @@
-DIST pcapfix-0.7.tar.gz 25753 BLAKE2B 75a8bca8e5c0f7b6604a9c2202116f3fd18917bb98797b401618d32861a14e2bc7f7a1fe684d2e057c4314de72bbbb825dc3142ea93bd8dea0b1bc4716e240e0 SHA512 254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298
 DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B 4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9 SHA512 6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
diff --git a/net-misc/pcapfix/pcapfix-0.7.ebuild b/net-misc/pcapfix/pcapfix-0.7.ebuild
deleted file mode 100644
index a0ef34d64263..000000000000
--- a/net-misc/pcapfix/pcapfix-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Repair and fix broken pcap files"
-HOMEPAGE="http://f00l.de/pcapfix/"
-SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile
-}
-
-src_install() {
-	doman pcapfix.1
-	dobin pcapfix
-	dodoc README TODO Changelog
-}
diff --git a/net-misc/pimpd/pimpd-0.8-r1.ebuild b/net-misc/pimpd/pimpd-0.8-r1.ebuild
new file mode 100644
index 000000000000..8fca8381c8f0
--- /dev/null
+++ b/net-misc/pimpd/pimpd-0.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin pimpd
+	dodoc README
+}
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index f615e2bb7454..f387d9dd00fd 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/adtool/adtool-1.3.3-r1.ebuild b/net-nds/adtool/adtool-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..014b4436dca9
--- /dev/null
+++ b/net-nds/adtool/adtool-1.3.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="Utility for Active Directory administration"
+HOMEPAGE="http://gp2x.org/adtool/"
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="net-nds/openldap"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bfr-overflow.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-automake.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/net-nds/adtool/adtool-1.3.3.ebuild b/net-nds/adtool/adtool-1.3.3.ebuild
deleted file mode 100644
index 851fdd24deb0..000000000000
--- a/net-nds/adtool/adtool-1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Utility for Active Directory administration"
-HOMEPAGE="http://gp2x.org/adtool/"
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl"
-
-DEPEND="
-	net-nds/openldap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-bfr-overflow.patch )
-
-src_prepare() {
-	# automake-1.13
-	mv configure.{in,ac} || die
-	sed \
-		-e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \
-		-i src/tools/Makefile.am || die
-	autotools-utils_src_prepare
-}
diff --git a/net-nds/adtool/files/adtool-1.3.3-automake.patch b/net-nds/adtool/files/adtool-1.3.3-automake.patch
new file mode 100644
index 000000000000..df8f99edc46d
--- /dev/null
+++ b/net-nds/adtool/files/adtool-1.3.3-automake.patch
@@ -0,0 +1,9 @@
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -4,5 +4,5 @@
+ 
+ bin_PROGRAMS = adtool
+ 
+-adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv 
++adtool_LDADD = @top_builddir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
+ 
diff --git a/net-nds/adtool/files/adtool-1.3.3-fno-common.patch b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch
new file mode 100644
index 000000000000..49391a79920e
--- /dev/null
+++ b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/active_directory.h
++++ b/src/lib/active_directory.h
+@@ -28,11 +28,11 @@
+ | if there is a problem reading the config file, or
+ |	AD_SERVER_CONNECT_FAILURE if a connection can't be made.
+ */
+-char *system_config_file;
+-char *uri;
+-char *binddn;
+-char *bindpw;
+-char *search_base;
++extern char *system_config_file;
++extern char *uri;
++extern char *binddn;
++extern char *bindpw;
++extern char *search_base;
+ 
+ /* ad_get_error() returns a pointer to a string containing an
+ | explanation of the last error that occured.
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 55a6696536b9..5df4f612f221 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
index 2a9e1703837f..e15d2c10758c 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="knots"
 
 DEPEND="
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
index cc3760916ae0..3644f4d6d0ca 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="+asm dbus kde knots +qrcode +system-leveldb test upnp +wallet zeromq"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
index 8611fe0564cf..69e4caf5f84d 100644
--- a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm examples knots +system-leveldb test upnp +wallet zeromq"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/syncthing/syncthing-1.7.1.ebuild b/net-p2p/syncthing/syncthing-1.7.1.ebuild
index 3007398e5dc9..4c62a5a187a6 100644
--- a/net-p2p/syncthing/syncthing-1.7.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.7.1.ebuild
@@ -493,7 +493,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 0f9d68d6c1bb..65fac0f61930 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/hplip/hplip-3.20.6-r1.ebuild b/net-print/hplip/hplip-3.20.6-r1.ebuild
index f5b44b6010f0..d99947ede320 100644
--- a/net-print/hplip/hplip-3.20.6-r1.ebuild
+++ b/net-print/hplip/hplip-3.20.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 06b564ea3683..ae95a6e5e8b0 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
index f462541fef18..43f6d86aead3 100644
--- a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
@@ -18,7 +18,7 @@ external-filters +fast-redirects +force fuzz graceful-termination
 +image-blocking ipv6 lfs png-images selinux +stats +threads toggle
 tools whitelists +zlib"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ~ppc64 sparc x86"
 LICENSE="GPL-2"
 
 DEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b411ba653dbf..0ee4702b8fdc 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 0656c05a2267..7ebafb05c018 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org) (2020-08-27)
+# little-endian power8 ppc64 configs are provided
+-sys-kernel/gentoo-kernel
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
 # libva unmasked on little-endian profile
 -net-im/telegram-desktop
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 04b8b943b74f..53eee5c0073c 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org) (2020-08-27)
+# big-endian ppc64 configs are not provided
+# however users can unmask and use savedconfig feature
+sys-kernel/gentoo-kernel
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
 # buggy on big-endian
 x11-libs/libva
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 846a53e316fb..b9439da2af1a 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (2020-01-12)
+# Dependencies not keyworded
+app-editors/emacs gui
+
 # Jakov Smolic <jakov.smolic@sartura.hr> (2020-08-14)
 # Large amount of missing keywords
 # Bug #724358
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b3f8e0a3d62a..fc708ba49591 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -484,14 +484,6 @@ dev-util/intel-ocl-sdk system-clang
 # Currently broken upstream.
 >=dev-lang/rakudo-2016.05 java
 
-# Michał Górny <mgorny@gentoo.org> (2016-05-14)
-# (on behalf of QA team)
-# sys-devel/gcc[jit]:
-# - violates strict multilib rules, #569608
-# - causes collisions between multiple gcc versions, #583010
-# Masking the flag until it is fixed.
-sys-devel/gcc jit
-
 # Mike Frysinger <vapier@gentoo.org> (2016-05-08)
 # Most targets do not support VTV #547040.
 sys-devel/gcc vtv
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index 4bfaa730f313..88e1fc59584b 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -46,6 +46,7 @@ irlcd - Add support for the USBtiny DIY USB to IR receiver
 irman - Add support for the IrMan IR remote
 irtrans - Add support for the 16x2 IRTrans VFD device
 joy - Add support for the joystick input driver, used on various LCD keypads
+jw002 - Add support for PJRC JW002 24x8 LCD display
 ks0108 - Add support for KS0108 based graphical LCDs
 l4m - Add support for Linux4Media displays
 lb216 - Add support for RTN's LB216 display
diff --git a/profiles/package.mask b/profiles/package.mask
index 421bcb240265..7b51bb7bddd4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-29)
+# Abandoned upstream. Use dev-haskell/cryptonite instead.
+# Does not compile against ghc-8.8. Removal in 30 days.
+dev-haskell/cipher-blowfish
+dev-haskell/cryptocipher
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-28)
+# EAPI=4 and fails to compile
+# Dead upstream. Removal in 30 days
+net-mail/maildirtree
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-08-27)
 # Abandoned upstream.
 # Does not compile against ghc-8.8. Removal in 30 days.
@@ -725,12 +736,6 @@ media-sound/jack
 # Removal in 30 days.  Bug #735010.
 dev-python/distributed
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-07-31)
-# Broken package with dead upstream.
-# Libraries like tikz/pgf can be used as a replacement.
-# Removal in 30 days.
-dev-tex/herm-pic
-
 # Michał Górny <mgorny@gentoo.org> (2020-07-28)
 # Masked for the time being due to dep on LLVM 8.  Bug #720236.
 <=dev-ada/gps-2019-r1
@@ -741,24 +746,6 @@ dev-tex/herm-pic
 # Masked for removal in 30 days.
 sys-fs/rarfs
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-07-30)
-# Has been a part of dev-texlive/texlive-publishers
-# for a long time. Only Gentoo ships this one.
-# Removal in 30 days.
-dev-tex/aastex
-
-# Mikle Kolyada <zlogene@gentoo.org> (2020-07-30)
-# Obsolete package. Last release in 2009 and
-# upstream is dead. Use minted instead.
-# Removal in 30 days.
-dev-tex/slatex
-
-# Mikle Kolyada <zlogene@gentoo.org> (2020-07-30)
-# Obsolete package. Last release in 2005.
-# TexLive has its own CJK support.
-# Removal in 30 days.
-dev-tex/hlatex
-
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-07-28)
 # Not used by other packages anymore.
 # Removal in 30 days.
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 0e48951816d0..da96e7830d3b 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind emboss encode exif flac gif gpm gtk icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind emboss encode exif flac gif gpm gtk gui icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1ddc4e858562..ad24f3162c09 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -727,6 +727,7 @@ app-forensics/aide:e2fs - Enable support for checking file attributes on ext2/ex
 app-forensics/aide:postgres - Use postgresql library for storing databases
 app-forensics/aide:prelink - Bypass prelinking when calculating checksums
 app-forensics/chkrootkit:cron - Install cron script for weekly rootkit scans
+app-forensics/honggfuzz:clang - Enable clang support (pull sys-libs/blocksruntime dependency).
 app-forensics/libewf:bfio - Enables libbfio for chaining file in file handling
 app-forensics/libewf:fuse - Enable fuse support for ewfmount
 app-forensics/libewf:uuid - Enable UUID support in the ewftools
@@ -1616,7 +1617,6 @@ dev-haskell/hdbc-sqlite3:splitbase - Choose the new smaller, split-up package.
 dev-haskell/hexpat:bundled-expat - Use bundled expat instead of dev-libs/expat
 dev-haskell/highlighting-kate:executable - Build the Highlight executable.
 dev-haskell/highlighting-kate:pcre-light - Use the pcre-light library instead of regex-pcre-builtin.
-dev-haskell/hit:executable - Build the executable
 dev-haskell/hlint:gpl - Use GPL libraries, specifically hscolour.
 dev-haskell/hps:build-exec - Build the `hps-fractals' executable
 dev-haskell/hs3:network-uri - Get Network.URI from the network-uri package.
@@ -3801,7 +3801,6 @@ mail-client/alpine:chappa - enhance Alpine by applying Eduardo Chappa's patches
 mail-client/alpine:onlyalpine - installs only the alpine binary, so it does not collied with pico and/or pine
 mail-client/alpine:passfile - Adds support for caching passwords into a file between sessions
 mail-client/alpine:smime - Enable support for S/MIME
-mail-client/balsa:crypt - Adds support for GnuPG encryption
 mail-client/balsa:rubrica - Adds support for rubrica addressbook
 mail-client/claws-mail:archive - Enable archiving plugin
 mail-client/claws-mail:bogofilter - Build mail-filter/bogofilter plugin
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index a1bf0e481100..88efb4aabae7 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/chemtool/Manifest b/sci-chemistry/chemtool/Manifest
index 79f89d065914..17ef99cab669 100644
--- a/sci-chemistry/chemtool/Manifest
+++ b/sci-chemistry/chemtool/Manifest
@@ -1,2 +1 @@
-DIST chemtool-1.6.13.tar.gz 838868 BLAKE2B 18bca95fafae69de98e0507d820d596a62f4fdd923f6bd79964c7561b732b53bb0bede0f2b6db2ab2d834fa229af7ac3b4b8051895bb53c964ad185b5283813c SHA512 6c248321f73b6eab4ad21e810639a1f0b14cc30db9c9fdc8fe66ee218bd88ead5e74f1f047f5badcb91b515827c2eddc64b28ead380d9b14ab5b76777e7134dd
 DIST chemtool-1.6.14.tar.gz 817735 BLAKE2B 065c5069402b5960fc2c9b686a9c0e9954b98c43a1d70385ca56e8407fffbe09fd87023f1f7177140745987c69731766f64a8b8015370ef38593bbcd3f073e64 SHA512 066c83c61aced3134b081767e788143a047889a2fee4b6535c2b0a3166bccc73d75981e1cf35b7bcaa5b8fe2e0227b28693b659decd82f7783cb4082ac6ed2bd
diff --git a/sci-chemistry/chemtool/chemtool-1.6.13.ebuild b/sci-chemistry/chemtool/chemtool-1.6.13.ebuild
deleted file mode 100644
index 8eb6ec996db2..000000000000
--- a/sci-chemistry/chemtool/chemtool-1.6.13.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils
-
-DESCRIPTION="A GTK program for drawing organic molecules"
-HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
-SRC_URI="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="emf gnome nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/transfig
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-	emf? ( media-libs/libemf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-no-underlinking.patch
-	)
-
-src_configure() {
-	local myeconfargs=(
-		--without-kdedir
-		$(use_with gnome gnomedir /usr)
-		$(use_enable emf)
-		--enable-undo
-		--enable-menu
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /usr/share/${PN}/examples
-	doins "${S}"/examples/*
-	if ! use nls; then rm -rf "${ED}"/usr/share/locale || die; fi
-
-	insinto /usr/share/pixmaps
-	doins chemtool.xpm
-	make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry"
-}
diff --git a/sci-chemistry/chemtool/chemtool-1.6.14.ebuild b/sci-chemistry/chemtool/chemtool-1.6.14.ebuild
index 58a5d56b105e..3d2d12c9a70c 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.14.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.14.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils
+inherit autotools desktop
 
 DESCRIPTION="A GTK program for drawing organic molecules"
 HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
@@ -23,34 +21,41 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/pango
 	emf? ( media-libs/libemf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/1.6.13-no-underlinking.patch
+	"${FILESDIR}"/${P}-no-underlinking.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fix-tests.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
-		--without-kdedir
-		$(use_with gnome gnomedir /usr)
+	econf \
+		--enable-undo \
+		--enable-menu \
+		--without-kdedir \
+		$(use_with gnome gnomedir "${EPREFIX}"/usr) \
 		$(use_enable emf)
-		--enable-undo
-		--enable-menu
-		)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
-	insinto /usr/share/${PN}/examples
-	doins "${S}"/examples/*
-	if ! use nls; then rm -rf "${ED}"/usr/share/locale || die; fi
+	insinto /usr/share/chemtool/examples
+	doins -r examples/.
 
 	insinto /usr/share/pixmaps
 	doins chemtool.xpm
-	make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry"
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/locale || die
+	fi
+
+	make_desktop_entry chemtool Chemtool chemtool "Education;Science;Chemistry"
 }
diff --git a/sci-chemistry/chemtool/files/chemtool-1.6.14-fix-tests.patch b/sci-chemistry/chemtool/files/chemtool-1.6.14-fix-tests.patch
new file mode 100644
index 000000000000..755ae3f01914
--- /dev/null
+++ b/sci-chemistry/chemtool/files/chemtool-1.6.14-fix-tests.patch
@@ -0,0 +1,6 @@
+--- /dev/null
++++ b/src-cht/Makefile.am
+@@ -0,0 +1,3 @@
++bin_PROGRAMS = cht
++
++cht_SOURCES = cht.c
diff --git a/sci-chemistry/chemtool/files/chemtool-1.6.14-fno-common.patch b/sci-chemistry/chemtool/files/chemtool-1.6.14-fno-common.patch
new file mode 100644
index 000000000000..d782f8e4a625
--- /dev/null
+++ b/sci-chemistry/chemtool/files/chemtool-1.6.14-fno-common.patch
@@ -0,0 +1,37 @@
+--- a/ct1.h
++++ b/ct1.h
+@@ -273,12 +273,12 @@
+ extern float importfactor;
+ extern int importoffset;
+ 
+-char **intype;
+-char **inmode;
+-int babelin;
+-char **outtype;
+-char **outmode;
+-int babelout;
++extern char **intype;
++extern char **inmode;
++extern int babelin;
++extern char **outtype;
++extern char **outmode;
++extern int babelout;
+ extern char *babel;
+ extern GdkGC *mygc[8],*background_gc,*hlgc;
+ extern int curpen;
+--- a/inout.c
++++ b/inout.c
+@@ -30,6 +30,13 @@
+ extern GdkFont *font[7],*smallfont[7],*symbfont[7],*boldfont[7],*slfont[7];
+ #endif
+ 
++char **intype;
++char **inmode;
++int babelin;
++char **outtype;
++char **outmode;
++int babelout;
++
+ static char babeloutp[4];
+ 
+ int
diff --git a/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch b/sci-chemistry/chemtool/files/chemtool-1.6.14-no-underlinking.patch
similarity index 100%
rename from sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch
rename to sci-chemistry/chemtool/files/chemtool-1.6.14-no-underlinking.patch
diff --git a/sci-chemistry/psi/files/3.4.0-ldflags.patch b/sci-chemistry/psi/files/3.4.0-ldflags.patch
index 9d7f2767e8ec..41f6bb651120 100644
--- a/sci-chemistry/psi/files/3.4.0-ldflags.patch
+++ b/sci-chemistry/psi/files/3.4.0-ldflags.patch
@@ -1,7 +1,7 @@
 Respect LDFLAGS
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -288,15 +288,13 @@
  )
  AC_SUBST(LDLIBS)
diff --git a/sci-chemistry/psi/files/3.4.0-man_paths.patch b/sci-chemistry/psi/files/3.4.0-man_paths.patch
index 02cced160847..51917c4decda 100644
--- a/sci-chemistry/psi/files/3.4.0-man_paths.patch
+++ b/sci-chemistry/psi/files/3.4.0-man_paths.patch
@@ -2,8 +2,8 @@ Fix man paths
 
 http://bugs.gentoo.org/show_bug.cgi?id=326185
 
---- src/bin/nonbonded/Makefile.in
-+++ src/bin/nonbonded/Makefile.in
+--- a/src/bin/nonbonded/Makefile.in
++++ b/src/bin/nonbonded/Makefile.in
 @@ -19,5 +19,5 @@
  endif
  
@@ -12,8 +12,8 @@ http://bugs.gentoo.org/show_bug.cgi?id=326185
 -	$(INSTALL_INCLUDE) $^ $(mandir)/man1
 +	$(MKDIRS) $(DESTDIR)$(mandir)/man1
 +	$(INSTALL_INCLUDE) $^ $(DESTDIR)$(mandir)/man1
---- src/bin/intder/Makefile.in
-+++ src/bin/intder/Makefile.in
+--- a/src/bin/intder/Makefile.in
++++ b/src/bin/intder/Makefile.in
 @@ -21,6 +21,6 @@
  endif
  
diff --git a/sci-chemistry/psi/files/3.4.0-parallel_fix.patch b/sci-chemistry/psi/files/3.4.0-parallel_fix.patch
index 65234fb40dcb..8c8d8c35121a 100644
--- a/sci-chemistry/psi/files/3.4.0-parallel_fix.patch
+++ b/sci-chemistry/psi/files/3.4.0-parallel_fix.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -17,62 +17,19 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -70,8 +70,8 @@
  
  $(top_srcdir)/configure: $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4
  	cd $(top_srcdir) && autoconf
---- lib/Makefile.in
-+++ lib/Makefile.in
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
 @@ -31,7 +31,7 @@
  	$(INSTALL_DATA) $(srcdir)/psi.dat $(DESTDIR)$(pkgdatadir)
  	for dir in $(subdirs); \
@@ -81,8 +81,8 @@
            done
  
  install_man: macro.psi
---- src/Makefile.in
-+++ src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -6,53 +6,10 @@
  
  default: all
@@ -141,8 +141,8 @@
  
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
---- src/lib/Makefile.in
-+++ src/lib/Makefile.in
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
 @@ -4,56 +4,10 @@
  subdirs = libipv1 libciomr libchkpt libqt libpsio libiwl libdpd libutil \
            liboptions libmoinfo libbasis libmints
@@ -204,8 +204,8 @@
  
  #
  # keep the configuration information and makefile up-to-date
---- src/bin/Makefile.in
-+++ src/bin/Makefile.in
+--- a/src/bin/Makefile.in
++++ b/src/bin/Makefile.in
 @@ -13,55 +13,10 @@
  subdirs += psirb
  endif
@@ -266,8 +266,8 @@
  
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
---- src/samples/Makefile.in
-+++ src/samples/Makefile.in
+--- a/src/samples/Makefile.in
++++ b/src/samples/Makefile.in
 @@ -5,55 +5,10 @@
  
  subdirs = mints
@@ -328,8 +328,8 @@
  
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
---- src/util/Makefile.in
-+++ src/util/Makefile.in
+--- a/src/util/Makefile.in
++++ b/src/util/Makefile.in
 @@ -3,55 +3,10 @@
  
  subdirs = tocprint psi2molden
@@ -390,8 +390,8 @@
  
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
---- src/lib/libipv1/Makefile.in
-+++ src/lib/libipv1/Makefile.in
+--- a/src/lib/libipv1/Makefile.in
++++ b/src/lib/libipv1/Makefile.in
 @@ -58,4 +58,4 @@
  # in case DODEPEND is no
  #
diff --git a/sci-chemistry/psi/files/psi-3.4.0-perl-File-Temp.patch b/sci-chemistry/psi/files/psi-3.4.0-perl-File-Temp.patch
new file mode 100644
index 000000000000..691567ae0cc1
--- /dev/null
+++ b/sci-chemistry/psi/files/psi-3.4.0-perl-File-Temp.patch
@@ -0,0 +1,14 @@
+--- a/tests/psitest.pl
++++ b/tests/psitest.pl
+@@ -2793,9 +2793,9 @@
+ {
+   # It's better to use File::Temp but it doesn't seem to be installed by default
+   # use File::Temp;
+-  use POSIX qw(tmpnam);
++  use File::Temp ();
+ 
+-  my $tempfile = tmpnam();
++  my $tempfile = File::Temp->new();
+   my $psicmd = build_psi_cmd("psi3 -c", 0, $SRC_PATH,  $PSITEST_EXEC_PATH, " 1>$tempfile 2>/dev/null");
+   my $psi_fail = system($psicmd);
+   open(RE, "$tempfile") || die "cannot open $tempfile $!";
diff --git a/sci-chemistry/psi/psi-3.4.0-r2.ebuild b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
index f40a13060173..2b73d442b470 100644
--- a/sci-chemistry/psi/psi-3.4.0-r2.ebuild
+++ b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils fortran-2 multilib toolchain-funcs
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Suite for ab initio quantum chemistry computing various molecular properties"
 HOMEPAGE="http://www.psicode.org/"
@@ -12,17 +12,19 @@ SRC_URI="mirror://sourceforge/psicode/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
+IUSE="test"
+# psi3/psiclean segfault because tests were never run before
+RESTRICT="test"
 
 RDEPEND="
 	!sci-visualization/extrema
 	virtual/blas
 	virtual/lapack
 	>=sci-libs/libint-1.1.4:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/byacc
+	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 S="${WORKDIR}/${PN}${PV:0:1}"
@@ -38,19 +40,21 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-parallel_fix.patch
 	"${FILESDIR}"/${PV}-fortify.patch
 	"${FILESDIR}"/${P}-format-security.patch
-	)
+	"${FILESDIR}"/${P}-perl-File-Temp.patch
+)
 
 src_prepare() {
-	autotools-utils_src_prepare
+	default
+
 	# Broken test
 	sed \
 		-e 's:scf-mvd-opt ::g' \
 		-e 's:scf-mvd-opt-puream ::g' \
 		-i tests/Makefile.in || die
-
 	sed \
 		-e "/LIBPATTERNS/d" \
 		-i src/{bin,util,samples}/MakeVars.in || die
+
 	eautoreconf
 }
 
@@ -58,17 +62,15 @@ src_configure() {
 	# This variable gets set sometimes to /usr/lib/src and breaks stuff
 	unset CLIBS
 
-	local myeconfargs=(
-		--with-opt="${CXXFLAGS}"
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		--with-blas="$($(tc-getPKG_CONFIG) blas --libs)"
+	econf \
+		--with-opt="${CXXFLAGS}" \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile \
+	emake \
 		SCRATCH="${WORKDIR}/libint" \
 		DODEPEND="no" \
 		YACC=byacc
@@ -79,8 +81,9 @@ src_test() {
 }
 
 src_install() {
-	autotools-utils_src_install DODEPEND="no"
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
+	emake DESTDIR="${D}" DODEPEND="no" install
+	einstalldocs
+
+	# convenience libraries
+	rm "${ED}"/usr/$(get_libdir)/*.a || die
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 12cd8944ef4f..e0a0f8a161b3 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/man-db/files/man-db-2.9.3-sandbox-env-tests.patch b/sys-apps/man-db/files/man-db-2.9.3-sandbox-env-tests.patch
new file mode 100644
index 000000000000..8b2ad26d0e6e
--- /dev/null
+++ b/sys-apps/man-db/files/man-db-2.9.3-sandbox-env-tests.patch
@@ -0,0 +1,11 @@
+--- a/src/tests/man-deleted-directory
++++ b/src/tests/man-deleted-directory
+@@ -8,6 +8,8 @@
+ 
+ : ${MAN=man}
+ 
++test -n "$SANDBOX_ACTIVE" && skip "Gentoo: Test known bad under sandbox (#699466)"
++
+ init
+ echo "MANDATORY_MANPATH $abstmpdir/usr/share/man" >"$tmpdir/manpath.config"
+ MANPATH="$abstmpdir/usr/share/man"
diff --git a/sys-apps/man-db/man-db-2.9.3.ebuild b/sys-apps/man-db/man-db-2.9.3.ebuild
index 45fd312f00a1..2b2c69c3b82d 100644
--- a/sys-apps/man-db/man-db-2.9.3.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch )
+
 pkg_setup() {
 	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
 		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 8ad0f47c8564..25d02ea5f572 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch )
+
 pkg_setup() {
 	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
 		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
diff --git a/sys-apps/portage/portage-3.0.4-r1.ebuild b/sys-apps/portage/portage-3.0.4-r1.ebuild
index 9fc28acb0589..fa53b0a0f3e2 100644
--- a/sys-apps/portage/portage-3.0.4-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.4-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/systemd/systemd-245.7-r1.ebuild b/sys-apps/systemd/systemd-245.7-r1.ebuild
index 3da9bb72e33c..d709f3514300 100644
--- a/sys-apps/systemd/systemd-245.7-r1.ebuild
+++ b/sys-apps/systemd/systemd-245.7-r1.ebuild
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6383103d7d4d..a5608a5dbc0d 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 188822cc8bbc..5d95b8277c13 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,3 +1,2 @@
 DIST pambase-20200304.tar.gz 3466 BLAKE2B e4d406460d435403ed7a46d517f9006cacc54a94f5019a573c81b331731c88679ed6d388354b5946894bdfada556b4c73735c3f4de88fc7678cd831c68ab46c3 SHA512 c2a7f3fd143637fbdf5c0a3c58ba5a3c23c5e8adb1f057d02b4b9d64660435fc529031a0f710a9e5fc7091710f78dcb2f3e1ff48f033fb491ddd0399ef05b189
-DIST pambase-20200806.tar.gz 3244 BLAKE2B 41fa77f1fc243292e618d4f1d833c0e6da5d13ce7e69362a2b2b623a46ec38f6e61d645896fd6fd0ef954a8bdbbed282b3e50487f07c6bd8dbb327e7b64e60a2 SHA512 13fc34738c209f50a03060ce0cd2a608b35cf7c2a9c40787230216548b74ff6cf78538bd97d70c63147c3b8e7afe791f0465a772ca8bd0bf8b75ebfbca8d2ff8
 DIST pambase-20200817.tar.gz 3340 BLAKE2B 76a9afbf29ab9ee6f7d25943de8c7c7bdd3413ade64d7a7623d5aec297cd864c1696a6442179d8d7c52f4df00644d80486e0dc61255454aa72b18eb9ae901ed8 SHA512 5448335da1437776f6097e591a1bd52dc62fb1847622c19077f14cdf8a677bc916f220903e4c6e924d43360fec0010a23b9cdf62aeba2a617ef6208eac2438eb
diff --git a/sys-auth/pambase/pambase-20200806.ebuild b/sys-auth/pambase/pambase-20200806.ebuild
deleted file mode 100644
index b2e1a7a0ddff..000000000000
--- a/sys-auth/pambase/pambase-20200806.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit pam python-any-r1
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="caps debug elogind minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc securetty selinux +sha512 systemd"
-
-RESTRICT="binchecks"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-MIN_PAM_REQ=1.4.0
-
-RDEPEND="
-	>=sys-libs/pam-${MIN_PAM_REQ}
-	elogind? ( sys-auth/elogind[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		sys-auth/pam_krb5
-	)
-	caps? ( sys-libs/libcap[pam] )
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( sys-auth/passwdqc )
-	selinux? ( sys-libs/pam[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( sys-apps/systemd[pam] )
-"
-
-BDEPEND="$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	${EPYTHON} ./${PN}.py \
-	$(usex caps '--libcap' '') \
-	$(usex debug '--debug' '') \
-	$(usex elogind '--elogind' '') \
-	$(usex minimal '--minimal' '') \
-	$(usex mktemp '--mktemp' '') \
-	$(usex nullok '--nullok' '') \
-	$(usex pam_krb5 '--krb5' '') \
-	$(usex pam_ssh '--pam-ssh' '') \
-	$(usex passwdqc '--passwdqc' '') \
-	$(usex securetty '--securetty' '') \
-	$(usex selinux '--selinux' '') \
-	$(usex sha512 '--sha512' '') \
-	$(usex systemd '--systemd' '')
-}
-
-src_test() { :; }
-
-src_install() {
-	dopamd -r stack/.
-}
diff --git a/sys-auth/thinkfinger/files/0.3-carriagereturn.patch b/sys-auth/thinkfinger/files/0.3-carriagereturn.patch
index 731f1531947b..528731e27d9e 100644
--- a/sys-auth/thinkfinger/files/0.3-carriagereturn.patch
+++ b/sys-auth/thinkfinger/files/0.3-carriagereturn.patch
@@ -1,5 +1,5 @@
---- pam/pam_thinkfinger-uinput.c	2007-02-27 17:52:50.000000000 +0100
-+++ pam/pam_thinkfinger-uinput.c	2009-02-17 13:56:02.013033249 +0100
+--- a/pam/pam_thinkfinger-uinput.c
++++ b/pam/pam_thinkfinger-uinput.c
 @@ -95,6 +95,7 @@
  	/* our single key keyboard */
  	i  = ioctl (*fd, UI_SET_EVBIT, EV_KEY) < 0;
diff --git a/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch b/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch
index 06723ad1306c..2de27ab459ad 100644
--- a/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch
+++ b/sys-auth/thinkfinger/files/0.3-direct_set_config_usb_hello.patch
@@ -1,7 +1,5 @@
-Index: libthinkfinger/libthinkfinger.c
-===================================================================
---- libthinkfinger/libthinkfinger.c	(revision 118)
-+++ libthinkfinger/libthinkfinger.c	(working copy)
+--- a/libthinkfinger/libthinkfinger.c
++++ b/libthinkfinger/libthinkfinger.c
 @@ -265,18 +265,7 @@
  	int retval = -1;
  	char dummy[] = "\x10";
diff --git a/sys-auth/thinkfinger/files/0.3-send-sync-event.patch b/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
index 39e0edb27ba1..0fbba6e9c2ae 100644
--- a/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
+++ b/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
@@ -1,5 +1,5 @@
---- pam/pam_thinkfinger-uinput.c	2009-12-27 18:42:26.000000000 +0100
-+++ pam/pam_thinkfinger-uinput.c	2009-12-27 18:41:55.000000000 +0100
+--- a/pam/pam_thinkfinger-uinput.c
++++ b/pam/pam_thinkfinger-uinput.c
 @@ -34,27 +34,40 @@
  int uinput_cr (int *fd)
  {
diff --git a/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch b/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch
index 169b7cefe286..251c6357b177 100644
--- a/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch
+++ b/sys-auth/thinkfinger/files/0.3-tftoolgroup.patch
@@ -1,5 +1,5 @@
---- tf-tool/tf-tool.c	2007-03-30 11:00:45.000000000 +0200
-+++ tf-tool/tf-tool.c	2009-02-18 14:57:24.316197097 +0100
+--- a/tf-tool/tf-tool.c
++++ b/tf-tool/tf-tool.c
 @@ -26,6 +26,9 @@
  #include <errno.h>
  #include <libgen.h>
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
index 730d8745e2c1..5148727daa45 100644
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools-utils user linux-info pam
+inherit linux-info pam
 
 DESCRIPTION="Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads"
 HOMEPAGE="http://thinkfinger.sourceforge.net/"
@@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug pam static-libs"
+IUSE="debug pam"
 
-RDEPEND="virtual/libusb:0
+DEPEND="
+	virtual/libusb:0
 	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
+RDEPEND="
+	${DEPEND}
+	acct-group/fingerprint"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-direct_set_config_usb_hello.patch
@@ -29,7 +31,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use pam ; then
+	if use pam; then
 		CONFIG_CHECK="~INPUT_UINPUT"
 		ERROR_CFG="Your kernel needs uinput for the pam module to work"
 		check_extra_config
@@ -37,43 +39,43 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--disable-static \
 		$(use_enable pam) \
 		$(use_enable debug usb-debug) \
-		"--with-securedir=$(getpam_mod_dir)"
-	)
-	autotools-utils_src_configure
+		--with-securedir="$(getpam_mod_dir)"
+
+	rm README.in || die
 }
 
 src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	autotools-utils_src_install
+	default
 
 	keepdir /etc/pam_thinkfinger
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/60-thinkfinger.rules
-}
 
-pkg_preinst() {
-	enewgroup fingerprint
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	fowners root:fingerprint /etc/pam_thinkfinger
 	fperms 710 /etc/pam_thinkfinger
+
 	elog "Use tf-tool --acquire to take a finger print"
 	elog "tf-tool will write the finger print file to /tmp/test.bir"
-	elog ""
-	if use pam ; then
+	elog
+
+	if use pam; then
 		elog "To add a fingerprint to PAM, use tf-tool --add-user USERNAME"
-		elog ""
+		elog
 		elog "Add the following to /etc/pam.d/system-auth after pam_env.so"
 		elog "auth     sufficient     pam_thinkfinger.so"
-		elog ""
+		elog
 		elog "Your system-auth should look similar to:"
 		elog "auth     required     pam_env.so"
 		elog "auth     sufficient   pam_thinkfinger.so"
 		elog "auth     sufficient   pam_unix.so try_first_pass likeauth nullok"
-		elog ""
 	fi
 }
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index cf8ea1ebc454..6e53fadb9a9b 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/netboot/netboot-0.10.2-r1.ebuild b/sys-boot/netboot/netboot-0.10.2-r2.ebuild
similarity index 84%
rename from sys-boot/netboot/netboot-0.10.2-r1.ebuild
rename to sys-boot/netboot/netboot-0.10.2-r2.ebuild
index 64a626b55466..4e04e05496ca 100644
--- a/sys-boot/netboot/netboot-0.10.2-r1.ebuild
+++ b/sys-boot/netboot/netboot-0.10.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,12 +22,11 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
+
 src_prepare() {
 	default
 
-	# Respect users LDFLAGS
-	eapply "${FILESDIR}"/"${P}"-ldflags.patch
-
 	# Don't	install	support	binaries into libdir
 	sed -e "152s:nblibdir:bindir:" -e "153s:nblibdir:bindir:" -i misc/Makefile || die
 
@@ -46,9 +45,11 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with odbc)
 		$(use_enable static-libs static)
-		--with-gnu-as86="$(tc-getAS)"
-		--with-gnu-cc86="$(tc-getCC)"
-		--with-gnu-ld86="$(tc-getLD)"
+		# Disable compilation of 16-bit assembler files,
+		# since it's broken on x86 and not supported on x86_64.
+		--with-gnu-as86="no"
+		--with-gnu-cc86="no"
+		--with-gnu-ld86="no"
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 68b0cf66df11..27be7c8bdc77 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.10.ebuild
deleted file mode 100644
index fc7b99f1b89b..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.11.ebuild
deleted file mode 100644
index fc7b99f1b89b..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild
deleted file mode 100644
index fc7b99f1b89b..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.16.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.16.7.ebuild
deleted file mode 100644
index c3b882854d1c..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.16.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	>=dev-lang/go-1.13"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.16.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.16.8.ebuild
deleted file mode 100644
index c3b882854d1c..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.16.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	>=dev-lang/go-1.13"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild
deleted file mode 100644
index e2bb284d01ae..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.11.ebuild
deleted file mode 100644
index e2bb284d01ae..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.12.ebuild
deleted file mode 100644
index e2bb284d01ae..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.7.ebuild
deleted file mode 100644
index bfb0eaa2ad80..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	>=dev-lang/go-1.13"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.8.ebuild
deleted file mode 100644
index bfb0eaa2ad80..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	>=dev-lang/go-1.13"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild
deleted file mode 100644
index 03c146243909..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	=dev-lang/go-1.12*"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.11.ebuild
deleted file mode 100644
index 03c146243909..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	=dev-lang/go-1.12*"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild
deleted file mode 100644
index 03c146243909..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	=dev-lang/go-1.12*"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.16.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.16.7.ebuild
deleted file mode 100644
index 80fd0acd1eb5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.16.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.13"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.16.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.16.8.ebuild
deleted file mode 100644
index 80fd0acd1eb5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.16.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.13"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.10.ebuild
deleted file mode 100644
index d11afdbbbedd..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-	RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.11.ebuild
deleted file mode 100644
index d11afdbbbedd..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-	RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild
deleted file mode 100644
index d11afdbbbedd..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	=dev-lang/go-1.12*"
-	RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.16.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.16.7.ebuild
deleted file mode 100644
index 27b2f5fe03cc..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.16.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	>=dev-lang/go-1.13"
-	RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.16.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.16.8.ebuild
deleted file mode 100644
index 27b2f5fe03cc..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.16.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata
-	>=dev-lang/go-1.13"
-	RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.10.ebuild
deleted file mode 100644
index 6f09247989fc..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="=dev-lang/go-1.12*
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.11.ebuild
deleted file mode 100644
index 6f09247989fc..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="=dev-lang/go-1.12*
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.12.ebuild
deleted file mode 100644
index 6f09247989fc..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="=dev-lang/go-1.12*
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.16.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.16.7.ebuild
deleted file mode 100644
index 3c0ba8c5f84f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.16.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.13
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.16.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.16.8.ebuild
deleted file mode 100644
index 3c0ba8c5f84f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.16.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.13
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kubectl/kubectl-1.15.10.ebuild b/sys-cluster/kubectl/kubectl-1.15.10.ebuild
deleted file mode 100644
index 021b5398348a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.15.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="=dev-lang/go-1.12*
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.15.11.ebuild b/sys-cluster/kubectl/kubectl-1.15.11.ebuild
deleted file mode 100644
index dafe945b818a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.15.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="=dev-lang/go-1.12*
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.15.12.ebuild b/sys-cluster/kubectl/kubectl-1.15.12.ebuild
deleted file mode 100644
index 021b5398348a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.15.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="=dev-lang/go-1.12*
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.16.7.ebuild b/sys-cluster/kubectl/kubectl-1.16.7.ebuild
deleted file mode 100644
index 85c2d4e74472..000000000000
--- a/sys-cluster/kubectl/kubectl-1.16.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.13
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.16.8.ebuild b/sys-cluster/kubectl/kubectl-1.16.8.ebuild
deleted file mode 100644
index 85c2d4e74472..000000000000
--- a/sys-cluster/kubectl/kubectl-1.16.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.13
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index db1b5ac30692..f9ef447aa842 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,7 +1,2 @@
-DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
-DIST kubernetes-1.15.11.tar.gz 26693249 BLAKE2B 8ffaac0416034e8113955863bffbd04a3bf7f7075374872a63b7c5bdb47d1d241d8da8635c401cab86b2cc278ee6efd8237910aa6cc321e7bc014fc50febef03 SHA512 ec86cad825d06ccc8336e6c0eb3f2e5351e4ba84df0cccd515c37cd6845e1e6d5b8414ea6d970ff92c71088576396a95daaa6deb15d18452eb85d80e09246e1e
-DIST kubernetes-1.15.12.tar.gz 26717819 BLAKE2B f7cf4a5a15265a644d17e8e934239fc209047a7e9ac3a4a1e69b6d618c3e6d79e0f132f17c613fc4fac71614bad4726bfb36da6b4c4b72e63c35739bee8482ab SHA512 ce356fb2cc0cfe1c761c2e59495a84292ac1fadc338c9bb8c4d4eff8efca11a5958ce1d92d0f91ff9f7557bf16283eed8eee007ee17427b3b52e209308fe8acd
-DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
 DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
diff --git a/sys-cluster/kubelet/kubelet-1.15.10.ebuild b/sys-cluster/kubelet/kubelet-1.15.10.ebuild
deleted file mode 100644
index 82bd9f75ce32..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	=dev-lang/go-1.12*"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.15.11.ebuild b/sys-cluster/kubelet/kubelet-1.15.11.ebuild
deleted file mode 100644
index 82bd9f75ce32..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	=dev-lang/go-1.12*"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.15.12.ebuild b/sys-cluster/kubelet/kubelet-1.15.12.ebuild
deleted file mode 100644
index 82bd9f75ce32..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	=dev-lang/go-1.12*"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.16.7.ebuild b/sys-cluster/kubelet/kubelet-1.16.7.ebuild
deleted file mode 100644
index d73fa6b62a50..000000000000
--- a/sys-cluster/kubelet/kubelet-1.16.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.13"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.16.8.ebuild b/sys-cluster/kubelet/kubelet-1.16.8.ebuild
deleted file mode 100644
index d73fa6b62a50..000000000000
--- a/sys-cluster/kubelet/kubelet-1.16.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.13"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubernetes/Manifest b/sys-cluster/kubernetes/Manifest
index e72306f274dd..2d3cacca281a 100644
--- a/sys-cluster/kubernetes/Manifest
+++ b/sys-cluster/kubernetes/Manifest
@@ -1,6 +1,5 @@
-DIST kubernetes-1.16.13.tar.gz 31778355 BLAKE2B 81cfa9a2885577e16cc01f8ecd3e21991be388e129d46c2d8b4d6282eb8d46cc7c530394f743888767426874001619801e7b70feec93cf0142f4117d7d33ea34 SHA512 c4f1d39fb9c16e2bcd2ebd0f8e8dbc889e02c4c28814132fc3856b3bf68aa4867828802e9ff48ce18f2c9c0fc246c6fbf2d9e55ca5956b4aef9cf7b4ad15b225
-DIST kubernetes-1.16.14.tar.gz 31786081 BLAKE2B 7bb400050a309f6c97ac554131e888e6c342d844b0f34565302953d1614d332b8c258fd1252e11b9e6cdb58b3dc3d935ba090a8b014869f65f722f77818ca351 SHA512 72ce0525bb578b33f23960d32a3de42dc339c666912c21b041c901469041d598021e447c93416312b67b356dfd529f0f38bc24a587af16db2b7c7aa6e83b58bb
 DIST kubernetes-1.17.11.tar.gz 31829687 BLAKE2B 9684536fb19611f7da3889358bfa6044aebba8e5d3be83d7afe47ecd392d2f52011959abb1c1d4edcf3c48c8b499d40cc4e1d7751af3cfeadda16a33f3df67c3 SHA512 13853bd099c110df9f2dcf25e461c3c14aca48d77a3eaa6c040a4358edfa31462d0702e0544a187a17521e520ab7b545a6aeabfbfa2930946e15118e82a12369
 DIST kubernetes-1.17.9.tar.gz 31821854 BLAKE2B 62dffaa7ab671987aba9a477497dfa02943488d43ac42259706e21aa0d0520d76a6d0795db39b5025b23678ad0d36e0367e0bdda4b3e7c0c6a2ad409c29d02ad SHA512 c6c1c27a534b5b6dbbc3be34d9f8f321b0289e9032ad11549e1f028cd4cf6ba288cdc54283f5263b5e9cef017d535db911b5f7e5cbaccd2bee7d955ce2039696
 DIST kubernetes-1.18.6.tar.gz 32619242 BLAKE2B 7db8410b33b3748e2f391efa78fab2bff51c2f5cf9bc54ba74d5c0044f2ee453b1038f4edb206597be6cb0da7c9264988865bd94f1b99c308c350f04eaa232af SHA512 8715b5738ae13455e5f91f58d8922e7e87ed9441a5caf1233426df7dac552ddf2c4242d217d50b65ee264b8b55e6cc4e33081bf70dd74c47870c0eff682a9545
 DIST kubernetes-1.18.8.tar.gz 32619514 BLAKE2B cdeff1d4400e69bee3f675a6a8c111ec6c5e79d1a8610d986ad37891b6ffc6b12460503004803373a5e87d6eae5517bfc6278d6a2aced6a3f414a460a0177bec SHA512 04d41c3ce15b7679c7d605659c5c02873338d0d1e48d2b655852a31f897dd0842fc4eb839d132652b4483117b845b739b25cd219f12be0ef4d0058e6ea8f421e
+DIST kubernetes-1.19.0.tar.gz 33584482 BLAKE2B b44248d8b4b22bdf2ee596ff3d864c76040f03b6f8bca17fd8bc2184463aa92f14d9e00d20163cfbb0dfb41ea0da6576f660362340ba1f6558fbb8294892ba01 SHA512 abc47f5c840894824adba3b3763b694fce89981fd90eaead9d540b9e282c9bfd97092c93d279efe26416e544393a33e95e20f953981de48e2f9f3cd4acf6bcba
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.13.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.13.ebuild
deleted file mode 100644
index 71f306a509b0..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.16.13.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND="=dev-lang/go-1.14*"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.14.ebuild b/sys-cluster/kubernetes/kubernetes-1.19.0.ebuild
similarity index 98%
rename from sys-cluster/kubernetes/kubernetes-1.16.14.ebuild
rename to sys-cluster/kubernetes/kubernetes-1.19.0.ebuild
index e558ad11199b..584ebaeea087 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.14.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.19.0.ebuild
@@ -20,7 +20,6 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
index 6d11c3600ccd..f851ede951d3 100644
--- a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake python-single-r1 udev systemd
 
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index 6d11c3600ccd..f851ede951d3 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake python-single-r1 udev systemd
 
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 35918cfdb8f7..91eb297ef62a 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1,2 @@
 DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22
+DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5
diff --git a/sys-cluster/slurm/slurm-20.02.4.1.ebuild b/sys-cluster/slurm/slurm-20.02.4.1.ebuild
new file mode 100644
index 000000000000..74a772b3b669
--- /dev/null
+++ b/sys-cluster/slurm/slurm-20.02.4.1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
+	INHERIT_GIT="git-r3"
+	MY_P="${P}"
+else
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(ver_rs 1-4 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
+
+COMMON_DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	!net-analyzer/sinfo
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
+	mysql? (
+		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
+		)
+	munge? ( sys-auth/munge )
+	pam? ( sys-libs/pam )
+	lua? ( dev-lang/lua:0= )
+	!lua? ( !dev-lang/lua )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) )
+	hdf5? ( sci-libs/hdf5:= )
+	numa? ( sys-process/numactl )
+	ofed? ( sys-fabric/ofed )
+	ucx? ( sys-cluster/ucx )
+	X? ( net-libs/libssh2 )
+	>=sys-apps/hwloc-1.1.1-r1
+	sys-libs/ncurses:0=
+	app-arch/lz4:0=
+	sys-libs/readline:0="
+
+DEPEND="${COMMON_DEPEND}
+	html? ( sys-apps/man2html )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/slurm
+	acct-group/slurm
+	dev-libs/libcgroup"
+
+REQUIRED_USE="torque? ( perl )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	tc-ld-disable-gold
+	default
+
+	# pids should go to /var/run/slurm
+	sed \
+		-e 's:/tmp:/var/tmp:g' \
+		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
+		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+		-i "${S}/etc/slurm.conf.example" \
+		|| die "Can't sed for /var/run/slurmctld.pid"
+	sed \
+		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+		-i "${S}/etc/slurmdbd.conf.example" \
+		|| die "Can't sed for /var/run/slurmdbd.pid"
+	# gentooify systemd services
+	sed \
+		-e 's:sysconfig/.*:conf.d/slurm:g' \
+		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
+		-i "${S}/etc"/*.service.in \
+		|| die "Can't sed systemd services for sysconfig or var/run/"
+
+	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
+
+	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-hwloc="${EPREFIX}/usr"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use amd64 && myconf+=( $(use_with netloc) )
+	econf "${myconf[@]}" \
+		$(use_enable debug) \
+		$(use_enable pam) \
+		$(use_enable X x11) \
+		$(use_with munge) \
+		$(use_with json) \
+		$(use_with hdf5) \
+		$(use_with ofed) \
+		$(use_with ucx) \
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}" || die
+	fi
+	use torque && emake -C contribs/torque
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}" || die
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque
+		rm -f "${D}"/usr/bin/mpiexec || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins \
+		etc/prolog.example \
+		etc/cgroup.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	keepdir /etc/slurm/layouts.d
+	insinto /etc/slurm/layouts.d
+	newins etc/layouts.d.power.conf.example power.conf.example
+	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
+	newins etc/layouts.d.unit.conf.example unit.conf.example
+	# install init.d files
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm
+	# install bashcomp
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+	bashcomp_alias scontrol \
+		sreport sacctmgr squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
+	# install systemd files
+	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@} || die
+	chown -R ${PN}:${PN} ${@} || die
+}
+
+pkg_postinst() {
+	paths=(
+		"${EROOT}"/var/${PN}/checkpoint
+		"${EROOT}"/var/${PN}
+		"${EROOT}"/var/spool/${PN}/slurmd
+		"${EROOT}"/var/spool/${PN}
+		"${EROOT}"/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		/run/${PN}
+	)
+	local folder_path
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	echo
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	echo
+	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    For the proctrack plugin:"
+	elog "        freezer"
+	elog "    For the task plugin:"
+	elog "        cpuset, memory, devices"
+	elog "    For the accounting plugin:"
+	elog "        cpuacct, memory, blkio"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 388defe849fe..689a46fc053c 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 484858925d44..c9ca0af7e006 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1 +1,2 @@
 DIST f2fs-tools-1.13.0.tar.gz 356028 BLAKE2B 170ddd5825b4f0f6a42a623f01d332092172a385e07dffccca46eb2545c12db23799fdeca7458c0cef17c95989e35db5e617a1458f0c7b41eeccd93eae807167 SHA512 fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f
+DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
new file mode 100644
index 000000000000..333752374ed2
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.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="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	selinux? ( sys-libs/libselinux )
+	elibc_musl? ( sys-libs/queue-standalone )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--disable-static \
+		$(use_with selinux)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 55317293ed4b..1a24ecab027a 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -141,6 +141,7 @@ src_configure() {
 		--with-pammoduledir="$(getpam_mod_dir)"
 		--with-systemdunitdir="$(systemd_get_systemunitdir)"
 		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
 		$(use_enable debug)
 		$(use_enable nls)
 		$(use_enable pam)
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ebf1bfe7f0ad..ed3544a06927 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 8ef48d14bccc..99b6a9d4ee1f 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -19,7 +19,7 @@ DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe88
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
 DIST genkernel-4.1.0.tar.xz 463696 BLAKE2B 74ca0207cdb54e4627d269dd83afa34045c283a2f8fd8fad6c25d566c35d8d2411e4f73e50317e8427717333024d1a4f86485caa58f5275f63273b6c52943873 SHA512 50bf7c051ac2113c14861c6ab30f8db880d9e934cedeb848f14f030286e5445b9f1b4ba1a270c281d8caacb893651325c9df0ce26a782249ca60f9f67e106807
-DIST genkernel-4.1.1.tar.xz 463148 BLAKE2B 87f64fc7e6511b11315a3d92e73701d3d82d94e785291377f4d03c4c05bd63a26bae8258130166a6c8326f4f220cef91e1b576d151be50ac594280bff0cbb82e SHA512 47a8be0ba9d9956cbb549ec8d23cc6e1b86ca8e78d8684d1cd5f6d9d41e4e2442f09b6b777e244505dbcaf1e73a7c48766d9984068d88e8b9911bafa34f9d347
+DIST genkernel-4.1.2.tar.xz 465288 BLAKE2B 89e26a861854d0cde808331db4bf3055495e9ec4be16952c495e481a5f9684601603ba22e5edda8f882fcddd68d1e406756cdc519936b90e33fe640107c8e529 SHA512 4b10f25ed8d97ffe075372aac22e0aff7be72405f02d9d8faddcc70063d04719dc93f9836d4f8375afca9b6870fcb15bda6ed796e5b2d2ef208ba3203d229a3e
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
diff --git a/sys-kernel/genkernel/genkernel-4.1.1.ebuild b/sys-kernel/genkernel/genkernel-4.1.2.ebuild
similarity index 100%
rename from sys-kernel/genkernel/genkernel-4.1.1.ebuild
rename to sys-kernel/genkernel/genkernel-4.1.2.ebuild
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e98cc3678288..a4dbd36f5639 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,6 +22,8 @@ DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e25
 DIST kernel-i686-fedora.config.5.8.1 199143 BLAKE2B ea223234bc54d430b87f3eb15fe11b11e617103c861945fb530091285abd0702e2cbb1d9258ca1afe718c4e7578c41f8878422c53e2f0b476e5ff2fa5c17aece SHA512 fc9c1b642e59c3c80b4cb6e1e6e9e2a27692524324539a3f1c163e284f8a69efb45ec839a630b0faeb0e52c15fb6577449163c7396aa0f1c43d727fe8aa35623
 DIST kernel-i686-fedora.config.5.8.4 199143 BLAKE2B ea223234bc54d430b87f3eb15fe11b11e617103c861945fb530091285abd0702e2cbb1d9258ca1afe718c4e7578c41f8878422c53e2f0b476e5ff2fa5c17aece SHA512 fc9c1b642e59c3c80b4cb6e1e6e9e2a27692524324539a3f1c163e284f8a69efb45ec839a630b0faeb0e52c15fb6577449163c7396aa0f1c43d727fe8aa35623
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
+DIST kernel-ppc64le-fedora.config.5.8.4 185788 BLAKE2B 07492670fe2febdd59dc371294b0c9dc0be82d3240f19c6cd1df6dc329cb8c87cdfdf161d700590964287eb529b0e114f3e06be172853ba1d6b34b99508a2cc9 SHA512 1dc947484336e99e47c5e1155baae5c20682bdc1c8888a7bbb8cb2f8f0056039d38c5ad3aa7e42291f83318f38be2cf14211e5a11a020b850b424e19ca8a3595
+DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
 DIST kernel-x86_64-fedora.config.5.8.1 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
 DIST kernel-x86_64-fedora.config.5.8.4 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
index 5c7d8392a2d9..82970b5920f2 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
@@ -24,6 +24,10 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
 			-> kernel-aarch64.config.${CONFIG_VER}
 	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
 	x86? (
 		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
 			-> kernel-i686.config.${CONFIG_VER}
@@ -31,7 +35,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
@@ -62,6 +66,9 @@ src_prepare() {
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
 			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
 		x86)
 			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
 			;;
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild
index 3b19b3c40493..c378337b41c0 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild
@@ -24,6 +24,10 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
 			-> kernel-aarch64-fedora.config.${CONFIG_VER}
 	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
 	x86? (
 		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
 			-> kernel-i686-fedora.config.${CONFIG_VER}
@@ -31,7 +35,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="debug"
 REQUIRED_USE="
 	arm? ( savedconfig )
@@ -68,6 +72,9 @@ src_prepare() {
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
 		x86)
 			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
 			;;
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 27367380120d..fd801e1833df 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/blocksruntime/Manifest b/sys-libs/blocksruntime/Manifest
new file mode 100644
index 000000000000..59798faef4bb
--- /dev/null
+++ b/sys-libs/blocksruntime/Manifest
@@ -0,0 +1 @@
+DIST blocksruntime-0_pre20171027.tar.gz 40571 BLAKE2B 5cb5cee10d482a3028b6ed496f7ed4fba25504c5e188dd21be37f0a65b72750e0ce31f7243e9cd848d10323e43e7d058fd2f7eb5ffed9a64e543d418ac96cfac SHA512 4008730f7ee4173f22c40220c4b87cd3f5cfadd12d5ddbaec244e3c4164111f036d0b859cf4bb5f2425313148f5c6445de30af2d4ccc83e1b97a66895ccc6dc5
diff --git a/sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild b/sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild
new file mode 100644
index 000000000000..a855b832dba2
--- /dev/null
+++ b/sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT=9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81 # 27 Oct 2017
+
+DESCRIPTION="BlocksRuntime library needed for clang's -fblocks support"
+HOMEPAGE="https://github.com/mackyle/blocksruntime"
+SRC_URI="https://github.com/mackyle/blocksruntime/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_pre20171027-ldflags-soname.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC AR RANLIB
+}
+
+src_compile() {
+	./buildlib -shared || die
+}
+
+src_install() {
+	prefix="${EPREFIX}/usr" \
+	libdir="${EPREFIX}/usr/$(get_libdir)" \
+	DESTDIR="${D}" \
+		./installlib $(use static-libs || echo -shared) || die
+}
diff --git a/sys-libs/blocksruntime/files/blocksruntime-0_pre20171027-ldflags-soname.patch b/sys-libs/blocksruntime/files/blocksruntime-0_pre20171027-ldflags-soname.patch
new file mode 100644
index 000000000000..66e9f1993bd8
--- /dev/null
+++ b/sys-libs/blocksruntime/files/blocksruntime-0_pre20171027-ldflags-soname.patch
@@ -0,0 +1,34 @@
+--- a/buildlib
++++ b/buildlib
+@@ -28,11 +28,13 @@ if [ -n "$shared" ]; then
+ 			SHLIB="${LIB%.a}.dylib"
+ 			SHOPT="-dynamiclib -Wl,-all_load"
+ 			SHOPT2=
++			SONAME=
+ 			;;
+ 		*)
+ 			SHLIB="${LIB%.a}.so"
+ 			SHOPT="-shared -Wl,-whole-archive"
+ 			SHOPT2="-Wl,-no-whole-archive"
++			SONAME="-Wl,-soname=${SHLIB}.0"
+ 			;;
+ 	esac
+ fi
+@@ -108,5 +110,5 @@ echo "SRC=$SRC"
+ [ -z "$shared" ] ||
+ (
+ 	PS4= && set -ex
+-	"$CC" $FPIC $CFLAGS -o "$SHLIB" $SHOPT $LIB $SHOPT2
++	"$CC" $FPIC $CFLAGS $LDFLAGS -o "$SHLIB" $SHOPT $LIB $SHOPT2 ${SONAME}
+ ) || exit
+--- a/installlib
++++ b/installlib
+@@ -91,5 +91,7 @@ docmd "install -d "$DESTDIR"$includedir "$DESTDIR"$libdir"
+ docmd "install -m 644 $HEADER "$DESTDIR"$includedir/"
+ [ -z "$LIB" ] ||
+ docmd "install -m 644 $LIB "$DESTDIR"$libdir/"
+-[ -z "$SHLIB" ] ||
++[ -z "$SHLIB" ] || {
+ docmd "install -m $SHLIBMODE $SHLIB "$DESTDIR"$libdir/"
++docmd "ln -s $SHLIB "$DESTDIR"$libdir/${SHLIB}.0"
++}
diff --git a/sys-libs/blocksruntime/metadata.xml b/sys-libs/blocksruntime/metadata.xml
new file mode 100644
index 000000000000..4ce153662dd9
--- /dev/null
+++ b/sys-libs/blocksruntime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mackyle/blocksruntime</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
index 4a12e38137a8..cfb7644453e1 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/234/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
 
 REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
diff --git a/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild b/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
index de3fba0624f7..d7a4578bb9f2 100644
--- a/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/229/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 7dbfbf4a1a8b..72ffa403f4b4 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,3 +1,3 @@
 DIST pam-1.4.0_p20200809-doc.tar.xz 42680 BLAKE2B e8371bd76b589db06ce95f2d10343be163aa5149f566f7d9bd5e9cd0340b95eecedb6a7d20d299fd2188c736fca3c69c0bd2f8eea4541dfd3312227c3dcf4e2d SHA512 5007aaa811b6321f124245493c6a4bc9ae07ab4ff651fc817843e8b4a74661c07418e2479363a72c35320f0f1cb469a2494c5d354dc819b920de7d1918e6ce5e
 DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
-DIST pam-d5cb4409ab6b04a6ed7c00245e2c9a430f352b16.tar.gz 810548 BLAKE2B e061528fa57ba9fcb418422d368b7bb960b5f6eec3ed4b9e438be0ec4acdaf925af3322a334ced8c498e700b090ae37f5084f13d2bf8c6874d53c58f03548bc7 SHA512 3db1e13bc8a037b22e0ae1aac0311982877a2e2d33643ee32813025f9a9c727421f2fd6c442eba936e8043c59deb476daf78fda34fc7b6b95c015614751975f4
+DIST pam-e42e178c71c11bb25740a5177eed110ee17b8af2.tar.gz 810595 BLAKE2B 897f64a7f55c033601665b0ecc292cdcbd0d9b2f24199ed6ca5fc69c2da4da7401677493bed09a118b1fc0a475dc016fc7a3a318787c650212b056064ed0b817 SHA512 3c2bc401df51dbd4118698afc80a0448559bc6b5d8c7c45c800c2f6421034a131c0bee971f9640aec6b0d77f8a31ec055c7a84a646d9a11690dfda4af4e1068a
diff --git a/sys-libs/pam/pam-1.4.0_p20200809.ebuild b/sys-libs/pam/pam-1.4.0_p20200829.ebuild
similarity index 91%
rename from sys-libs/pam/pam-1.4.0_p20200809.ebuild
rename to sys-libs/pam/pam-1.4.0_p20200829.ebuild
index 4fea18d00b1c..5dfee2448fa0 100644
--- a/sys-libs/pam/pam-1.4.0_p20200809.ebuild
+++ b/sys-libs/pam/pam-1.4.0_p20200829.ebuild
@@ -8,9 +8,9 @@ inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
 
-COMMIT_HASH="d5cb4409ab6b04a6ed7c00245e2c9a430f352b16"
+COMMIT_HASH="e42e178c71c11bb25740a5177eed110ee17b8af2"
 SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz
-	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-doc.tar.xz"
+	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}-1.4.0_p20200809-doc.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
@@ -30,7 +30,8 @@ DEPEND="
 	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
+	nis? ( net-libs/libnsl[${MULTILIB_USEDEP}]
+	>=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
 
 RDEPEND="${DEPEND}"
 
@@ -62,6 +63,7 @@ multilib_src_configure() {
 		--includedir="${EPREFIX}"/usr/include/security
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
 		--exec-prefix="${EPREFIX}"
+		--enable-unix
 		--disable-prelude
 		--disable-cracklib
 		--disable-tally
@@ -107,7 +109,7 @@ multilib_src_install_all() {
 		d /run/sepermit 0755 root root
 	_EOF_
 
-	for i in "${WORKDIR}"/${P}-doc/*; do
+	for i in "${WORKDIR}"/${PN}-1.4.0_p20200809-doc/*; do
 		doman ${i}
 	done
 }
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 80b862619e3a..9a3871e3ae14 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/parallel/parallel-20200722.ebuild b/sys-process/parallel/parallel-20200722.ebuild
index b26f0ef3040a..7d86e7d9cef2 100644
--- a/sys-process/parallel/parallel-20200722.ebuild
+++ b/sys-process/parallel/parallel-20200722.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 7af4fde36287..4a57052ddc87 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/perl-libnet/perl-libnet-3.110.0-r4.ebuild b/virtual/perl-libnet/perl-libnet-3.110.0-r4.ebuild
new file mode 100644
index 000000000000..030e7deaa7bc
--- /dev/null
+++ b/virtual/perl-libnet/perl-libnet-3.110.0-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+ssl"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
+# https://bugs.gentoo.org/735004
+PDEPEND="
+	ssl? (
+		>=dev-perl/IO-Socket-SSL-2.7.0
+	)
+"
diff --git a/virtual/rust/rust-1.45.2.ebuild b/virtual/rust/rust-1.45.2.ebuild
index 942315f18b73..39dec6ee4999 100644
--- a/virtual/rust/rust-1.45.2.ebuild
+++ b/virtual/rust/rust-1.45.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 
 BDEPEND=""
 RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7dedc359e659..db70e44ada7c 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libX11/libX11-1.6.12.ebuild b/x11-libs/libX11/libX11-1.6.12.ebuild
index 430e56bc1fd6..01428de5fa56 100644
--- a/x11-libs/libX11/libX11-1.6.12.ebuild
+++ b/x11-libs/libX11/libX11-1.6.12.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index d9ec60bc2d0f..36f2b40b74b8 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/icewm/icewm-1.7.0.ebuild b/x11-wm/icewm/icewm-1.7.0.ebuild
index f3a5bab3c272..412f9a98a2e9 100644
--- a/x11-wm/icewm/icewm-1.7.0.ebuild
+++ b/x11-wm/icewm/icewm-1.7.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc ~x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533